From a69314377957bc3b76364cd1c39c086f411c8b3f Mon Sep 17 00:00:00 2001 From: wangdisdu Date: Wed, 4 Oct 2017 21:45:02 +0800 Subject: [PATCH] metricbeat: add more node metrics in elasticseach module --- CHANGELOG.asciidoc | 3 + metricbeat/docs/fields.asciidoc | 65 ++++++++++++++++--- .../module/elasticsearch/node/_meta/data.json | 32 ++++++--- .../elasticsearch/node/_meta/fields.yml | 42 +++++++++--- metricbeat/module/elasticsearch/node/data.go | 20 +++++- 5 files changed, 133 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index d6551f638e8d..97ea0d7426ee 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -22,6 +22,9 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di *Metricbeat* +- Rename `heap_init` field to `heap.init`. {pull}5320[5320] + + *Packetbeat* - Remove not-working `runoptions.uid` and `runoptions.gid` options in Packetbeat. {pull}5261[5261] diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 608a4013abdc..5a78615a109d 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -2469,13 +2469,26 @@ node [float] -=== `elasticsearch.node.jvm.memory.heap_init.bytes` +=== `elasticsearch.node.name` -type: long +type: keyword -format: bytes +Node name. + + +[float] +=== `elasticsearch.node.version` + +type: keyword + +Node version. + + +[float] +== jvm fields + +JVM Info. -Heap init used by the JVM in bytes. [float] @@ -2487,19 +2500,51 @@ JVM version. [float] -=== `elasticsearch.node.name` +=== `elasticsearch.node.jvm.memory.heap.init.bytes` -type: keyword +type: long -Node name. +format: bytes + +Heap init used by the JVM in bytes. [float] -=== `elasticsearch.node.version` +=== `elasticsearch.node.jvm.memory.heap.max.bytes` -type: keyword +type: long -Node version. +format: bytes + +Heap max used by the JVM in bytes. + + +[float] +=== `elasticsearch.node.jvm.memory.nonheap.init.bytes` + +type: long + +format: bytes + +Non-Heap init used by the JVM in bytes. + + +[float] +=== `elasticsearch.node.jvm.memory.nonheap.max.bytes` + +type: long + +format: bytes + +Non-Heap max used by the JVM in bytes. + + +[float] +=== `elasticsearch.node.process.mlockall` + +type: bool + +If process locked in memory. [float] diff --git a/metricbeat/module/elasticsearch/node/_meta/data.json b/metricbeat/module/elasticsearch/node/_meta/data.json index 3ac846f5ad1c..fa495a55f3f9 100644 --- a/metricbeat/module/elasticsearch/node/_meta/data.json +++ b/metricbeat/module/elasticsearch/node/_meta/data.json @@ -9,16 +9,32 @@ "name": "elasticsearch" }, "node": { - "jvm": { - "memory": { - "heap_init": { - "bytes": 536870912 + "name": "8zgOwJ24TMamDDH9amWINQ", + "version": "6.0.0-alpha1", + "jvm":{ + "version":"1.8.0_60", + "memory":{ + "heap":{ + "init":{ + "bytes":268435456 + }, + "max":{ + "bytes":1038876672 + } + }, + "nonheap":{ + "init":{ + "bytes":2555904 + }, + "max":{ + "bytes":0 + } } }, - "version": "1.8.0_121" - }, - "name": "8zgOwJ24TMamDDH9amWINQ", - "version": "6.0.0-alpha1" + "process":{ + "mlockall":true + } + } } }, "metricset": { diff --git a/metricbeat/module/elasticsearch/node/_meta/fields.yml b/metricbeat/module/elasticsearch/node/_meta/fields.yml index 5b364819f6a1..99f3725113de 100644 --- a/metricbeat/module/elasticsearch/node/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node/_meta/fields.yml @@ -3,15 +3,6 @@ description: > node fields: - - name: jvm.memory.heap_init.bytes - type: long - format: bytes - description: > - Heap init used by the JVM in bytes. - - name: jvm.version - type: keyword - description: > - JVM version. - name: name type: keyword description: > @@ -20,3 +11,36 @@ type: keyword description: > Node version. + - name: jvm + type: group + description: > + JVM Info. + fields: + - name: version + type: keyword + description: > + JVM version. + - name: memory.heap.init.bytes + type: long + format: bytes + description: > + Heap init used by the JVM in bytes. + - name: memory.heap.max.bytes + type: long + format: bytes + description: > + Heap max used by the JVM in bytes. + - name: memory.nonheap.init.bytes + type: long + format: bytes + description: > + Non-Heap init used by the JVM in bytes. + - name: memory.nonheap.max.bytes + type: long + format: bytes + description: > + Non-Heap max used by the JVM in bytes. + - name: process.mlockall + type: bool + description: > + If process locked in memory. \ No newline at end of file diff --git a/metricbeat/module/elasticsearch/node/data.go b/metricbeat/module/elasticsearch/node/data.go index 76a6c9151b1a..8d2f46d366c7 100644 --- a/metricbeat/module/elasticsearch/node/data.go +++ b/metricbeat/module/elasticsearch/node/data.go @@ -16,11 +16,27 @@ var ( "jvm": c.Dict("jvm", s.Schema{ "version": c.Str("version"), "memory": c.Dict("mem", s.Schema{ - "heap_init": s.Object{ - "bytes": c.Int("heap_init_in_bytes"), + "heap": s.Object{ + "init": s.Object{ + "bytes": c.Int("heap_init_in_bytes"), + }, + "max": s.Object{ + "bytes": c.Int("heap_max_in_bytes"), + }, + }, + "nonheap": s.Object{ + "init": s.Object{ + "bytes": c.Int("non_heap_init_in_bytes"), + }, + "max": s.Object{ + "bytes": c.Int("non_heap_max_in_bytes"), + }, }, }), }), + "process": c.Dict("process", s.Schema{ + "mlockall": c.Bool("mlockall"), + }), } )