Skip to content

Commit

Permalink
Fix mapping and use Hostname var on test config
Browse files Browse the repository at this point in the history
  • Loading branch information
crespocarlos committed Oct 12, 2022
1 parent 3fdd75c commit 8bb0994
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 103 deletions.
3 changes: 2 additions & 1 deletion packages/logstash/_dev/deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version: "2.3"
services:
logstash:
user: root
image: "docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-8.5.0-SNAPSHOT}"
volumes:
- "./pipeline:/usr/share/logstash/pipeline"
- "./config:/usr/share/logstash/config"
- ${SERVICE_LOGS_DIR}/logstash:/usr/share/logstash/logs
- ${SERVICE_LOGS_DIR}:/usr/share/logstash/logs:rw
ports:
- "127.0.0.1:9600:9600"
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ input: logfile
data_stream:
vars:
paths:
- "{{SERVICE_LOGS_DIR}}/logstash/logstash-json.log"
- "{{SERVICE_LOGS_DIR}}/logstash-json.log"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type: logstash/metrics
dataset: logstash.stack_monitoring.node
vars:
hosts:
- "http://elastic-package-service-logstash-1:9600"
- "http://{{Hostname}}:9600"
username: elastic
password: changeme
data_stream: ~
86 changes: 1 addition & 85 deletions packages/logstash/data_stream/node/fields/package-fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,91 +3,7 @@
path: logstash.elasticsearch.cluster.id
- name: timestamp
type: alias
path: '@timestamp'
- name: logstash_stats
type: group
fields:
- name: timestamp
type: alias
path: '@timestamp'
- name: jvm
type: group
fields:
- name: mem
type: group
fields:
- name: heap_used_in_bytes
type: alias
path: logstash.node.stats.jvm.mem.heap_used_in_bytes
- name: heap_max_in_bytes
type: alias
path: logstash.node.stats.jvm.mem.heap_max_in_bytes
- name: uptime_in_millis
type: alias
path: logstash.node.stats.jvm.uptime_in_millis
- name: events
type: group
fields:
- name: in
type: alias
path: logstash.node.stats.events.in
- name: out
type: alias
path: logstash.node.stats.events.out
- name: duration_in_millis
type: alias
path: logstash.node.stats.events.duration_in_millis
- name: logstash
type: group
fields:
- name: uuid
type: alias
path: logstash.node.stats.logstash.uuid
- name: version
type: alias
path: logstash.node.stats.logstash.version
- name: os
type: group
fields:
- name: cpu
type: group
fields:
- name: stat
type: group
fields:
- name: number_of_elapsed_periods
type: alias
path: logstash.node.stats.os.cgroup.cpu.stat.number_of_elapsed_periods
- name: time_throttled_nanos
type: alias
path: logstash.node.stats.os.cgroup.cpu.stat.time_throttled_nanos
- name: number_of_times_throttled
type: alias
path: logstash.node.stats.os.cgroup.cpu.stat.number_of_times_throttled
- name: load_average
type: group
fields:
- name: 15m
type: alias
path: logstash.node.stats.os.cpu.load_average.15m
- name: 1m
type: alias
path: logstash.node.stats.os.cpu.load_average.1m
- name: 5m
type: alias
path: logstash.node.stats.os.cpu.load_average.5m
- name: cgroup
type: group
fields:
- name: cpuacct.usage_nanos
type: alias
path: logstash.node.stats.os.cgroup.cpuacct.usage_nanos
- name: process.cpu.percent
type: alias
path: logstash.node.stats.process.cpu.percent
- name: queue.events_count
type: alias
path: logstash.node.stats.queue.events_count
path: "@timestamp"
- name: logstash_state
type: group
fields:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type: logstash/metrics
dataset: logstash.stack_monitoring.node_stats
vars:
hosts:
- "http://elastic-package-service-logstash-1:9600"
- "http://{{Hostname}}:9600"
username: elastic
password: changeme
data_stream: ~
4 changes: 2 additions & 2 deletions packages/logstash/data_stream/node_stats/fields/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
type: group
fields:
- name: cpuacct
type: nested
type: object
fields:
- name: usage_nanos
type: long
Expand All @@ -128,7 +128,7 @@
- name: cfs_quota_micros
type: long
- name: stat
type: nested
type: object
fields:
- name: number_of_elapsed_periods
type: long
Expand Down
13 changes: 2 additions & 11 deletions packages/logstash/data_stream/node_stats/fields/package-fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
type: group
fields:
- name: stat
type: nested
type: object
fields:
- name: number_of_elapsed_periods
type: alias
Expand All @@ -82,7 +82,7 @@
type: group
fields:
- name: cpuacct
type: nested
type: object
fields:
- name: usage_nanos
type: alias
Expand All @@ -93,12 +93,3 @@
- name: queue.events_count
type: alias
path: logstash.node.stats.queue.events_count
- name: logstash_state
type: group
fields:
- name: pipeline.id
type: alias
path: logstash.node.state.pipeline.id
- name: pipeline.hash
type: alias
path: logstash.node.state.pipeline.hash
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ input: logfile
data_stream:
vars:
paths:
- "{{SERVICE_LOGS_DIR}}/logstash/logstash-slowlog-json.log"
- "{{SERVICE_LOGS_DIR}}/logstash-slowlog-json.log"

0 comments on commit 8bb0994

Please sign in to comment.