From c9fa90695176649832e194aecde19ba7cd604461 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 8 Jul 2020 09:13:40 -0700 Subject: [PATCH 01/32] Make node_stats ignore xpack.enabled: true for the POC --- metricbeat/module/elasticsearch/node_stats/node_stats.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats.go b/metricbeat/module/elasticsearch/node_stats/node_stats.go index 5f856e2eeac..da78bc46f60 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats.go @@ -74,7 +74,7 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { return err } - if m.XPack { + if m.XPack && false { // ignoring xpack.enabled: true for POC err = eventsMappingXPack(r, m, *info, content) if err != nil { // Since this is an x-pack code path, we log the error but don't From b040b13d50d8bd70f3b307de0765d18c913eaefd Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 8 Jul 2020 12:51:59 -0700 Subject: [PATCH 02/32] Index more fields --- .../module/elasticsearch/node_stats/data.go | 249 +++++++++++++++++- .../elasticsearch/node_stats/data_xpack.go | 18 +- .../elasticsearch/node_stats/node_stats.go | 2 +- 3 files changed, 256 insertions(+), 13 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 4e860d0b52e..94a82adb249 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -43,6 +43,15 @@ var ( "survivor": c.Dict("survivor", poolSchema), "old": c.Dict("old", poolSchema), }), + "heap": s.Object{ + "max": s.Object{ + "bytes": c.Int("heap_max_in_bytes"), + }, + "used": s.Object{ + "bytes": c.Int("heap_used_in_bytes"), + "pct": c.Int("heap_used_percent"), + }, + }, }), "gc": c.Dict("gc", s.Schema{ "collectors": c.Dict("collectors", s.Schema{ @@ -52,10 +61,84 @@ var ( }), }), "indices": c.Dict("indices", s.Schema{ + "bulk": c.Dict("bulk", s.Schema{ + "avg_size": s.Object{ + "bytes": c.Int("avg_size_in_bytes"), + }, + "avg_time": s.Object{ + "ms": c.Int("avg_time_in_millis"), + }, + "total_size": s.Object{ + "bytes": c.Int("total_size_in_bytes"), + }, + "total_time": s.Object{ + "ms": c.Int("total_time_in_millis"), + }, + "operations": s.Object{ + "total": s.Object{ + "count": c.Int("total_operations"), + }, + }, + }), "docs": c.Dict("docs", s.Schema{ "count": c.Int("count"), "deleted": c.Int("deleted"), }), + "fielddata": c.Dict("fielddata", s.Schema{ + "evictions": s.Object{ + "count": c.Int("evictions"), + }, + "memory": s.Object{ + "bytes": c.Int("memory_size_in_bytes"), + }, + }), + "indexing": c.Dict("indexing", s.Schema{ + "index_time": s.Object{ + "ms": c.Int("index_time_in_millis"), + }, + "index_total": s.Object{ + "count": c.Int("index_total"), + }, + "throttle_time": s.Object{ + "ms": c.Int("throttle_time_in_millis"), + }, + }), + "query_cache": c.Dict("query_cache", s.Schema{ + "evictions": s.Object{ + "count": c.Int("evictions"), + }, + "hits": s.Object{ + "count": c.Int("hit_count"), + }, + "misses": s.Object{ + "count": c.Int("miss_count"), + }, + "memory": s.Object{ + "bytes": c.Int("memory_size_in_bytes"), + }, + }), + "request_cache": c.Dict("request_cache", s.Schema{ + "evictions": s.Object{ + "count": c.Int("evictions"), + }, + "hits": s.Object{ + "count": c.Int("hit_count"), + }, + "misses": s.Object{ + "count": c.Int("miss_count"), + }, + "memory": s.Object{ + "bytes": c.Int("memory_size_in_bytes"), + }, + }), + "search": c.Dict("search", s.Schema{ + "query_time": s.Object{ + "ms": c.Int("query_time_in_millis"), + }, + "query_total": s.Object{ + "count": c.Int("query_total"), + }, + }), "store": c.Dict("store", s.Schema{ "size": s.Object{ "bytes": c.Int("size_in_bytes"), @@ -66,6 +149,51 @@ var ( "memory": s.Object{ "bytes": c.Int("memory_in_bytes"), }, + "doc_values": s.Object{ + "memory": s.Object{ + "bytes": c.Int("doc_values_memory_in_bytes"), + }, + }, + "fixed_bit_set": s.Object{ + "memory": s.Object{ + "bytes": c.Int("fixed_bit_set_memory_in_bytes"), + }, + }, + "index_writer": s.Object{ + "memory": s.Object{ + "bytes": c.Int("index_writer_memory_in_bytes"), + }, + }, + "norms": s.Object{ + "memory": s.Object{ + "bytes": c.Int("norms_memory_in_bytes"), + }, + }, + "points": s.Object{ + "memory": s.Object{ + "bytes": c.Int("points_memory_in_bytes"), + }, + }, + "stored_fields": s.Object{ + "memory": s.Object{ + "bytes": c.Int("stored_fields_memory_in_bytes"), + }, + }, + "term_vectors": s.Object{ + "memory": s.Object{ + "bytes": c.Int("term_vectors_memory_in_bytes"), + }, + }, + "terms": s.Object{ + "memory": s.Object{ + "bytes": c.Int("terms_memory_in_bytes"), + }, + }, + "version_map": s.Object{ + "memory": s.Object{ + "bytes": c.Int("version_map_memory_in_bytes"), + }, + }, }), }), "fs": c.Dict("fs", s.Schema{ @@ -80,6 +208,96 @@ var ( "bytes": c.Int("available_in_bytes"), }, }), + "io_stats": c.Dict("io_stats", s.Schema{ + "total": c.Dict("total", s.Schema{ + "operations": s.Object{ + "count": c.Int("operations"), + }, + "read": s.Object{ + "kb": c.Int("read_kilobytes"), + "operations": s.Object{ + "count": c.Int("read_operations"), + }, + }, + "write": s.Object{ + "kb": c.Int("write_kilobytes"), + "operations": s.Object{ + "count": c.Int("write_operations"), + }, + }, + }), + }), + }), + "os": c.Dict("os", s.Schema{ + "cpu": c.Dict("cpu", s.Schema{ + "load_avg": c.Dict("load_average", s.Schema{ + "1m": c.Float("1m"), + "5m": c.Float("5m"), + "15m": c.Float("15m"), + }), + }), + "cgroup": c.Dict("cgroup", s.Schema{ + "cpuacct": c.Dict("cpuacct", s.Schema{ + "control_group": c.Str("control_group"), + "usage": s.Object{ + "ns": c.Int("usage_nanos"), + }, + }), + "cpu": c.Dict("cpu", s.Schema{ + "control_group": c.Str("control_group"), + "cfs": s.Object{ + "period": s.Object{ + "us": c.Int("cfs_period_micros"), + }, + "quota": s.Object{ + "us": c.Int("cfs_quota_micros"), + }, + }, + "stat": c.Dict("stat", s.Schema{ + "elapsed_periods": s.Object{ + "count": c.Int("number_of_elapsed_periods"), + }, + "times_throttled": s.Object{ + "count": c.Int("number_of_times_throttled"), + }, + "time_throtted": s.Object{ + "ns": c.Int("time_throttled_nanos"), + }, + }), + }), + "memory": c.Dict("memory", s.Schema{ + "control_group": c.Str("control_group"), + "limit": s.Object{ + "bytes": c.Int("limit_in_bytes"), + }, + "usage": s.Object{ + "bytes": c.Int("usage_in_bytes"), + }, + }), + }), + }), + "process": c.Dict("process", s.Schema{ + "cpu": c.Dict("cpu", s.Schema{ + "pct": c.Int("percent"), + }), + "file_descriptors": s.Object{ + "max": s.Object{ + "count": c.Int("max_file_descriptors"), + }, + "open": s.Object{ + "count": c.Int("open_file_descriptors"), + }, + }, + }), + "thread_pool": c.Dict("thread_pool", s.Schema{ + "bulk": c.Dict("bulk", threadPoolStatsSchema, c.DictOptional), + "index": c.Dict("index", threadPoolStatsSchema, c.DictOptional), + "write": c.Dict("write", threadPoolStatsSchema), + "generic": c.Dict("generic", threadPoolStatsSchema), + "get": c.Dict("get", threadPoolStatsSchema), + "management": c.Dict("management", threadPoolStatsSchema), + "search": c.Dict("search", threadPoolStatsSchema), + "watcher": c.Dict("watcher", threadPoolStatsSchema, c.DictOptional), }), } @@ -104,14 +322,25 @@ var ( "ms": c.Int("collection_time_in_millis"), }, } + + threadPoolStatsSchema = s.Schema{ + "threads": s.Object{ + "count": c.Int("threads"), + }, + "queue": s.Object{ + "count": c.Int("queue"), + }, + "rejected": s.Object{ + "count": c.Int("rejected"), + }, + } ) type nodesStruct struct { Nodes map[string]map[string]interface{} `json:"nodes"` } -func eventsMapping(r mb.ReporterV2, info elasticsearch.Info, content []byte) error { - +func eventsMapping(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { nodeData := &nodesStruct{} err := json.Unmarshal(content, nodeData) if err != nil { @@ -120,6 +349,18 @@ func eventsMapping(r mb.ReporterV2, info elasticsearch.Info, content []byte) err var errs multierror.Errors for id, node := range nodeData.Nodes { + isMaster, err := elasticsearch.IsMaster(m.HTTP, m.HTTP.GetURI()) + if err != nil { + errs = append(errs, errors.Wrap(err, "error determining if connected Elasticsearch node is master")) + continue + } + + mlockall, err := elasticsearch.IsMLockAllEnabled(m.HTTP, m.HTTP.GetURI(), id) + if err != nil { + errs = append(errs, errors.Wrap(err, "error determining if mlockall is set on Elasticsearch node")) + continue + } + event := mb.Event{} event.RootFields = common.MapStr{} @@ -127,7 +368,9 @@ func eventsMapping(r mb.ReporterV2, info elasticsearch.Info, content []byte) err event.ModuleFields = common.MapStr{ "node": common.MapStr{ - "id": id, + "id": id, + "mlockall": mlockall, + "master": isMaster, }, "cluster": common.MapStr{ "name": info.ClusterName, diff --git a/metricbeat/module/elasticsearch/node_stats/data_xpack.go b/metricbeat/module/elasticsearch/node_stats/data_xpack.go index e4efeb3b8e8..b1d4c5aee84 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/node_stats/data_xpack.go @@ -142,14 +142,14 @@ var ( }), }), "thread_pool": c.Dict("thread_pool", s.Schema{ - "bulk": c.Dict("bulk", threadPoolStatsSchema, c.DictOptional), - "index": c.Dict("index", threadPoolStatsSchema, c.DictOptional), - "write": c.Dict("write", threadPoolStatsSchema), - "generic": c.Dict("generic", threadPoolStatsSchema), - "get": c.Dict("get", threadPoolStatsSchema), - "management": c.Dict("management", threadPoolStatsSchema), - "search": c.Dict("search", threadPoolStatsSchema), - "watcher": c.Dict("watcher", threadPoolStatsSchema, c.DictOptional), + "bulk": c.Dict("bulk", xpackThreadPoolStatsSchema, c.DictOptional), + "index": c.Dict("index", xpackThreadPoolStatsSchema, c.DictOptional), + "write": c.Dict("write", xpackThreadPoolStatsSchema), + "generic": c.Dict("generic", xpackThreadPoolStatsSchema), + "get": c.Dict("get", xpackThreadPoolStatsSchema), + "management": c.Dict("management", xpackThreadPoolStatsSchema), + "search": c.Dict("search", xpackThreadPoolStatsSchema), + "watcher": c.Dict("watcher", xpackThreadPoolStatsSchema, c.DictOptional), }), "fs": c.Dict("fs", s.Schema{ "total": c.Dict("total", s.Schema{ @@ -169,7 +169,7 @@ var ( }), } - threadPoolStatsSchema = s.Schema{ + xpackThreadPoolStatsSchema = s.Schema{ "threads": c.Int("threads"), "queue": c.Int("queue"), "rejected": c.Int("rejected"), diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats.go b/metricbeat/module/elasticsearch/node_stats/node_stats.go index da78bc46f60..b32260748d1 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats.go @@ -84,7 +84,7 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { return nil } } else { - return eventsMapping(r, *info, content) + return eventsMapping(r, m, *info, content) } return nil From 51c8db2da139b09d6c24baa322384dbfc314cdee Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 8 Jul 2020 12:52:19 -0700 Subject: [PATCH 03/32] WIP: add fields to fields.yml --- metricbeat/docs/fields.asciidoc | 70 ++++++++++++++++++- .../module/elasticsearch/_meta/fields.yml | 33 ++++++--- metricbeat/module/elasticsearch/fields.go | 2 +- .../elasticsearch/node_stats/_meta/fields.yml | 47 +++++++++---- 4 files changed, 128 insertions(+), 24 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 05d336127f5..fe0c1365aef 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -15772,6 +15772,15 @@ Elasticsearch module +*`cluster_uuid`*:: ++ +-- +type: alias + +alias to: elasticsearch.cluster.id + +-- + [float] === elasticsearch @@ -15808,6 +15817,7 @@ type: keyword -- + *`elasticsearch.node.id`*:: + -- @@ -15828,6 +15838,26 @@ type: keyword -- +*`elasticsearch.node.master`*:: ++ +-- +Is the node the master node? + + +type: boolean + +-- + +*`elasticsearch.node.mlockall`*:: ++ +-- +Is mlockall enabled on the node? + + +type: boolean + +-- + [float] === ccr @@ -16781,8 +16811,9 @@ type: long -- + [float] -=== fs.summary +=== summary File system summary @@ -16821,6 +16852,43 @@ format: bytes -- + + +*`elasticsearch.node.stats.fs.io_stats.total.operations.count`*:: ++ +-- +type: long + +-- + +*`elasticsearch.node.stats.fs.io_stats.total.read.kb`*:: ++ +-- +type: long + +-- + +*`elasticsearch.node.stats.fs.io_stats.total.read.operations.count`*:: ++ +-- +type: long + +-- + +*`elasticsearch.node.stats.fs.io_stats.total.write.kb`*:: ++ +-- +type: long + +-- + +*`elasticsearch.node.stats.fs.io_stats.total.write.operations.count`*:: ++ +-- +type: long + +-- + [float] === cluster.pending_task diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index 3614c9e6319..2d7370e71d4 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -6,6 +6,10 @@ settings: ["ssl", "http"] short_config: false fields: + - name: cluster_uuid + type: alias + path: elasticsearch.cluster.id + - name: elasticsearch type: group description: > @@ -25,12 +29,25 @@ description: > Elasticsearch state id. - - name: node.id - type: keyword - description: > - Node ID + - name: node + type: group + fields: + - name: id + type: keyword + description: > + Node ID - - name: node.name - type: keyword - description: > - Node name. + - name: name + type: keyword + description: > + Node name. + + - name: master + type: boolean + description: > + Is the node the master node? + + - name: mlockall + type: boolean + description: > + Is mlockall enabled on the node? diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index aadc37a05c3..e1501b0fec1 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml index 82c0d9feb70..820f6210248 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml @@ -139,20 +139,39 @@ type: long description: > - - name: fs.summary + - name: fs type: group - description: > - File system summary fields: - - name: total.bytes - type: long - format: bytes - description: > - - name: free.bytes - type: long - format: bytes - description: > - - name: available.bytes - type: long - format: bytes + - name: summary + type: group description: > + File system summary + fields: + - name: total.bytes + type: long + format: bytes + description: > + - name: free.bytes + type: long + format: bytes + description: > + - name: available.bytes + type: long + format: bytes + description: > + - name: io_stats + type: group + fields: + - name: total + type: group + fields: + - name: operations.count + type: long + - name: read.kb + type: long + - name: read.operations.count + type: long + - name: write.kb + type: long + - name: write.operations.count + type: long From 601cd5ea5426d24156c6e1eecb508f379d249e1e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 8 Jul 2020 17:36:26 -0700 Subject: [PATCH 04/32] Fleshing out alias fields --- metricbeat/docs/fields.asciidoc | 1072 +++++++++++++++-- .../module/elasticsearch/_meta/fields.yml | 436 ++++++- metricbeat/module/elasticsearch/fields.go | 2 +- 3 files changed, 1403 insertions(+), 107 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index fe0c1365aef..0c5c7497a39 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -15772,15 +15772,6 @@ Elasticsearch module -*`cluster_uuid`*:: -+ --- -type: alias - -alias to: elasticsearch.cluster.id - --- - [float] === elasticsearch @@ -15858,6 +15849,883 @@ type: boolean -- +*`cluster_uuid`*:: ++ +-- +type: alias + +alias to: elasticsearch.cluster.id + +-- + + + + +*`node_stats.fs.total.available_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.summary.available.bytes + +-- + +*`node_stats.fs.total.free_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.summary.free.bytes + +-- + +*`node_stats.fs.total.total_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.summary.total.bytes + +-- + + + +*`node_stats.fs.io_stats.total.operations`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.io_stats.total.operations.count + +-- + +*`node_stats.fs.io_stats.total.read_kilobytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.io_stats.total.read.kb + +-- + +*`node_stats.fs.io_stats.total.read_operations`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.io_stats.total.read.operations.count + +-- + +*`node_stats.fs.io_stats.total.write_kilobytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.io_stats.total.write.kb + +-- + +*`node_stats.fs.io_stats.total.write_operations`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.fs.io_stats.total.write.operations.count + +-- + + + +*`node_stats.indices.bulk.avg_size_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.bulk.avg_size.bytes + +-- + +*`node_stats.indices.bulk.avg_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.bulk.avg_time.ms + +-- + +*`node_stats.indices.bulk.total_operations`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.bulk.operations.total.count + +-- + +*`node_stats.indices.bulk.total_size_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.bulk.total_size.bytes + +-- + +*`node_stats.indices.bulk.total_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.bulk.total_time.ms + +-- + + +*`node_stats.indices.docs.count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.docs.count + +-- + + +*`node_stats.indices.fielddata.evictions`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.fielddata.evictions.count + +-- + +*`node_stats.indices.fielddata.memory_size_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.fielddata.memory.bytes + +-- + + +*`node_stats.indices.indexing.index_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.indexing.index_time.ms + +-- + +*`node_stats.indices.indexing.index_total`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.indexing.index_total.count + +-- + +*`node_stats.indices.indexing.throttle_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.indexing.throttle_time.ms + +-- + + +*`node_stats.indices.query_cache.evictions`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.query_cache.evictions.count + +-- + +*`node_stats.indices.query_cache.hit_count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.query_cache.hits.count + +-- + +*`node_stats.indices.query_cache.memory_size_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.query_cache.memory.bytes + +-- + +*`node_stats.indices.query_cache.miss_count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.query_cache.misses.count + +-- + + +*`node_stats.indices.request_cache.evictions`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.request_cache.evictions.count + +-- + +*`node_stats.indices.request_cache.hit_count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.request_cache.hits.count + +-- + +*`node_stats.indices.request_cache.memory_size_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.request_cache.memory.bytes + +-- + +*`node_stats.indices.request_cache.miss_count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.request_cache.misses.count + +-- + + +*`node_stats.indices.search.query_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.search.query_time.ms + +-- + +*`node_stats.indices.search.query_total`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.search.query_total.count + +-- + + +*`node_stats.indices.segments.count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.count + +-- + +*`node_stats.indices.segments.doc_values_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.doc_values.memory.bytes + +-- + +*`node_stats.indices.segments.fixed_bit_set_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.fixed_bit_set.memory.bytes + +-- + +*`node_stats.indices.segments.index_writer_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.index_writer.memory.bytes + +-- + +*`node_stats.indices.segments.memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.memory.bytes + +-- + +*`node_stats.indices.segments.norms_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.norms.memory.bytes + +-- + +*`node_stats.indices.segments.points_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.points.memory.bytes + +-- + +*`node_stats.indices.segments.stored_fields_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.stored_fields.memory.bytes + +-- + +*`node_stats.indices.segments.term_vectors_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.term_vectors.memory.bytes + +-- + +*`node_stats.indices.segments.terms_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.terms.memory.bytes + +-- + +*`node_stats.indices.segments.version_map_memory_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.segments.version_map.memory.bytes + +-- + + +*`node_stats.indices.store.size_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.indices.store.size.bytes + +-- + + + + + +*`node_stats.jvm.gc.collectors.old.collection_count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.jvm.gc.collectors.old.collection.count + +-- + +*`node_stats.jvm.gc.collectors.old.collection_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.jvm.gc.collectors.old.collection.ms + +-- + + +*`node_stats.jvm.gc.collectors.young.collection_count`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.jvm.gc.collectors.young.collection.count + +-- + +*`node_stats.jvm.gc.collectors.young.collection_time_in_millis`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.jvm.gc.collectors.young.collection.ms + +-- + + +*`node_stats.jvm.mem.heap_max_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.jvm.mem.heap.max.bytes + +-- + +*`node_stats.jvm.mem.heap_used_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.jvm.mem.heap.used.bytes + +-- + +*`node_stats.jvm.mem.heap_used_percent`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.jvm.mem.heap.used.pct + +-- + +*`node_stats.mlockall`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.mlockall + +-- + +*`node_stats.node_id`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.id + +-- + +*`node_stats.node_master`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.master + +-- + + + + +*`node_stats.os.cpu.load_average.1m`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cpu.load_avg.1m + +-- + +*`node_stats.os.cpu.load_average.5m`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cpu.load_avg.5m + +-- + +*`node_stats.os.cpu.load_average.15m`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cpu.load_avg.15m + +-- + + + +*`node_stats.os.cgroup.cpuacct.control_group`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpuacct.control_group + +-- + +*`node_stats.os.cgroup.cpuacct.usage_nanos`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpuacct.usage.ns + +-- + + +*`node_stats.os.cgroup.cpu.control_group`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpu.control_group + +-- + +*`node_stats.os.cgroup.cpu.cfs_period_micros`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpu.cfs.period.us + +-- + +*`node_stats.os.cgroup.cpu.cfs_quota_micros`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpu.cfs.quota.us + +-- + + +*`node_stats.os.cgroup.cpu.stat.number_of_elapsed_periods`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpu.stat.elapsed_periods.count + +-- + +*`node_stats.os.cgroup.cpu.stat.number_of_times_throttled`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpu.stat.times_throttled.count + +-- + +*`node_stats.os.cgroup.cpu.stat.time_throttled_nanos`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.cpu.stat.time_throttled.ns + +-- + + +*`node_stats.os.cgroup.memory.control_group`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.memory.control_group + +-- + +*`node_stats.os.cgroup.memory.limit_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.memory.limit.bytes + +-- + +*`node_stats.os.cgroup.memory.usage_in_bytes`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.os.cgroup.memory.usage.bytes + +-- + + + +*`node_stats.process.cpu.percent`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.process.cpu.pct + +-- + +*`node_stats.process.max_file_descriptors`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.process.file_descriptors.max.count + +-- + +*`node_stats.process.open_file_descriptors`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.process.file_descriptors.open.count + +-- + + + +*`node_stats.thread_pool.bulk.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.bulk.queue.count + +-- + +*`node_stats.thread_pool.bulk.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.bulk.rejected.count + +-- + +*`node_stats.thread_pool.bulk.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.bulk.threads.count + +-- + + +*`node_stats.thread_pool.generic.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.generic.queue.count + +-- + +*`node_stats.thread_pool.generic.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.generic.rejected.count + +-- + +*`node_stats.thread_pool.generic.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.generic.threads.count + +-- + + +*`node_stats.thread_pool.get.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.get.queue.count + +-- + +*`node_stats.thread_pool.get.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.get.rejected.count + +-- + +*`node_stats.thread_pool.get.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.get.threads.count + +-- + + +*`node_stats.thread_pool.index.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.index.queue.count + +-- + +*`node_stats.thread_pool.index.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.index.rejected.count + +-- + +*`node_stats.thread_pool.index.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.index.threads.count + +-- + + +*`node_stats.thread_pool.management.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.management.queue.count + +-- + +*`node_stats.thread_pool.management.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.management.rejected.count + +-- + +*`node_stats.thread_pool.management.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.management.threads.count + +-- + + +*`node_stats.thread_pool.search.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.search.queue.count + +-- + +*`node_stats.thread_pool.search.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.search.rejected.count + +-- + +*`node_stats.thread_pool.search.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.search.threads.count + +-- + + +*`node_stats.thread_pool.watcher.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.watcher.queue.count + +-- + +*`node_stats.thread_pool.watcher.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.watcher.rejected.count + +-- + +*`node_stats.thread_pool.watcher.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.watcher.threads.count + +-- + + +*`node_stats.thread_pool.write.queue`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.write.queue.count + +-- + +*`node_stats.thread_pool.write.rejected`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.write.rejected.count + +-- + +*`node_stats.thread_pool.write.threads`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.stats.thread_pool.write.threads.count + +-- + [float] === ccr @@ -15866,7 +16734,7 @@ Cross-cluster replication stats -*`elasticsearch.ccr.leader.index`*:: +*`node_stats.ccr.leader.index`*:: + -- Name of leader index @@ -15876,7 +16744,7 @@ type: keyword -- -*`elasticsearch.ccr.leader.max_seq_no`*:: +*`node_stats.ccr.leader.max_seq_no`*:: + -- Maximum sequence number of operation on the leader shard @@ -15887,7 +16755,7 @@ type: long -- -*`elasticsearch.ccr.follower.index`*:: +*`node_stats.ccr.follower.index`*:: + -- Name of follower index @@ -15897,7 +16765,7 @@ type: keyword -- -*`elasticsearch.ccr.follower.shard.number`*:: +*`node_stats.ccr.follower.shard.number`*:: + -- Number of the shard within the index @@ -15907,7 +16775,7 @@ type: long -- -*`elasticsearch.ccr.follower.operations_written`*:: +*`node_stats.ccr.follower.operations_written`*:: + -- Number of operations indexed (replicated) into the follower shard from the leader shard @@ -15917,7 +16785,7 @@ type: long -- -*`elasticsearch.ccr.follower.time_since_last_read.ms`*:: +*`node_stats.ccr.follower.time_since_last_read.ms`*:: + -- Time, in ms, since the follower last fetched from the leader @@ -15927,7 +16795,7 @@ type: long -- -*`elasticsearch.ccr.follower.global_checkpoint`*:: +*`node_stats.ccr.follower.global_checkpoint`*:: + -- Global checkpoint value on follower shard @@ -15944,7 +16812,7 @@ Cluster stats -*`elasticsearch.cluster.stats.status`*:: +*`node_stats.cluster.stats.status`*:: + -- Cluster status (green, yellow, red). @@ -15961,7 +16829,7 @@ Nodes statistics. -*`elasticsearch.cluster.stats.nodes.count`*:: +*`node_stats.cluster.stats.nodes.count`*:: + -- Total number of nodes in cluster. @@ -15971,7 +16839,7 @@ type: long -- -*`elasticsearch.cluster.stats.nodes.master`*:: +*`node_stats.cluster.stats.nodes.master`*:: + -- Number of master-eligible nodes in cluster. @@ -15981,7 +16849,7 @@ type: long -- -*`elasticsearch.cluster.stats.nodes.data`*:: +*`node_stats.cluster.stats.nodes.data`*:: + -- Number of data nodes in cluster. @@ -15998,7 +16866,7 @@ Indices statistics. -*`elasticsearch.cluster.stats.indices.count`*:: +*`node_stats.cluster.stats.indices.count`*:: + -- Total number of indices in cluster. @@ -16015,7 +16883,7 @@ Shard statistics. -*`elasticsearch.cluster.stats.indices.shards.count`*:: +*`node_stats.cluster.stats.indices.shards.count`*:: + -- Total number of shards in cluster. @@ -16025,7 +16893,7 @@ type: long -- -*`elasticsearch.cluster.stats.indices.shards.primaries`*:: +*`node_stats.cluster.stats.indices.shards.primaries`*:: + -- Total number of primary shards in cluster. @@ -16035,7 +16903,7 @@ type: long -- -*`elasticsearch.cluster.stats.indices.fielddata.memory.bytes`*:: +*`node_stats.cluster.stats.indices.fielddata.memory.bytes`*:: + -- Memory used for fielddata. @@ -16052,7 +16920,7 @@ Enrich stats -*`elasticsearch.enrich.queue.size`*:: +*`node_stats.enrich.queue.size`*:: + -- Number of search requests in the queue. @@ -16063,7 +16931,7 @@ type: long -- -*`elasticsearch.enrich.remote_requests.current`*:: +*`node_stats.enrich.remote_requests.current`*:: + -- Current number of outstanding remote requests. @@ -16073,7 +16941,7 @@ type: long -- -*`elasticsearch.enrich.remote_requests.total`*:: +*`node_stats.enrich.remote_requests.total`*:: + -- Number of outstanding remote requests executed since node startup. @@ -16083,7 +16951,7 @@ type: long -- -*`elasticsearch.enrich.executed_searches.total`*:: +*`node_stats.enrich.executed_searches.total`*:: + -- Number of search requests that enrich processors have executed since node startup. @@ -16100,7 +16968,7 @@ index -*`elasticsearch.index.name`*:: +*`node_stats.index.name`*:: + -- Index name. @@ -16111,7 +16979,7 @@ type: keyword -- -*`elasticsearch.index.total.docs.count`*:: +*`node_stats.index.total.docs.count`*:: + -- Total number of documents in the index. @@ -16121,7 +16989,7 @@ type: long -- -*`elasticsearch.index.total.docs.deleted`*:: +*`node_stats.index.total.docs.deleted`*:: + -- Total number of deleted documents in the index. @@ -16131,7 +16999,7 @@ type: long -- -*`elasticsearch.index.total.store.size.bytes`*:: +*`node_stats.index.total.store.size.bytes`*:: + -- Total size of the index in bytes. @@ -16143,7 +17011,7 @@ format: bytes -- -*`elasticsearch.index.total.segments.count`*:: +*`node_stats.index.total.segments.count`*:: + -- Total number of index segments. @@ -16153,7 +17021,7 @@ type: long -- -*`elasticsearch.index.total.segments.memory.bytes`*:: +*`node_stats.index.total.segments.memory.bytes`*:: + -- Total number of memory used by the segments in bytes. @@ -16172,7 +17040,7 @@ index -*`elasticsearch.index.recovery.id`*:: +*`node_stats.index.recovery.id`*:: + -- Shard recovery id. @@ -16182,7 +17050,7 @@ type: long -- -*`elasticsearch.index.recovery.type`*:: +*`node_stats.index.recovery.type`*:: + -- Shard recovery type. @@ -16192,7 +17060,7 @@ type: keyword -- -*`elasticsearch.index.recovery.primary`*:: +*`node_stats.index.recovery.primary`*:: + -- True if primary shard. @@ -16202,7 +17070,7 @@ type: boolean -- -*`elasticsearch.index.recovery.stage`*:: +*`node_stats.index.recovery.stage`*:: + -- Recovery stage. @@ -16212,7 +17080,7 @@ type: keyword -- -*`elasticsearch.index.recovery.target.id`*:: +*`node_stats.index.recovery.target.id`*:: + -- Target node id. @@ -16222,7 +17090,7 @@ type: keyword -- -*`elasticsearch.index.recovery.target.host`*:: +*`node_stats.index.recovery.target.host`*:: + -- Target node host address (could be IP address or hostname). @@ -16232,7 +17100,7 @@ type: keyword -- -*`elasticsearch.index.recovery.target.name`*:: +*`node_stats.index.recovery.target.name`*:: + -- Target node name. @@ -16242,7 +17110,7 @@ type: keyword -- -*`elasticsearch.index.recovery.source.id`*:: +*`node_stats.index.recovery.source.id`*:: + -- Source node id. @@ -16252,7 +17120,7 @@ type: keyword -- -*`elasticsearch.index.recovery.source.host`*:: +*`node_stats.index.recovery.source.host`*:: + -- Source node host address (could be IP address or hostname). @@ -16262,7 +17130,7 @@ type: keyword -- -*`elasticsearch.index.recovery.source.name`*:: +*`node_stats.index.recovery.source.name`*:: + -- Source node name. @@ -16280,7 +17148,7 @@ index -*`elasticsearch.index.summary.primaries.docs.count`*:: +*`node_stats.index.summary.primaries.docs.count`*:: + -- Total number of documents in the index. @@ -16290,7 +17158,7 @@ type: long -- -*`elasticsearch.index.summary.primaries.docs.deleted`*:: +*`node_stats.index.summary.primaries.docs.deleted`*:: + -- Total number of deleted documents in the index. @@ -16300,7 +17168,7 @@ type: long -- -*`elasticsearch.index.summary.primaries.store.size.bytes`*:: +*`node_stats.index.summary.primaries.store.size.bytes`*:: + -- Total size of the index in bytes. @@ -16312,7 +17180,7 @@ format: bytes -- -*`elasticsearch.index.summary.primaries.segments.count`*:: +*`node_stats.index.summary.primaries.segments.count`*:: + -- Total number of index segments. @@ -16322,7 +17190,7 @@ type: long -- -*`elasticsearch.index.summary.primaries.segments.memory.bytes`*:: +*`node_stats.index.summary.primaries.segments.memory.bytes`*:: + -- Total number of memory used by the segments in bytes. @@ -16335,7 +17203,7 @@ format: bytes -- -*`elasticsearch.index.summary.total.docs.count`*:: +*`node_stats.index.summary.total.docs.count`*:: + -- Total number of documents in the index. @@ -16345,7 +17213,7 @@ type: long -- -*`elasticsearch.index.summary.total.docs.deleted`*:: +*`node_stats.index.summary.total.docs.deleted`*:: + -- Total number of deleted documents in the index. @@ -16355,7 +17223,7 @@ type: long -- -*`elasticsearch.index.summary.total.store.size.bytes`*:: +*`node_stats.index.summary.total.store.size.bytes`*:: + -- Total size of the index in bytes. @@ -16367,7 +17235,7 @@ format: bytes -- -*`elasticsearch.index.summary.total.segments.count`*:: +*`node_stats.index.summary.total.segments.count`*:: + -- Total number of index segments. @@ -16377,7 +17245,7 @@ type: long -- -*`elasticsearch.index.summary.total.segments.memory.bytes`*:: +*`node_stats.index.summary.total.segments.memory.bytes`*:: + -- Total number of memory used by the segments in bytes. @@ -16396,7 +17264,7 @@ ml -*`elasticsearch.ml.job.id`*:: +*`node_stats.ml.job.id`*:: + -- Unique ml job id. @@ -16406,7 +17274,7 @@ type: keyword -- -*`elasticsearch.ml.job.state`*:: +*`node_stats.ml.job.state`*:: + -- Job state. @@ -16416,7 +17284,7 @@ type: keyword -- -*`elasticsearch.ml.job.data_counts.processed_record_count`*:: +*`node_stats.ml.job.data_counts.processed_record_count`*:: + -- Processed data events. @@ -16426,7 +17294,7 @@ type: long -- -*`elasticsearch.ml.job.data_counts.invalid_date_count`*:: +*`node_stats.ml.job.data_counts.invalid_date_count`*:: + -- The number of records with either a missing date field or a date that could not be parsed. @@ -16443,7 +17311,7 @@ node -*`elasticsearch.node.version`*:: +*`node_stats.node.version`*:: + -- Node version. @@ -16460,7 +17328,7 @@ JVM Info. -*`elasticsearch.node.jvm.version`*:: +*`node_stats.node.jvm.version`*:: + -- JVM version. @@ -16470,7 +17338,7 @@ type: keyword -- -*`elasticsearch.node.jvm.memory.heap.init.bytes`*:: +*`node_stats.node.jvm.memory.heap.init.bytes`*:: + -- Heap init used by the JVM in bytes. @@ -16482,7 +17350,7 @@ format: bytes -- -*`elasticsearch.node.jvm.memory.heap.max.bytes`*:: +*`node_stats.node.jvm.memory.heap.max.bytes`*:: + -- Heap max used by the JVM in bytes. @@ -16494,7 +17362,7 @@ format: bytes -- -*`elasticsearch.node.jvm.memory.nonheap.init.bytes`*:: +*`node_stats.node.jvm.memory.nonheap.init.bytes`*:: + -- Non-Heap init used by the JVM in bytes. @@ -16506,7 +17374,7 @@ format: bytes -- -*`elasticsearch.node.jvm.memory.nonheap.max.bytes`*:: +*`node_stats.node.jvm.memory.nonheap.max.bytes`*:: + -- Non-Heap max used by the JVM in bytes. @@ -16518,7 +17386,7 @@ format: bytes -- -*`elasticsearch.node.process.mlockall`*:: +*`node_stats.node.process.mlockall`*:: + -- If process locked in memory. @@ -16542,7 +17410,7 @@ Node indices stats -*`elasticsearch.node.stats.indices.docs.count`*:: +*`node_stats.node.stats.indices.docs.count`*:: + -- Total number of existing documents. @@ -16552,7 +17420,7 @@ type: long -- -*`elasticsearch.node.stats.indices.docs.deleted`*:: +*`node_stats.node.stats.indices.docs.deleted`*:: + -- Total number of deleted documents. @@ -16562,7 +17430,7 @@ type: long -- -*`elasticsearch.node.stats.indices.segments.count`*:: +*`node_stats.node.stats.indices.segments.count`*:: + -- Total number of segments. @@ -16572,7 +17440,7 @@ type: long -- -*`elasticsearch.node.stats.indices.segments.memory.bytes`*:: +*`node_stats.node.stats.indices.segments.memory.bytes`*:: + -- Total size of segments in bytes. @@ -16584,7 +17452,7 @@ format: bytes -- -*`elasticsearch.node.stats.indices.store.size.bytes`*:: +*`node_stats.node.stats.indices.store.size.bytes`*:: + -- Total size of the store in bytes. @@ -16608,7 +17476,7 @@ Old memory pool stats. -*`elasticsearch.node.stats.jvm.mem.pools.old.max.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.old.max.bytes`*:: + -- Max bytes. @@ -16619,7 +17487,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.old.peak.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.old.peak.bytes`*:: + -- Peak bytes. @@ -16630,7 +17498,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.old.peak_max.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.old.peak_max.bytes`*:: + -- Peak max bytes. @@ -16641,7 +17509,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.old.used.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.old.used.bytes`*:: + -- Used bytes. @@ -16659,7 +17527,7 @@ Young memory pool stats. -*`elasticsearch.node.stats.jvm.mem.pools.young.max.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.young.max.bytes`*:: + -- Max bytes. @@ -16670,7 +17538,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.young.peak.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.young.peak.bytes`*:: + -- Peak bytes. @@ -16681,7 +17549,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.young.peak_max.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.young.peak_max.bytes`*:: + -- Peak max bytes. @@ -16692,7 +17560,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.young.used.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.young.used.bytes`*:: + -- Used bytes. @@ -16710,7 +17578,7 @@ Survivor memory pool stats. -*`elasticsearch.node.stats.jvm.mem.pools.survivor.max.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.survivor.max.bytes`*:: + -- Max bytes. @@ -16721,7 +17589,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.survivor.peak.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.survivor.peak.bytes`*:: + -- Peak bytes. @@ -16732,7 +17600,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.survivor.peak_max.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.survivor.peak_max.bytes`*:: + -- Peak max bytes. @@ -16743,7 +17611,7 @@ format: bytes -- -*`elasticsearch.node.stats.jvm.mem.pools.survivor.used.bytes`*:: +*`node_stats.node.stats.jvm.mem.pools.survivor.used.bytes`*:: + -- Used bytes. @@ -16768,7 +17636,7 @@ Old collection gc. -*`elasticsearch.node.stats.jvm.gc.collectors.old.collection.count`*:: +*`node_stats.node.stats.jvm.gc.collectors.old.collection.count`*:: + -- @@ -16777,7 +17645,7 @@ type: long -- -*`elasticsearch.node.stats.jvm.gc.collectors.old.collection.ms`*:: +*`node_stats.node.stats.jvm.gc.collectors.old.collection.ms`*:: + -- @@ -16793,7 +17661,7 @@ Young collection gc. -*`elasticsearch.node.stats.jvm.gc.collectors.young.collection.count`*:: +*`node_stats.node.stats.jvm.gc.collectors.young.collection.count`*:: + -- @@ -16802,7 +17670,7 @@ type: long -- -*`elasticsearch.node.stats.jvm.gc.collectors.young.collection.ms`*:: +*`node_stats.node.stats.jvm.gc.collectors.young.collection.ms`*:: + -- @@ -16819,7 +17687,7 @@ File system summary -*`elasticsearch.node.stats.fs.summary.total.bytes`*:: +*`node_stats.node.stats.fs.summary.total.bytes`*:: + -- @@ -16830,7 +17698,7 @@ format: bytes -- -*`elasticsearch.node.stats.fs.summary.free.bytes`*:: +*`node_stats.node.stats.fs.summary.free.bytes`*:: + -- @@ -16841,7 +17709,7 @@ format: bytes -- -*`elasticsearch.node.stats.fs.summary.available.bytes`*:: +*`node_stats.node.stats.fs.summary.available.bytes`*:: + -- @@ -16854,35 +17722,35 @@ format: bytes -*`elasticsearch.node.stats.fs.io_stats.total.operations.count`*:: +*`node_stats.node.stats.fs.io_stats.total.operations.count`*:: + -- type: long -- -*`elasticsearch.node.stats.fs.io_stats.total.read.kb`*:: +*`node_stats.node.stats.fs.io_stats.total.read.kb`*:: + -- type: long -- -*`elasticsearch.node.stats.fs.io_stats.total.read.operations.count`*:: +*`node_stats.node.stats.fs.io_stats.total.read.operations.count`*:: + -- type: long -- -*`elasticsearch.node.stats.fs.io_stats.total.write.kb`*:: +*`node_stats.node.stats.fs.io_stats.total.write.kb`*:: + -- type: long -- -*`elasticsearch.node.stats.fs.io_stats.total.write.operations.count`*:: +*`node_stats.node.stats.fs.io_stats.total.write.operations.count`*:: + -- type: long @@ -16896,7 +17764,7 @@ type: long -*`elasticsearch.cluster.pending_task.insert_order`*:: +*`node_stats.cluster.pending_task.insert_order`*:: + -- Insert order @@ -16906,7 +17774,7 @@ type: long -- -*`elasticsearch.cluster.pending_task.priority`*:: +*`node_stats.cluster.pending_task.priority`*:: + -- Priority @@ -16916,7 +17784,7 @@ type: long -- -*`elasticsearch.cluster.pending_task.source`*:: +*`node_stats.cluster.pending_task.source`*:: + -- Source. For example: put-mapping @@ -16926,7 +17794,7 @@ type: keyword -- -*`elasticsearch.cluster.pending_task.time_in_queue.ms`*:: +*`node_stats.cluster.pending_task.time_in_queue.ms`*:: + -- Time in queue @@ -16943,7 +17811,7 @@ shard fields -*`elasticsearch.shard.primary`*:: +*`node_stats.shard.primary`*:: + -- True if this is the primary shard. @@ -16953,7 +17821,7 @@ type: boolean -- -*`elasticsearch.shard.number`*:: +*`node_stats.shard.number`*:: + -- The number of this shard. @@ -16963,7 +17831,7 @@ type: long -- -*`elasticsearch.shard.state`*:: +*`node_stats.shard.state`*:: + -- The state of this shard. @@ -16973,7 +17841,7 @@ type: keyword -- -*`elasticsearch.shard.relocating_node.name`*:: +*`node_stats.shard.relocating_node.name`*:: + -- The node the shard was relocated from. diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index 2d7370e71d4..f446bf53a92 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -6,10 +6,6 @@ settings: ["ssl", "http"] short_config: false fields: - - name: cluster_uuid - type: alias - path: elasticsearch.cluster.id - - name: elasticsearch type: group description: > @@ -24,6 +20,7 @@ description: > Elasticsearch cluster id. + - name: cluster.state.id type: keyword description: > @@ -51,3 +48,434 @@ type: boolean description: > Is mlockall enabled on the node? + + + + # Field aliases for migration from legacy structure + + - name: cluster_uuid + type: alias + path: elasticsearch.cluster.id + + - name: node_stats + type: group + fields: + - name: fs + type: group + fields: + - name: total + type: group + fields: + - name: available_in_bytes + path: elasticsearch.node.stats.fs.summary.available.bytes + type: alias + - name: free_in_bytes + path: elasticsearch.node.stats.fs.summary.free.bytes + type: alias + - name: total_in_bytes + path: elasticsearch.node.stats.fs.summary.total.bytes + type: alias + + - name: io_stats + type: group + fields: + - name: total + type: group + fields: + - name: operations + path: elasticsearch.node.stats.fs.io_stats.total.operations.count + type: alias + - name: read_kilobytes + path: elasticsearch.node.stats.fs.io_stats.total.read.kb + type: alias + - name: read_operations + path: elasticsearch.node.stats.fs.io_stats.total.read.operations.count + type: alias + - name: write_kilobytes + path: elasticsearch.node.stats.fs.io_stats.total.write.kb + type: alias + - name: write_operations + path: elasticsearch.node.stats.fs.io_stats.total.write.operations.count + type: alias + + - name: indices + type: group + fields: + - name: bulk + type: group + fields: + - name: avg_size_in_bytes + path: elasticsearch.node.stats.indices.bulk.avg_size.bytes + type: alias + - name: avg_time_in_millis + path: elasticsearch.node.stats.indices.bulk.avg_time.ms + type: alias + - name: total_operations + path: elasticsearch.node.stats.indices.bulk.operations.total.count + type: alias + - name: total_size_in_bytes + path: elasticsearch.node.stats.indices.bulk.total_size.bytes + type: alias + - name: total_time_in_millis + path: elasticsearch.node.stats.indices.bulk.total_time.ms + type: alias + + - name: docs + type: group + fields: + - name: count + path: elasticsearch.node.stats.indices.docs.count + type: alias + + - name: fielddata + type: group + fields: + - name: evictions + path: elasticsearch.node.stats.indices.fielddata.evictions.count + type: alias + - name: memory_size_in_bytes + path: elasticsearch.node.stats.indices.fielddata.memory.bytes + type: alias + + - name: indexing + type: group + fields: + - name: index_time_in_millis + path: elasticsearch.node.stats.indices.indexing.index_time.ms + type: alias + - name: index_total + path: elasticsearch.node.stats.indices.indexing.index_total.count + type: alias + - name: throttle_time_in_millis + path: elasticsearch.node.stats.indices.indexing.throttle_time.ms + type: alias + + - name: query_cache + type: group + fields: + - name: evictions + path: elasticsearch.node.stats.indices.query_cache.evictions.count + type: alias + - name: hit_count + path: elasticsearch.node.stats.indices.query_cache.hits.count + type: alias + - name: memory_size_in_bytes + path: elasticsearch.node.stats.indices.query_cache.memory.bytes + type: alias + - name: miss_count + path: elasticsearch.node.stats.indices.query_cache.misses.count + type: alias + + - name: request_cache + type: group + fields: + - name: evictions + path: elasticsearch.node.stats.indices.request_cache.evictions.count + type: alias + - name: hit_count + path: elasticsearch.node.stats.indices.request_cache.hits.count + type: alias + - name: memory_size_in_bytes + path: elasticsearch.node.stats.indices.request_cache.memory.bytes + type: alias + - name: miss_count + path: elasticsearch.node.stats.indices.request_cache.misses.count + type: alias + + - name: search + type: group + fields: + - name: query_time_in_millis + path: elasticsearch.node.stats.indices.search.query_time.ms + type: alias + - name: query_total + path: elasticsearch.node.stats.indices.search.query_total.count + type: alias + + - name: segments + type: group + fields: + - name: count + path: elasticsearch.node.stats.indices.segments.count + type: alias + - name: doc_values_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.doc_values.memory.bytes + type: alias + - name: fixed_bit_set_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.fixed_bit_set.memory.bytes + type: alias + - name: index_writer_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.index_writer.memory.bytes + type: alias + - name: memory_in_bytes + path: elasticsearch.node.stats.indices.segments.memory.bytes + type: alias + - name: norms_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.norms.memory.bytes + type: alias + - name: points_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.points.memory.bytes + type: alias + - name: stored_fields_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.stored_fields.memory.bytes + type: alias + - name: term_vectors_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.term_vectors.memory.bytes + type: alias + - name: terms_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.terms.memory.bytes + type: alias + - name: version_map_memory_in_bytes + path: elasticsearch.node.stats.indices.segments.version_map.memory.bytes + type: alias + + - name: store + type: group + fields: + - name: size_in_bytes + path: elasticsearch.node.stats.indices.store.size.bytes + type: alias + + - name: jvm + type: group + fields: + - name: gc + type: group + fields: + - name: collectors + type: group + fields: + - name: old + type: group + fields: + - name: collection_count + path: elasticsearch.node.stats.jvm.gc.collectors.old.collection.count + type: alias + - name: collection_time_in_millis + path: elasticsearch.node.stats.jvm.gc.collectors.old.collection.ms + type: alias + + - name: young + type: group + fields: + - name: collection_count + path: elasticsearch.node.stats.jvm.gc.collectors.young.collection.count + type: alias + - name: collection_time_in_millis + path: elasticsearch.node.stats.jvm.gc.collectors.young.collection.ms + type: alias + + - name: mem + type: group + fields: + - name: heap_max_in_bytes + path: elasticsearch.node.stats.jvm.mem.heap.max.bytes + type: alias + - name: heap_used_in_bytes + path: elasticsearch.node.stats.jvm.mem.heap.used.bytes + type: alias + - name: heap_used_percent + path: elasticsearch.node.stats.jvm.mem.heap.used.pct + type: alias + + - name: mlockall + path: elasticsearch.node.mlockall + type: alias + - name: node_id + path: elasticsearch.node.id + type: alias + - name: node_master + path: elasticsearch.node.master + type: alias + - name: os + type: group + fields: + - name: cpu + type: group + fields: + - name: load_average + type: group + fields: + - name: 1m + path: elasticsearch.node.stats.os.cpu.load_avg.1m + type: alias + - name: 5m + path: elasticsearch.node.stats.os.cpu.load_avg.5m + type: alias + - name: 15m + path: elasticsearch.node.stats.os.cpu.load_avg.15m + type: alias + + - name: cgroup + type: group + fields: + - name: cpuacct + type: group + fields: + - name: control_group + path: elasticsearch.node.stats.os.cgroup.cpuacct.control_group + type: alias + - name: usage_nanos + path: elasticsearch.node.stats.os.cgroup.cpuacct.usage.ns + type: alias + + - name: cpu + type: group + fields: + - name: control_group + path: elasticsearch.node.stats.os.cgroup.cpu.control_group + type: alias + - name: cfs_period_micros + path: elasticsearch.node.stats.os.cgroup.cpu.cfs.period.us + type: alias + - name: cfs_quota_micros + path: elasticsearch.node.stats.os.cgroup.cpu.cfs.quota.us + type: alias + - name: stat + type: group + fields: + - name: number_of_elapsed_periods + path: elasticsearch.node.stats.os.cgroup.cpu.stat.elapsed_periods.count + type: alias + - name: number_of_times_throttled + path: elasticsearch.node.stats.os.cgroup.cpu.stat.times_throttled.count + type: alias + - name: time_throttled_nanos + path: elasticsearch.node.stats.os.cgroup.cpu.stat.time_throttled.ns + type: alias + + - name: memory + type: group + fields: + - name: control_group + path: elasticsearch.node.stats.os.cgroup.memory.control_group + type: alias + - name: limit_in_bytes + path: elasticsearch.node.stats.os.cgroup.memory.limit.bytes + type: alias + - name: usage_in_bytes + path: elasticsearch.node.stats.os.cgroup.memory.usage.bytes + type: alias + + - name: process + type: group + fields: + - name: cpu + type: group + fields: + - name: percent + path: elasticsearch.node.stats.process.cpu.pct + type: alias + - name: max_file_descriptors + path: elasticsearch.node.stats.process.file_descriptors.max.count + type: alias + - name: open_file_descriptors + path: elasticsearch.node.stats.process.file_descriptors.open.count + type: alias + - name: thread_pool + type: group + fields: + - name: bulk + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.bulk.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.bulk.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.bulk.threads.count + type: alias + + - name: generic + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.generic.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.generic.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.generic.threads.count + type: alias + + - name: get + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.get.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.get.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.get.threads.count + type: alias + + - name: index + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.index.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.index.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.index.threads.count + type: alias + + - name: management + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.management.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.management.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.management.threads.count + type: alias + + - name: search + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.search.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.search.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.search.threads.count + type: alias + + - name: watcher + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.watcher.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.watcher.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.watcher.threads.count + type: alias + + - name: write + type: group + fields: + - name: queue + path: elasticsearch.node.stats.thread_pool.write.queue.count + type: alias + - name: rejected + path: elasticsearch.node.stats.thread_pool.write.rejected.count + type: alias + - name: threads + path: elasticsearch.node.stats.thread_pool.write.threads.count + type: alias + diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index e1501b0fec1..2663d8ae1de 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From b1365c8ce3fc9c23291a5761417185b90c790a2f Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 9 Jul 2020 16:47:01 -0700 Subject: [PATCH 05/32] Adding more fields to mapping --- metricbeat/docs/fields.asciidoc | 597 +++++++++++++++++- metricbeat/module/elasticsearch/fields.go | 2 +- .../elasticsearch/node_stats/_meta/fields.yml | 525 +++++++++++---- 3 files changed, 991 insertions(+), 133 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 0c5c7497a39..d3d0fdc7718 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -17397,12 +17397,27 @@ type: boolean -- [float] -=== node.stats +=== node node_stats +*`node_stats.node.mlockall`*:: ++ +-- +type: long + +-- + +*`node_stats.node.master`*:: ++ +-- +type: long + +-- + + [float] === indices @@ -17462,6 +17477,273 @@ type: long -- + +*`node_stats.node.stats.indices.bulk.avg_size.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.bulk.avg_time.ms`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.bulk.operations.total.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.bulk.total_size.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.bulk.total_time.ms`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.indices.fielddata.evictions.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.fielddata.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + + +*`node_stats.node.stats.indices.indexing.index_time.ms`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.indexing.index_total.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.indexing.throttle_time.ms`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.indices.query_cache.evictions.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.query_cache.hits.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.query_cache.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.query_cache.misses.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.indices.request_cache.evictions.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.request_cache.hits.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.request_cache.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.request_cache.misses.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.indices.search.query_time.ms`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.indices.search.query_total.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.indices.segments.doc_values.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.fixed_bit_set.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.index_writer.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.norms.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.points.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.stored_fields.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.term_vectors.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.terms.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.indices.segments.version_map.memory.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + + +*`node_stats.node.stats.jvm.mem.heap.max.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + + +*`node_stats.node.stats.jvm.mem.heap.used.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.jvm.mem.heap.used.pct`*:: ++ +-- +type: long + +format: percent + +-- + [float] === jvm.mem.pools @@ -17729,6 +18011,7 @@ type: long -- + *`node_stats.node.stats.fs.io_stats.total.read.kb`*:: + -- @@ -17743,6 +18026,7 @@ type: long -- + *`node_stats.node.stats.fs.io_stats.total.write.kb`*:: + -- @@ -17757,6 +18041,317 @@ type: long -- + +*`node_stats.node.stats.os.cpu.load_avg.1m`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.os.cpu.load_avg.5m`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.os.cpu.load_avg.15m`*:: ++ +-- +type: long + +-- + + + +*`node_stats.node.stats.os.cpu.cgroup.cpuacct.control_group`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.os.cpu.cgroup.cpuacct.usage.ns`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.os.cpu.cgroup.cpu.control_group`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.os.cpu.cgroup.cpu.cfs.period.us`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.os.cpu.cgroup.cpu.cfs.quota.us`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.os.cpu.cgroup.cpu.stat.elapsed_periods.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.os.cpu.cgroup.cpu.stat.times_throttled.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.os.cpu.cgroup.cpu.stat.time_throttled.ns`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.os.cpu.cgroup.memory.control_group`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.os.cpu.cgroup.memory.limit.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + +*`node_stats.node.stats.os.cpu.cgroup.memory.usage.bytes`*:: ++ +-- +type: long + +format: bytes + +-- + + +*`node_stats.node.stats.process.cpu.pct`*:: ++ +-- +type: long + +format: percent + +-- + + +*`node_stats.node.stats.process.file_descriptors.max.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.process.file_descriptors.open.count`*:: ++ +-- +type: long + +-- + + + +*`node_stats.node.stats.thread_pool.bulk.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.bulk.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.bulk.threads.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.thread_pool.generic.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.generic.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.generic.threads.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.thread_pool.get.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.get.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.get.threads.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.thread_pool.index.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.index.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.index.threads.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.thread_pool.management.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.management.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.management.threads.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.thread_pool.search.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.search.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.search.threads.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.thread_pool.watcher.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.watcher.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.watcher.threads.count`*:: ++ +-- +type: long + +-- + + +*`node_stats.node.stats.thread_pool.write.queue.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.write.rejected.count`*:: ++ +-- +type: long + +-- + +*`node_stats.node.stats.thread_pool.write.threads.count`*:: ++ +-- +type: long + +-- + [float] === cluster.pending_task diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 2663d8ae1de..fa6ab331303 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml index 820f6210248..aeef6f35a93 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml @@ -1,177 +1,440 @@ -- name: node.stats +- name: node type: group description: > node_stats release: ga fields: - - name: indices + - name: mlockall + type: long + - name: master + type: long + - name: stats type: group - description: > - Node indices stats fields: - - name: docs.count - type: long - description: > - Total number of existing documents. - - name: docs.deleted - type: long - description: > - Total number of deleted documents. - - name: segments.count - type: long - description: > - Total number of segments. - - name: segments.memory.bytes - type: long - format: bytes - description: > - Total size of segments in bytes. - - name: store.size.bytes - type: long - description: > - Total size of the store in bytes. - - name: jvm.mem.pools - type: group - description: > - JVM memory pool stats - fields: - - name: old + - name: indices type: group description: > - Old memory pool stats. + Node indices stats fields: - - name: max.bytes - type: long - format: bytes - description: - Max bytes. - - name: peak.bytes - type: long - format: bytes - description: - Peak bytes. - - name: peak_max.bytes + - name: docs.count type: long - format: bytes - description: - Peak max bytes. - - name: used.bytes - type: long - format: bytes - description: - Used bytes. - - name: young - type: group - description: > - Young memory pool stats. - fields: - - name: max.bytes + description: > + Total number of existing documents. + - name: docs.deleted type: long - format: bytes - description: - Max bytes. - - name: peak.bytes + description: > + Total number of deleted documents. + - name: segments.count type: long - format: bytes - description: - Peak bytes. - - name: peak_max.bytes + description: > + Total number of segments. + - name: segments.memory.bytes type: long format: bytes - description: - Peak max bytes. - - name: used.bytes + description: > + Total size of segments in bytes. + - name: store.size.bytes type: long - format: bytes - description: - Used bytes. - - name: survivor + description: > + Total size of the store in bytes. + - name: bulk + type: group + fields: + - name: avg_size.bytes + type: long + format: bytes + - name: avg_time.ms + type: long + - name: operations.total.count + type: long + - name: total_size.bytes + type: long + format: bytes + - name: total_time.ms + type: long + - name: fielddata + type: group + fields: + - name: evictions.count + type: long + - name: memory.bytes + type: long + format: bytes + - name: indexing + type: group + fields: + - name: index_time.ms + type: long + - name: index_total.count + type: long + - name: throttle_time.ms + type: long + - name: query_cache + type: group + fields: + - name: evictions.count + type: long + - name: hits.count + type: long + - name: memory.bytes + type: long + format: bytes + - name: misses.count + type: long + - name: request_cache + type: group + fields: + - name: evictions.count + type: long + - name: hits.count + type: long + - name: memory.bytes + type: long + format: bytes + - name: misses.count + type: long + - name: search + type: group + fields: + - name: query_time.ms + type: long + - name: query_total.count + type: long + - name: segments + type: group + fields: + - name: doc_values.memory.bytes + type: long + format: bytes + - name: fixed_bit_set.memory.bytes + type: long + format: bytes + - name: index_writer.memory.bytes + type: long + format: bytes + - name: norms.memory.bytes + type: long + format: bytes + - name: points.memory.bytes + type: long + format: bytes + - name: stored_fields.memory.bytes + type: long + format: bytes + - name: term_vectors.memory.bytes + type: long + format: bytes + - name: terms.memory.bytes + type: long + format: bytes + - name: version_map.memory.bytes + type: long + format: bytes + - name: jvm.mem.heap type: group - description: > - Survivor memory pool stats. fields: - name: max.bytes type: long format: bytes - description: - Max bytes. - - name: peak.bytes - type: long - format: bytes - description: - Peak bytes. - - name: peak_max.bytes - type: long - format: bytes - description: - Peak max bytes. - - name: used.bytes - type: long - format: bytes - description: - Used bytes. - - - name: jvm.gc.collectors - type: group - description: > - GC collector stats. - fields: - - name: old.collection + - name: used + type: group + fields: + - name: bytes + type: long + format: bytes + - name: pct + type: long + format: percent + - name: jvm.mem.pools type: group description: > - Old collection gc. + JVM memory pool stats fields: - - name: count - type: long + - name: old + type: group description: > - - name: ms - type: long + Old memory pool stats. + fields: + - name: max.bytes + type: long + format: bytes + description: + Max bytes. + - name: peak.bytes + type: long + format: bytes + description: + Peak bytes. + - name: peak_max.bytes + type: long + format: bytes + description: + Peak max bytes. + - name: used.bytes + type: long + format: bytes + description: + Used bytes. + - name: young + type: group + description: > + Young memory pool stats. + fields: + - name: max.bytes + type: long + format: bytes + description: + Max bytes. + - name: peak.bytes + type: long + format: bytes + description: + Peak bytes. + - name: peak_max.bytes + type: long + format: bytes + description: + Peak max bytes. + - name: used.bytes + type: long + format: bytes + description: + Used bytes. + - name: survivor + type: group description: > - - name: young.collection + Survivor memory pool stats. + fields: + - name: max.bytes + type: long + format: bytes + description: + Max bytes. + - name: peak.bytes + type: long + format: bytes + description: + Peak bytes. + - name: peak_max.bytes + type: long + format: bytes + description: + Peak max bytes. + - name: used.bytes + type: long + format: bytes + description: + Used bytes. + - name: jvm.gc.collectors type: group description: > - Young collection gc. + GC collector stats. fields: - - name: count - type: long + - name: old.collection + type: group description: > - - name: ms - type: long + Old collection gc. + fields: + - name: count + type: long + description: > + - name: ms + type: long + description: > + - name: young.collection + type: group description: > + Young collection gc. + fields: + - name: count + type: long + description: > + - name: ms + type: long + description: > - - name: fs - type: group - fields: - - name: summary + - name: fs type: group - description: > - File system summary fields: - - name: total.bytes - type: long - format: bytes + - name: summary + type: group description: > - - name: free.bytes + File system summary + fields: + - name: total.bytes + type: long + format: bytes + description: > + - name: free.bytes + type: long + format: bytes + description: > + - name: available.bytes + type: long + format: bytes + description: > + - name: io_stats + type: group + fields: + - name: total + type: group + fields: + - name: operations.count + type: long + - name: read + type: group + fields: + - name: kb + type: long + - name: operations.count + type: long + - name: write + type: group + fields: + - name: kb + type: long + - name: operations.count + type: long + - name: os.cpu + type: group + fields: + - name: load_avg.1m type: long - format: bytes - description: > - - name: available.bytes + - name: load_avg.5m type: long - format: bytes - description: > - - name: io_stats + - name: load_avg.15m + type: long + - name: cgroup + type: group + fields: + - name: cpuacct + type: group + fields: + - name: control_group + type: long + - name: usage.ns + type: long + - name: cpu + type: group + fields: + - name: control_group + type: long + - name: cfs + type: group + fields: + - name: period.us + type: long + - name: quota.us + type: group + type: long + - name: stat + type: group + fields: + - name: elapsed_periods.count + type: long + - name: times_throttled.count + type: long + - name: time_throttled.ns + type: long + - name: memory + type: group + fields: + - name: control_group + type: long + - name: limit.bytes + type: long + format: bytes + - name: usage.bytes + type: long + format: bytes + - name: process type: group fields: - - name: total + - name: cpu.pct + type: long + format: percent + - name: file_descriptors + type: group + fields: + - name: max.count + type: long + - name: open.count + type: long + - name: thread_pool + type: group + fields: + - name: bulk + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: generic + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: get + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: index + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: management + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: search type: group fields: - - name: operations.count + - name: queue.count type: long - - name: read.kb + - name: rejected.count type: long - - name: read.operations.count + - name: threads.count type: long - - name: write.kb + - name: watcher + type: group + fields: + - name: queue.count + type: long + - name: rejected.count type: long - - name: write.operations.count + - name: threads.count + type: long + - name: write + type: group + fields: + - name: queue.count type: long + - name: rejected.count + type: long + - name: threads.count + type: long + + + From c212bd197c19b1815c2661fa6f726cc4a1dc5521 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 9 Jul 2020 16:47:13 -0700 Subject: [PATCH 06/32] Marking optional fields --- metricbeat/module/elasticsearch/node_stats/data.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 94a82adb249..062bae9eabb 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -225,8 +225,8 @@ var ( "count": c.Int("write_operations"), }, }, - }), - }), + }, c.DictOptional), + }, c.DictOptional), }), "os": c.Dict("os", s.Schema{ "cpu": c.Dict("cpu", s.Schema{ From a43b9276d497fc4647f1592d067acdb9ccee922c Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 9 Jul 2020 16:47:20 -0700 Subject: [PATCH 07/32] Fixing datatypes --- metricbeat/module/elasticsearch/node_stats/data.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 062bae9eabb..1154b9b8c2b 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -267,11 +267,12 @@ var ( }), "memory": c.Dict("memory", s.Schema{ "control_group": c.Str("control_group"), + // The two following values are currently string. See https://github.com/elastic/elasticsearch/pull/26166 "limit": s.Object{ - "bytes": c.Int("limit_in_bytes"), + "bytes": c.Str("limit_in_bytes"), }, "usage": s.Object{ - "bytes": c.Int("usage_in_bytes"), + "bytes": c.Str("usage_in_bytes"), }, }), }), From eed1f9a2b814282c945512466dedd2e0809fce15 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 9 Jul 2020 17:11:19 -0700 Subject: [PATCH 08/32] Fixing formatting --- metricbeat/docs/fields.asciidoc | 17 +- .../module/elasticsearch/_meta/fields.yml | 39 +- metricbeat/module/elasticsearch/fields.go | 2 +- .../elasticsearch/node_stats/_meta/fields.yml | 744 +++++++++--------- 4 files changed, 371 insertions(+), 431 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index d3d0fdc7718..f0c11c6cb01 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -17397,27 +17397,12 @@ type: boolean -- [float] -=== node +=== node.stats node_stats -*`node_stats.node.mlockall`*:: -+ --- -type: long - --- - -*`node_stats.node.master`*:: -+ --- -type: long - --- - - [float] === indices diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index f446bf53a92..b03bbbdba18 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -14,18 +14,14 @@ type: keyword description: > Elasticsearch cluster name. - - name: cluster.id type: keyword description: > Elasticsearch cluster id. - - - name: cluster.state.id type: keyword description: > Elasticsearch state id. - - name: node type: group fields: @@ -33,30 +29,22 @@ type: keyword description: > Node ID - - name: name type: keyword description: > Node name. - - name: master type: boolean description: > Is the node the master node? - - name: mlockall type: boolean description: > Is mlockall enabled on the node? - - - - # Field aliases for migration from legacy structure - + # Field aliases for migration from legacy structure - name: cluster_uuid type: alias path: elasticsearch.cluster.id - - name: node_stats type: group fields: @@ -75,7 +63,6 @@ - name: total_in_bytes path: elasticsearch.node.stats.fs.summary.total.bytes type: alias - - name: io_stats type: group fields: @@ -97,7 +84,6 @@ - name: write_operations path: elasticsearch.node.stats.fs.io_stats.total.write.operations.count type: alias - - name: indices type: group fields: @@ -119,14 +105,12 @@ - name: total_time_in_millis path: elasticsearch.node.stats.indices.bulk.total_time.ms type: alias - - name: docs type: group fields: - name: count path: elasticsearch.node.stats.indices.docs.count type: alias - - name: fielddata type: group fields: @@ -136,7 +120,6 @@ - name: memory_size_in_bytes path: elasticsearch.node.stats.indices.fielddata.memory.bytes type: alias - - name: indexing type: group fields: @@ -149,7 +132,6 @@ - name: throttle_time_in_millis path: elasticsearch.node.stats.indices.indexing.throttle_time.ms type: alias - - name: query_cache type: group fields: @@ -181,7 +163,6 @@ - name: miss_count path: elasticsearch.node.stats.indices.request_cache.misses.count type: alias - - name: search type: group fields: @@ -191,7 +172,6 @@ - name: query_total path: elasticsearch.node.stats.indices.search.query_total.count type: alias - - name: segments type: group fields: @@ -228,14 +208,12 @@ - name: version_map_memory_in_bytes path: elasticsearch.node.stats.indices.segments.version_map.memory.bytes type: alias - - name: store type: group fields: - name: size_in_bytes path: elasticsearch.node.stats.indices.store.size.bytes type: alias - - name: jvm type: group fields: @@ -254,7 +232,6 @@ - name: collection_time_in_millis path: elasticsearch.node.stats.jvm.gc.collectors.old.collection.ms type: alias - - name: young type: group fields: @@ -264,7 +241,6 @@ - name: collection_time_in_millis path: elasticsearch.node.stats.jvm.gc.collectors.young.collection.ms type: alias - - name: mem type: group fields: @@ -277,7 +253,6 @@ - name: heap_used_percent path: elasticsearch.node.stats.jvm.mem.heap.used.pct type: alias - - name: mlockall path: elasticsearch.node.mlockall type: alias @@ -305,7 +280,6 @@ - name: 15m path: elasticsearch.node.stats.os.cpu.load_avg.15m type: alias - - name: cgroup type: group fields: @@ -318,7 +292,6 @@ - name: usage_nanos path: elasticsearch.node.stats.os.cgroup.cpuacct.usage.ns type: alias - - name: cpu type: group fields: @@ -343,7 +316,6 @@ - name: time_throttled_nanos path: elasticsearch.node.stats.os.cgroup.cpu.stat.time_throttled.ns type: alias - - name: memory type: group fields: @@ -356,7 +328,6 @@ - name: usage_in_bytes path: elasticsearch.node.stats.os.cgroup.memory.usage.bytes type: alias - - name: process type: group fields: @@ -387,7 +358,6 @@ - name: threads path: elasticsearch.node.stats.thread_pool.bulk.threads.count type: alias - - name: generic type: group fields: @@ -400,7 +370,6 @@ - name: threads path: elasticsearch.node.stats.thread_pool.generic.threads.count type: alias - - name: get type: group fields: @@ -413,7 +382,6 @@ - name: threads path: elasticsearch.node.stats.thread_pool.get.threads.count type: alias - - name: index type: group fields: @@ -426,7 +394,6 @@ - name: threads path: elasticsearch.node.stats.thread_pool.index.threads.count type: alias - - name: management type: group fields: @@ -439,7 +406,6 @@ - name: threads path: elasticsearch.node.stats.thread_pool.management.threads.count type: alias - - name: search type: group fields: @@ -452,7 +418,6 @@ - name: threads path: elasticsearch.node.stats.thread_pool.search.threads.count type: alias - - name: watcher type: group fields: @@ -465,7 +430,6 @@ - name: threads path: elasticsearch.node.stats.thread_pool.watcher.threads.count type: alias - - name: write type: group fields: @@ -478,4 +442,3 @@ - name: threads path: elasticsearch.node.stats.thread_pool.write.threads.count type: alias - diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index fa6ab331303..20625cebd60 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml index aeef6f35a93..ab9c954c9b5 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml @@ -1,440 +1,432 @@ -- name: node +- name: node.stats type: group description: > node_stats release: ga fields: - - name: mlockall - type: long - - name: master - type: long - - name: stats + - name: indices type: group + description: > + Node indices stats fields: - - name: indices + - name: docs.count + type: long + description: > + Total number of existing documents. + - name: docs.deleted + type: long + description: > + Total number of deleted documents. + - name: segments.count + type: long + description: > + Total number of segments. + - name: segments.memory.bytes + type: long + format: bytes + description: > + Total size of segments in bytes. + - name: store.size.bytes + type: long + description: > + Total size of the store in bytes. + - name: bulk + type: group + fields: + - name: avg_size.bytes + type: long + format: bytes + - name: avg_time.ms + type: long + - name: operations.total.count + type: long + - name: total_size.bytes + type: long + format: bytes + - name: total_time.ms + type: long + - name: fielddata + type: group + fields: + - name: evictions.count + type: long + - name: memory.bytes + type: long + format: bytes + - name: indexing + type: group + fields: + - name: index_time.ms + type: long + - name: index_total.count + type: long + - name: throttle_time.ms + type: long + - name: query_cache + type: group + fields: + - name: evictions.count + type: long + - name: hits.count + type: long + - name: memory.bytes + type: long + format: bytes + - name: misses.count + type: long + - name: request_cache + type: group + fields: + - name: evictions.count + type: long + - name: hits.count + type: long + - name: memory.bytes + type: long + format: bytes + - name: misses.count + type: long + - name: search + type: group + fields: + - name: query_time.ms + type: long + - name: query_total.count + type: long + - name: segments + type: group + fields: + - name: doc_values.memory.bytes + type: long + format: bytes + - name: fixed_bit_set.memory.bytes + type: long + format: bytes + - name: index_writer.memory.bytes + type: long + format: bytes + - name: norms.memory.bytes + type: long + format: bytes + - name: points.memory.bytes + type: long + format: bytes + - name: stored_fields.memory.bytes + type: long + format: bytes + - name: term_vectors.memory.bytes + type: long + format: bytes + - name: terms.memory.bytes + type: long + format: bytes + - name: version_map.memory.bytes + type: long + format: bytes + - name: jvm.mem.heap + type: group + fields: + - name: max.bytes + type: long + format: bytes + - name: used + type: group + fields: + - name: bytes + type: long + format: bytes + - name: pct + type: long + format: percent + - name: jvm.mem.pools + type: group + description: > + JVM memory pool stats + fields: + - name: old type: group description: > - Node indices stats + Old memory pool stats. fields: - - name: docs.count + - name: max.bytes type: long - description: > - Total number of existing documents. - - name: docs.deleted + format: bytes + description: + Max bytes. + - name: peak.bytes type: long - description: > - Total number of deleted documents. - - name: segments.count + format: bytes + description: + Peak bytes. + - name: peak_max.bytes type: long - description: > - Total number of segments. - - name: segments.memory.bytes + format: bytes + description: + Peak max bytes. + - name: used.bytes type: long format: bytes - description: > - Total size of segments in bytes. - - name: store.size.bytes + description: + Used bytes. + - name: young + type: group + description: > + Young memory pool stats. + fields: + - name: max.bytes type: long - description: > - Total size of the store in bytes. - - name: bulk - type: group - fields: - - name: avg_size.bytes - type: long - format: bytes - - name: avg_time.ms - type: long - - name: operations.total.count - type: long - - name: total_size.bytes - type: long - format: bytes - - name: total_time.ms - type: long - - name: fielddata - type: group - fields: - - name: evictions.count - type: long - - name: memory.bytes - type: long - format: bytes - - name: indexing - type: group - fields: - - name: index_time.ms - type: long - - name: index_total.count - type: long - - name: throttle_time.ms - type: long - - name: query_cache - type: group - fields: - - name: evictions.count - type: long - - name: hits.count - type: long - - name: memory.bytes - type: long - format: bytes - - name: misses.count - type: long - - name: request_cache - type: group - fields: - - name: evictions.count - type: long - - name: hits.count - type: long - - name: memory.bytes - type: long - format: bytes - - name: misses.count - type: long - - name: search - type: group - fields: - - name: query_time.ms - type: long - - name: query_total.count - type: long - - name: segments - type: group - fields: - - name: doc_values.memory.bytes - type: long - format: bytes - - name: fixed_bit_set.memory.bytes - type: long - format: bytes - - name: index_writer.memory.bytes - type: long - format: bytes - - name: norms.memory.bytes - type: long - format: bytes - - name: points.memory.bytes - type: long - format: bytes - - name: stored_fields.memory.bytes - type: long - format: bytes - - name: term_vectors.memory.bytes - type: long - format: bytes - - name: terms.memory.bytes - type: long - format: bytes - - name: version_map.memory.bytes - type: long - format: bytes - - name: jvm.mem.heap + format: bytes + description: + Max bytes. + - name: peak.bytes + type: long + format: bytes + description: + Peak bytes. + - name: peak_max.bytes + type: long + format: bytes + description: + Peak max bytes. + - name: used.bytes + type: long + format: bytes + description: + Used bytes. + - name: survivor type: group + description: > + Survivor memory pool stats. fields: - name: max.bytes type: long format: bytes - - name: used - type: group - fields: - - name: bytes - type: long - format: bytes - - name: pct - type: long - format: percent - - name: jvm.mem.pools + description: + Max bytes. + - name: peak.bytes + type: long + format: bytes + description: + Peak bytes. + - name: peak_max.bytes + type: long + format: bytes + description: + Peak max bytes. + - name: used.bytes + type: long + format: bytes + description: + Used bytes. + - name: jvm.gc.collectors + type: group + description: > + GC collector stats. + fields: + - name: old.collection type: group description: > - JVM memory pool stats + Old collection gc. fields: - - name: old - type: group - description: > - Old memory pool stats. - fields: - - name: max.bytes - type: long - format: bytes - description: - Max bytes. - - name: peak.bytes - type: long - format: bytes - description: - Peak bytes. - - name: peak_max.bytes - type: long - format: bytes - description: - Peak max bytes. - - name: used.bytes - type: long - format: bytes - description: - Used bytes. - - name: young - type: group + - name: count + type: long description: > - Young memory pool stats. - fields: - - name: max.bytes - type: long - format: bytes - description: - Max bytes. - - name: peak.bytes - type: long - format: bytes - description: - Peak bytes. - - name: peak_max.bytes - type: long - format: bytes - description: - Peak max bytes. - - name: used.bytes - type: long - format: bytes - description: - Used bytes. - - name: survivor - type: group + - name: ms + type: long description: > - Survivor memory pool stats. - fields: - - name: max.bytes - type: long - format: bytes - description: - Max bytes. - - name: peak.bytes - type: long - format: bytes - description: - Peak bytes. - - name: peak_max.bytes - type: long - format: bytes - description: - Peak max bytes. - - name: used.bytes - type: long - format: bytes - description: - Used bytes. - - name: jvm.gc.collectors + - name: young.collection type: group description: > - GC collector stats. + Young collection gc. fields: - - name: old.collection - type: group + - name: count + type: long description: > - Old collection gc. - fields: - - name: count - type: long - description: > - - name: ms - type: long - description: > - - name: young.collection - type: group + - name: ms + type: long description: > - Young collection gc. - fields: - - name: count - type: long - description: > - - name: ms - type: long - description: > - - name: fs - type: group - fields: - - name: summary - type: group - description: > - File system summary - fields: - - name: total.bytes - type: long - format: bytes - description: > - - name: free.bytes - type: long - format: bytes - description: > - - name: available.bytes - type: long - format: bytes - description: > - - name: io_stats - type: group - fields: - - name: total - type: group - fields: - - name: operations.count - type: long - - name: read - type: group - fields: - - name: kb - type: long - - name: operations.count - type: long - - name: write - type: group - fields: - - name: kb - type: long - - name: operations.count - type: long - - name: os.cpu + - name: fs + type: group + fields: + - name: summary type: group + description: > + File system summary fields: - - name: load_avg.1m + - name: total.bytes type: long - - name: load_avg.5m + format: bytes + description: > + - name: free.bytes type: long - - name: load_avg.15m + format: bytes + description: > + - name: available.bytes type: long - - name: cgroup + format: bytes + description: > + - name: io_stats + type: group + fields: + - name: total type: group fields: - - name: cpuacct + - name: operations.count + type: long + - name: read type: group fields: - - name: control_group - type: long - - name: usage.ns + - name: kb type: long - - name: cpu - type: group - fields: - - name: control_group + - name: operations.count type: long - - name: cfs - type: group - fields: - - name: period.us - type: long - - name: quota.us - type: group - type: long - - name: stat - type: group - fields: - - name: elapsed_periods.count - type: long - - name: times_throttled.count - type: long - - name: time_throttled.ns - type: long - - name: memory + - name: write type: group fields: - - name: control_group + - name: kb type: long - - name: limit.bytes - type: long - format: bytes - - name: usage.bytes + - name: operations.count type: long - format: bytes - - name: process - type: group - fields: - - name: cpu.pct - type: long - format: percent - - name: file_descriptors - type: group - fields: - - name: max.count - type: long - - name: open.count - type: long - - name: thread_pool + - name: os.cpu + type: group + fields: + - name: load_avg.1m + type: long + - name: load_avg.5m + type: long + - name: load_avg.15m + type: long + - name: cgroup type: group fields: - - name: bulk + - name: cpuacct type: group fields: - - name: queue.count - type: long - - name: rejected.count + - name: control_group type: long - - name: threads.count + - name: usage.ns type: long - - name: generic + - name: cpu type: group fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count + - name: control_group type: long - - name: get - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - - name: index - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - - name: management - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - - name: search - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - - name: watcher - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - - name: write + - name: cfs + type: group + fields: + - name: period.us + type: long + - name: quota.us + type: long + - name: stat + type: group + fields: + - name: elapsed_periods.count + type: long + - name: times_throttled.count + type: long + - name: time_throttled.ns + type: long + - name: memory type: group fields: - - name: queue.count + - name: control_group type: long - - name: rejected.count + - name: limit.bytes type: long - - name: threads.count + format: bytes + - name: usage.bytes type: long + format: bytes + - name: process + type: group + fields: + - name: cpu.pct + type: long + format: percent + - name: file_descriptors + type: group + fields: + - name: max.count + type: long + - name: open.count + type: long + - name: thread_pool + type: group + fields: + - name: bulk + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: generic + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: get + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: index + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: management + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: search + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: watcher + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long + - name: write + type: group + fields: + - name: queue.count + type: long + - name: rejected.count + type: long + - name: threads.count + type: long From 552a256eaee36cf02ce3e02a0bd03083f52a6331 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 16 Jul 2020 16:16:36 -0700 Subject: [PATCH 09/32] Fixing alias field definitions --- metricbeat/docs/fields.asciidoc | 486 +++++++++--------- .../module/elasticsearch/_meta/fields.yml | 72 ++- metricbeat/module/elasticsearch/fields.go | 2 +- 3 files changed, 279 insertions(+), 281 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index f0c11c6cb01..020d998f6da 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -15772,83 +15772,6 @@ Elasticsearch module -[float] -=== elasticsearch - - - - -*`elasticsearch.cluster.name`*:: -+ --- -Elasticsearch cluster name. - - -type: keyword - --- - -*`elasticsearch.cluster.id`*:: -+ --- -Elasticsearch cluster id. - - -type: keyword - --- - -*`elasticsearch.cluster.state.id`*:: -+ --- -Elasticsearch state id. - - -type: keyword - --- - - -*`elasticsearch.node.id`*:: -+ --- -Node ID - - -type: keyword - --- - -*`elasticsearch.node.name`*:: -+ --- -Node name. - - -type: keyword - --- - -*`elasticsearch.node.master`*:: -+ --- -Is the node the master node? - - -type: boolean - --- - -*`elasticsearch.node.mlockall`*:: -+ --- -Is mlockall enabled on the node? - - -type: boolean - --- - *`cluster_uuid`*:: + -- @@ -16726,6 +16649,83 @@ alias to: elasticsearch.node.stats.thread_pool.write.threads.count -- +[float] +=== elasticsearch + + + + +*`elasticsearch.cluster.name`*:: ++ +-- +Elasticsearch cluster name. + + +type: keyword + +-- + +*`elasticsearch.cluster.id`*:: ++ +-- +Elasticsearch cluster id. + + +type: keyword + +-- + +*`elasticsearch.cluster.state.id`*:: ++ +-- +Elasticsearch state id. + + +type: keyword + +-- + + +*`elasticsearch.node.id`*:: ++ +-- +Node ID + + +type: keyword + +-- + +*`elasticsearch.node.name`*:: ++ +-- +Node name. + + +type: keyword + +-- + +*`elasticsearch.node.master`*:: ++ +-- +Is the node the master node? + + +type: boolean + +-- + +*`elasticsearch.node.mlockall`*:: ++ +-- +Is mlockall enabled on the node? + + +type: boolean + +-- + [float] === ccr @@ -16734,7 +16734,7 @@ Cross-cluster replication stats -*`node_stats.ccr.leader.index`*:: +*`elasticsearch.ccr.leader.index`*:: + -- Name of leader index @@ -16744,7 +16744,7 @@ type: keyword -- -*`node_stats.ccr.leader.max_seq_no`*:: +*`elasticsearch.ccr.leader.max_seq_no`*:: + -- Maximum sequence number of operation on the leader shard @@ -16755,7 +16755,7 @@ type: long -- -*`node_stats.ccr.follower.index`*:: +*`elasticsearch.ccr.follower.index`*:: + -- Name of follower index @@ -16765,7 +16765,7 @@ type: keyword -- -*`node_stats.ccr.follower.shard.number`*:: +*`elasticsearch.ccr.follower.shard.number`*:: + -- Number of the shard within the index @@ -16775,7 +16775,7 @@ type: long -- -*`node_stats.ccr.follower.operations_written`*:: +*`elasticsearch.ccr.follower.operations_written`*:: + -- Number of operations indexed (replicated) into the follower shard from the leader shard @@ -16785,7 +16785,7 @@ type: long -- -*`node_stats.ccr.follower.time_since_last_read.ms`*:: +*`elasticsearch.ccr.follower.time_since_last_read.ms`*:: + -- Time, in ms, since the follower last fetched from the leader @@ -16795,7 +16795,7 @@ type: long -- -*`node_stats.ccr.follower.global_checkpoint`*:: +*`elasticsearch.ccr.follower.global_checkpoint`*:: + -- Global checkpoint value on follower shard @@ -16812,7 +16812,7 @@ Cluster stats -*`node_stats.cluster.stats.status`*:: +*`elasticsearch.cluster.stats.status`*:: + -- Cluster status (green, yellow, red). @@ -16829,7 +16829,7 @@ Nodes statistics. -*`node_stats.cluster.stats.nodes.count`*:: +*`elasticsearch.cluster.stats.nodes.count`*:: + -- Total number of nodes in cluster. @@ -16839,7 +16839,7 @@ type: long -- -*`node_stats.cluster.stats.nodes.master`*:: +*`elasticsearch.cluster.stats.nodes.master`*:: + -- Number of master-eligible nodes in cluster. @@ -16849,7 +16849,7 @@ type: long -- -*`node_stats.cluster.stats.nodes.data`*:: +*`elasticsearch.cluster.stats.nodes.data`*:: + -- Number of data nodes in cluster. @@ -16866,7 +16866,7 @@ Indices statistics. -*`node_stats.cluster.stats.indices.count`*:: +*`elasticsearch.cluster.stats.indices.count`*:: + -- Total number of indices in cluster. @@ -16883,7 +16883,7 @@ Shard statistics. -*`node_stats.cluster.stats.indices.shards.count`*:: +*`elasticsearch.cluster.stats.indices.shards.count`*:: + -- Total number of shards in cluster. @@ -16893,7 +16893,7 @@ type: long -- -*`node_stats.cluster.stats.indices.shards.primaries`*:: +*`elasticsearch.cluster.stats.indices.shards.primaries`*:: + -- Total number of primary shards in cluster. @@ -16903,7 +16903,7 @@ type: long -- -*`node_stats.cluster.stats.indices.fielddata.memory.bytes`*:: +*`elasticsearch.cluster.stats.indices.fielddata.memory.bytes`*:: + -- Memory used for fielddata. @@ -16920,7 +16920,7 @@ Enrich stats -*`node_stats.enrich.queue.size`*:: +*`elasticsearch.enrich.queue.size`*:: + -- Number of search requests in the queue. @@ -16931,7 +16931,7 @@ type: long -- -*`node_stats.enrich.remote_requests.current`*:: +*`elasticsearch.enrich.remote_requests.current`*:: + -- Current number of outstanding remote requests. @@ -16941,7 +16941,7 @@ type: long -- -*`node_stats.enrich.remote_requests.total`*:: +*`elasticsearch.enrich.remote_requests.total`*:: + -- Number of outstanding remote requests executed since node startup. @@ -16951,7 +16951,7 @@ type: long -- -*`node_stats.enrich.executed_searches.total`*:: +*`elasticsearch.enrich.executed_searches.total`*:: + -- Number of search requests that enrich processors have executed since node startup. @@ -16968,7 +16968,7 @@ index -*`node_stats.index.name`*:: +*`elasticsearch.index.name`*:: + -- Index name. @@ -16979,7 +16979,7 @@ type: keyword -- -*`node_stats.index.total.docs.count`*:: +*`elasticsearch.index.total.docs.count`*:: + -- Total number of documents in the index. @@ -16989,7 +16989,7 @@ type: long -- -*`node_stats.index.total.docs.deleted`*:: +*`elasticsearch.index.total.docs.deleted`*:: + -- Total number of deleted documents in the index. @@ -16999,7 +16999,7 @@ type: long -- -*`node_stats.index.total.store.size.bytes`*:: +*`elasticsearch.index.total.store.size.bytes`*:: + -- Total size of the index in bytes. @@ -17011,7 +17011,7 @@ format: bytes -- -*`node_stats.index.total.segments.count`*:: +*`elasticsearch.index.total.segments.count`*:: + -- Total number of index segments. @@ -17021,7 +17021,7 @@ type: long -- -*`node_stats.index.total.segments.memory.bytes`*:: +*`elasticsearch.index.total.segments.memory.bytes`*:: + -- Total number of memory used by the segments in bytes. @@ -17040,7 +17040,7 @@ index -*`node_stats.index.recovery.id`*:: +*`elasticsearch.index.recovery.id`*:: + -- Shard recovery id. @@ -17050,7 +17050,7 @@ type: long -- -*`node_stats.index.recovery.type`*:: +*`elasticsearch.index.recovery.type`*:: + -- Shard recovery type. @@ -17060,7 +17060,7 @@ type: keyword -- -*`node_stats.index.recovery.primary`*:: +*`elasticsearch.index.recovery.primary`*:: + -- True if primary shard. @@ -17070,7 +17070,7 @@ type: boolean -- -*`node_stats.index.recovery.stage`*:: +*`elasticsearch.index.recovery.stage`*:: + -- Recovery stage. @@ -17080,7 +17080,7 @@ type: keyword -- -*`node_stats.index.recovery.target.id`*:: +*`elasticsearch.index.recovery.target.id`*:: + -- Target node id. @@ -17090,7 +17090,7 @@ type: keyword -- -*`node_stats.index.recovery.target.host`*:: +*`elasticsearch.index.recovery.target.host`*:: + -- Target node host address (could be IP address or hostname). @@ -17100,7 +17100,7 @@ type: keyword -- -*`node_stats.index.recovery.target.name`*:: +*`elasticsearch.index.recovery.target.name`*:: + -- Target node name. @@ -17110,7 +17110,7 @@ type: keyword -- -*`node_stats.index.recovery.source.id`*:: +*`elasticsearch.index.recovery.source.id`*:: + -- Source node id. @@ -17120,7 +17120,7 @@ type: keyword -- -*`node_stats.index.recovery.source.host`*:: +*`elasticsearch.index.recovery.source.host`*:: + -- Source node host address (could be IP address or hostname). @@ -17130,7 +17130,7 @@ type: keyword -- -*`node_stats.index.recovery.source.name`*:: +*`elasticsearch.index.recovery.source.name`*:: + -- Source node name. @@ -17148,7 +17148,7 @@ index -*`node_stats.index.summary.primaries.docs.count`*:: +*`elasticsearch.index.summary.primaries.docs.count`*:: + -- Total number of documents in the index. @@ -17158,7 +17158,7 @@ type: long -- -*`node_stats.index.summary.primaries.docs.deleted`*:: +*`elasticsearch.index.summary.primaries.docs.deleted`*:: + -- Total number of deleted documents in the index. @@ -17168,7 +17168,7 @@ type: long -- -*`node_stats.index.summary.primaries.store.size.bytes`*:: +*`elasticsearch.index.summary.primaries.store.size.bytes`*:: + -- Total size of the index in bytes. @@ -17180,7 +17180,7 @@ format: bytes -- -*`node_stats.index.summary.primaries.segments.count`*:: +*`elasticsearch.index.summary.primaries.segments.count`*:: + -- Total number of index segments. @@ -17190,7 +17190,7 @@ type: long -- -*`node_stats.index.summary.primaries.segments.memory.bytes`*:: +*`elasticsearch.index.summary.primaries.segments.memory.bytes`*:: + -- Total number of memory used by the segments in bytes. @@ -17203,7 +17203,7 @@ format: bytes -- -*`node_stats.index.summary.total.docs.count`*:: +*`elasticsearch.index.summary.total.docs.count`*:: + -- Total number of documents in the index. @@ -17213,7 +17213,7 @@ type: long -- -*`node_stats.index.summary.total.docs.deleted`*:: +*`elasticsearch.index.summary.total.docs.deleted`*:: + -- Total number of deleted documents in the index. @@ -17223,7 +17223,7 @@ type: long -- -*`node_stats.index.summary.total.store.size.bytes`*:: +*`elasticsearch.index.summary.total.store.size.bytes`*:: + -- Total size of the index in bytes. @@ -17235,7 +17235,7 @@ format: bytes -- -*`node_stats.index.summary.total.segments.count`*:: +*`elasticsearch.index.summary.total.segments.count`*:: + -- Total number of index segments. @@ -17245,7 +17245,7 @@ type: long -- -*`node_stats.index.summary.total.segments.memory.bytes`*:: +*`elasticsearch.index.summary.total.segments.memory.bytes`*:: + -- Total number of memory used by the segments in bytes. @@ -17264,7 +17264,7 @@ ml -*`node_stats.ml.job.id`*:: +*`elasticsearch.ml.job.id`*:: + -- Unique ml job id. @@ -17274,7 +17274,7 @@ type: keyword -- -*`node_stats.ml.job.state`*:: +*`elasticsearch.ml.job.state`*:: + -- Job state. @@ -17284,7 +17284,7 @@ type: keyword -- -*`node_stats.ml.job.data_counts.processed_record_count`*:: +*`elasticsearch.ml.job.data_counts.processed_record_count`*:: + -- Processed data events. @@ -17294,7 +17294,7 @@ type: long -- -*`node_stats.ml.job.data_counts.invalid_date_count`*:: +*`elasticsearch.ml.job.data_counts.invalid_date_count`*:: + -- The number of records with either a missing date field or a date that could not be parsed. @@ -17311,7 +17311,7 @@ node -*`node_stats.node.version`*:: +*`elasticsearch.node.version`*:: + -- Node version. @@ -17328,7 +17328,7 @@ JVM Info. -*`node_stats.node.jvm.version`*:: +*`elasticsearch.node.jvm.version`*:: + -- JVM version. @@ -17338,7 +17338,7 @@ type: keyword -- -*`node_stats.node.jvm.memory.heap.init.bytes`*:: +*`elasticsearch.node.jvm.memory.heap.init.bytes`*:: + -- Heap init used by the JVM in bytes. @@ -17350,7 +17350,7 @@ format: bytes -- -*`node_stats.node.jvm.memory.heap.max.bytes`*:: +*`elasticsearch.node.jvm.memory.heap.max.bytes`*:: + -- Heap max used by the JVM in bytes. @@ -17362,7 +17362,7 @@ format: bytes -- -*`node_stats.node.jvm.memory.nonheap.init.bytes`*:: +*`elasticsearch.node.jvm.memory.nonheap.init.bytes`*:: + -- Non-Heap init used by the JVM in bytes. @@ -17374,7 +17374,7 @@ format: bytes -- -*`node_stats.node.jvm.memory.nonheap.max.bytes`*:: +*`elasticsearch.node.jvm.memory.nonheap.max.bytes`*:: + -- Non-Heap max used by the JVM in bytes. @@ -17386,7 +17386,7 @@ format: bytes -- -*`node_stats.node.process.mlockall`*:: +*`elasticsearch.node.process.mlockall`*:: + -- If process locked in memory. @@ -17410,7 +17410,7 @@ Node indices stats -*`node_stats.node.stats.indices.docs.count`*:: +*`elasticsearch.node.stats.indices.docs.count`*:: + -- Total number of existing documents. @@ -17420,7 +17420,7 @@ type: long -- -*`node_stats.node.stats.indices.docs.deleted`*:: +*`elasticsearch.node.stats.indices.docs.deleted`*:: + -- Total number of deleted documents. @@ -17430,7 +17430,7 @@ type: long -- -*`node_stats.node.stats.indices.segments.count`*:: +*`elasticsearch.node.stats.indices.segments.count`*:: + -- Total number of segments. @@ -17440,7 +17440,7 @@ type: long -- -*`node_stats.node.stats.indices.segments.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.memory.bytes`*:: + -- Total size of segments in bytes. @@ -17452,7 +17452,7 @@ format: bytes -- -*`node_stats.node.stats.indices.store.size.bytes`*:: +*`elasticsearch.node.stats.indices.store.size.bytes`*:: + -- Total size of the store in bytes. @@ -17463,7 +17463,7 @@ type: long -- -*`node_stats.node.stats.indices.bulk.avg_size.bytes`*:: +*`elasticsearch.node.stats.indices.bulk.avg_size.bytes`*:: + -- type: long @@ -17472,21 +17472,21 @@ format: bytes -- -*`node_stats.node.stats.indices.bulk.avg_time.ms`*:: +*`elasticsearch.node.stats.indices.bulk.avg_time.ms`*:: + -- type: long -- -*`node_stats.node.stats.indices.bulk.operations.total.count`*:: +*`elasticsearch.node.stats.indices.bulk.operations.total.count`*:: + -- type: long -- -*`node_stats.node.stats.indices.bulk.total_size.bytes`*:: +*`elasticsearch.node.stats.indices.bulk.total_size.bytes`*:: + -- type: long @@ -17495,7 +17495,7 @@ format: bytes -- -*`node_stats.node.stats.indices.bulk.total_time.ms`*:: +*`elasticsearch.node.stats.indices.bulk.total_time.ms`*:: + -- type: long @@ -17503,14 +17503,14 @@ type: long -- -*`node_stats.node.stats.indices.fielddata.evictions.count`*:: +*`elasticsearch.node.stats.indices.fielddata.evictions.count`*:: + -- type: long -- -*`node_stats.node.stats.indices.fielddata.memory.bytes`*:: +*`elasticsearch.node.stats.indices.fielddata.memory.bytes`*:: + -- type: long @@ -17520,21 +17520,21 @@ format: bytes -- -*`node_stats.node.stats.indices.indexing.index_time.ms`*:: +*`elasticsearch.node.stats.indices.indexing.index_time.ms`*:: + -- type: long -- -*`node_stats.node.stats.indices.indexing.index_total.count`*:: +*`elasticsearch.node.stats.indices.indexing.index_total.count`*:: + -- type: long -- -*`node_stats.node.stats.indices.indexing.throttle_time.ms`*:: +*`elasticsearch.node.stats.indices.indexing.throttle_time.ms`*:: + -- type: long @@ -17542,21 +17542,21 @@ type: long -- -*`node_stats.node.stats.indices.query_cache.evictions.count`*:: +*`elasticsearch.node.stats.indices.query_cache.evictions.count`*:: + -- type: long -- -*`node_stats.node.stats.indices.query_cache.hits.count`*:: +*`elasticsearch.node.stats.indices.query_cache.hits.count`*:: + -- type: long -- -*`node_stats.node.stats.indices.query_cache.memory.bytes`*:: +*`elasticsearch.node.stats.indices.query_cache.memory.bytes`*:: + -- type: long @@ -17565,7 +17565,7 @@ format: bytes -- -*`node_stats.node.stats.indices.query_cache.misses.count`*:: +*`elasticsearch.node.stats.indices.query_cache.misses.count`*:: + -- type: long @@ -17573,21 +17573,21 @@ type: long -- -*`node_stats.node.stats.indices.request_cache.evictions.count`*:: +*`elasticsearch.node.stats.indices.request_cache.evictions.count`*:: + -- type: long -- -*`node_stats.node.stats.indices.request_cache.hits.count`*:: +*`elasticsearch.node.stats.indices.request_cache.hits.count`*:: + -- type: long -- -*`node_stats.node.stats.indices.request_cache.memory.bytes`*:: +*`elasticsearch.node.stats.indices.request_cache.memory.bytes`*:: + -- type: long @@ -17596,7 +17596,7 @@ format: bytes -- -*`node_stats.node.stats.indices.request_cache.misses.count`*:: +*`elasticsearch.node.stats.indices.request_cache.misses.count`*:: + -- type: long @@ -17604,14 +17604,14 @@ type: long -- -*`node_stats.node.stats.indices.search.query_time.ms`*:: +*`elasticsearch.node.stats.indices.search.query_time.ms`*:: + -- type: long -- -*`node_stats.node.stats.indices.search.query_total.count`*:: +*`elasticsearch.node.stats.indices.search.query_total.count`*:: + -- type: long @@ -17619,7 +17619,7 @@ type: long -- -*`node_stats.node.stats.indices.segments.doc_values.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.doc_values.memory.bytes`*:: + -- type: long @@ -17628,7 +17628,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.fixed_bit_set.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.fixed_bit_set.memory.bytes`*:: + -- type: long @@ -17637,7 +17637,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.index_writer.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.index_writer.memory.bytes`*:: + -- type: long @@ -17646,7 +17646,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.norms.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.norms.memory.bytes`*:: + -- type: long @@ -17655,7 +17655,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.points.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.points.memory.bytes`*:: + -- type: long @@ -17664,7 +17664,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.stored_fields.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.stored_fields.memory.bytes`*:: + -- type: long @@ -17673,7 +17673,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.term_vectors.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.term_vectors.memory.bytes`*:: + -- type: long @@ -17682,7 +17682,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.terms.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.terms.memory.bytes`*:: + -- type: long @@ -17691,7 +17691,7 @@ format: bytes -- -*`node_stats.node.stats.indices.segments.version_map.memory.bytes`*:: +*`elasticsearch.node.stats.indices.segments.version_map.memory.bytes`*:: + -- type: long @@ -17701,7 +17701,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.heap.max.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.heap.max.bytes`*:: + -- type: long @@ -17711,7 +17711,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.heap.used.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.heap.used.bytes`*:: + -- type: long @@ -17720,7 +17720,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.heap.used.pct`*:: +*`elasticsearch.node.stats.jvm.mem.heap.used.pct`*:: + -- type: long @@ -17743,7 +17743,7 @@ Old memory pool stats. -*`node_stats.node.stats.jvm.mem.pools.old.max.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.old.max.bytes`*:: + -- Max bytes. @@ -17754,7 +17754,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.old.peak.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.old.peak.bytes`*:: + -- Peak bytes. @@ -17765,7 +17765,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.old.peak_max.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.old.peak_max.bytes`*:: + -- Peak max bytes. @@ -17776,7 +17776,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.old.used.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.old.used.bytes`*:: + -- Used bytes. @@ -17794,7 +17794,7 @@ Young memory pool stats. -*`node_stats.node.stats.jvm.mem.pools.young.max.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.young.max.bytes`*:: + -- Max bytes. @@ -17805,7 +17805,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.young.peak.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.young.peak.bytes`*:: + -- Peak bytes. @@ -17816,7 +17816,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.young.peak_max.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.young.peak_max.bytes`*:: + -- Peak max bytes. @@ -17827,7 +17827,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.young.used.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.young.used.bytes`*:: + -- Used bytes. @@ -17845,7 +17845,7 @@ Survivor memory pool stats. -*`node_stats.node.stats.jvm.mem.pools.survivor.max.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.survivor.max.bytes`*:: + -- Max bytes. @@ -17856,7 +17856,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.survivor.peak.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.survivor.peak.bytes`*:: + -- Peak bytes. @@ -17867,7 +17867,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.survivor.peak_max.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.survivor.peak_max.bytes`*:: + -- Peak max bytes. @@ -17878,7 +17878,7 @@ format: bytes -- -*`node_stats.node.stats.jvm.mem.pools.survivor.used.bytes`*:: +*`elasticsearch.node.stats.jvm.mem.pools.survivor.used.bytes`*:: + -- Used bytes. @@ -17903,7 +17903,7 @@ Old collection gc. -*`node_stats.node.stats.jvm.gc.collectors.old.collection.count`*:: +*`elasticsearch.node.stats.jvm.gc.collectors.old.collection.count`*:: + -- @@ -17912,7 +17912,7 @@ type: long -- -*`node_stats.node.stats.jvm.gc.collectors.old.collection.ms`*:: +*`elasticsearch.node.stats.jvm.gc.collectors.old.collection.ms`*:: + -- @@ -17928,7 +17928,7 @@ Young collection gc. -*`node_stats.node.stats.jvm.gc.collectors.young.collection.count`*:: +*`elasticsearch.node.stats.jvm.gc.collectors.young.collection.count`*:: + -- @@ -17937,7 +17937,7 @@ type: long -- -*`node_stats.node.stats.jvm.gc.collectors.young.collection.ms`*:: +*`elasticsearch.node.stats.jvm.gc.collectors.young.collection.ms`*:: + -- @@ -17954,7 +17954,7 @@ File system summary -*`node_stats.node.stats.fs.summary.total.bytes`*:: +*`elasticsearch.node.stats.fs.summary.total.bytes`*:: + -- @@ -17965,7 +17965,7 @@ format: bytes -- -*`node_stats.node.stats.fs.summary.free.bytes`*:: +*`elasticsearch.node.stats.fs.summary.free.bytes`*:: + -- @@ -17976,7 +17976,7 @@ format: bytes -- -*`node_stats.node.stats.fs.summary.available.bytes`*:: +*`elasticsearch.node.stats.fs.summary.available.bytes`*:: + -- @@ -17989,7 +17989,7 @@ format: bytes -*`node_stats.node.stats.fs.io_stats.total.operations.count`*:: +*`elasticsearch.node.stats.fs.io_stats.total.operations.count`*:: + -- type: long @@ -17997,14 +17997,14 @@ type: long -- -*`node_stats.node.stats.fs.io_stats.total.read.kb`*:: +*`elasticsearch.node.stats.fs.io_stats.total.read.kb`*:: + -- type: long -- -*`node_stats.node.stats.fs.io_stats.total.read.operations.count`*:: +*`elasticsearch.node.stats.fs.io_stats.total.read.operations.count`*:: + -- type: long @@ -18012,14 +18012,14 @@ type: long -- -*`node_stats.node.stats.fs.io_stats.total.write.kb`*:: +*`elasticsearch.node.stats.fs.io_stats.total.write.kb`*:: + -- type: long -- -*`node_stats.node.stats.fs.io_stats.total.write.operations.count`*:: +*`elasticsearch.node.stats.fs.io_stats.total.write.operations.count`*:: + -- type: long @@ -18027,21 +18027,21 @@ type: long -- -*`node_stats.node.stats.os.cpu.load_avg.1m`*:: +*`elasticsearch.node.stats.os.cpu.load_avg.1m`*:: + -- type: long -- -*`node_stats.node.stats.os.cpu.load_avg.5m`*:: +*`elasticsearch.node.stats.os.cpu.load_avg.5m`*:: + -- type: long -- -*`node_stats.node.stats.os.cpu.load_avg.15m`*:: +*`elasticsearch.node.stats.os.cpu.load_avg.15m`*:: + -- type: long @@ -18050,14 +18050,14 @@ type: long -*`node_stats.node.stats.os.cpu.cgroup.cpuacct.control_group`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpuacct.control_group`*:: + -- type: long -- -*`node_stats.node.stats.os.cpu.cgroup.cpuacct.usage.ns`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpuacct.usage.ns`*:: + -- type: long @@ -18065,7 +18065,7 @@ type: long -- -*`node_stats.node.stats.os.cpu.cgroup.cpu.control_group`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpu.control_group`*:: + -- type: long @@ -18073,14 +18073,14 @@ type: long -- -*`node_stats.node.stats.os.cpu.cgroup.cpu.cfs.period.us`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpu.cfs.period.us`*:: + -- type: long -- -*`node_stats.node.stats.os.cpu.cgroup.cpu.cfs.quota.us`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpu.cfs.quota.us`*:: + -- type: long @@ -18088,21 +18088,21 @@ type: long -- -*`node_stats.node.stats.os.cpu.cgroup.cpu.stat.elapsed_periods.count`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpu.stat.elapsed_periods.count`*:: + -- type: long -- -*`node_stats.node.stats.os.cpu.cgroup.cpu.stat.times_throttled.count`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpu.stat.times_throttled.count`*:: + -- type: long -- -*`node_stats.node.stats.os.cpu.cgroup.cpu.stat.time_throttled.ns`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.cpu.stat.time_throttled.ns`*:: + -- type: long @@ -18110,14 +18110,14 @@ type: long -- -*`node_stats.node.stats.os.cpu.cgroup.memory.control_group`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.memory.control_group`*:: + -- type: long -- -*`node_stats.node.stats.os.cpu.cgroup.memory.limit.bytes`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.memory.limit.bytes`*:: + -- type: long @@ -18126,7 +18126,7 @@ format: bytes -- -*`node_stats.node.stats.os.cpu.cgroup.memory.usage.bytes`*:: +*`elasticsearch.node.stats.os.cpu.cgroup.memory.usage.bytes`*:: + -- type: long @@ -18136,7 +18136,7 @@ format: bytes -- -*`node_stats.node.stats.process.cpu.pct`*:: +*`elasticsearch.node.stats.process.cpu.pct`*:: + -- type: long @@ -18146,14 +18146,14 @@ format: percent -- -*`node_stats.node.stats.process.file_descriptors.max.count`*:: +*`elasticsearch.node.stats.process.file_descriptors.max.count`*:: + -- type: long -- -*`node_stats.node.stats.process.file_descriptors.open.count`*:: +*`elasticsearch.node.stats.process.file_descriptors.open.count`*:: + -- type: long @@ -18162,21 +18162,21 @@ type: long -*`node_stats.node.stats.thread_pool.bulk.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.bulk.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.bulk.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.bulk.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.bulk.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.bulk.threads.count`*:: + -- type: long @@ -18184,21 +18184,21 @@ type: long -- -*`node_stats.node.stats.thread_pool.generic.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.generic.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.generic.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.generic.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.generic.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.generic.threads.count`*:: + -- type: long @@ -18206,21 +18206,21 @@ type: long -- -*`node_stats.node.stats.thread_pool.get.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.get.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.get.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.get.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.get.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.get.threads.count`*:: + -- type: long @@ -18228,21 +18228,21 @@ type: long -- -*`node_stats.node.stats.thread_pool.index.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.index.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.index.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.index.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.index.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.index.threads.count`*:: + -- type: long @@ -18250,21 +18250,21 @@ type: long -- -*`node_stats.node.stats.thread_pool.management.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.management.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.management.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.management.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.management.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.management.threads.count`*:: + -- type: long @@ -18272,21 +18272,21 @@ type: long -- -*`node_stats.node.stats.thread_pool.search.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.search.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.search.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.search.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.search.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.search.threads.count`*:: + -- type: long @@ -18294,21 +18294,21 @@ type: long -- -*`node_stats.node.stats.thread_pool.watcher.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.watcher.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.watcher.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.watcher.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.watcher.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.watcher.threads.count`*:: + -- type: long @@ -18316,21 +18316,21 @@ type: long -- -*`node_stats.node.stats.thread_pool.write.queue.count`*:: +*`elasticsearch.node.stats.thread_pool.write.queue.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.write.rejected.count`*:: +*`elasticsearch.node.stats.thread_pool.write.rejected.count`*:: + -- type: long -- -*`node_stats.node.stats.thread_pool.write.threads.count`*:: +*`elasticsearch.node.stats.thread_pool.write.threads.count`*:: + -- type: long @@ -18344,7 +18344,7 @@ type: long -*`node_stats.cluster.pending_task.insert_order`*:: +*`elasticsearch.cluster.pending_task.insert_order`*:: + -- Insert order @@ -18354,7 +18354,7 @@ type: long -- -*`node_stats.cluster.pending_task.priority`*:: +*`elasticsearch.cluster.pending_task.priority`*:: + -- Priority @@ -18364,7 +18364,7 @@ type: long -- -*`node_stats.cluster.pending_task.source`*:: +*`elasticsearch.cluster.pending_task.source`*:: + -- Source. For example: put-mapping @@ -18374,7 +18374,7 @@ type: keyword -- -*`node_stats.cluster.pending_task.time_in_queue.ms`*:: +*`elasticsearch.cluster.pending_task.time_in_queue.ms`*:: + -- Time in queue @@ -18391,7 +18391,7 @@ shard fields -*`node_stats.shard.primary`*:: +*`elasticsearch.shard.primary`*:: + -- True if this is the primary shard. @@ -18401,7 +18401,7 @@ type: boolean -- -*`node_stats.shard.number`*:: +*`elasticsearch.shard.number`*:: + -- The number of this shard. @@ -18411,7 +18411,7 @@ type: long -- -*`node_stats.shard.state`*:: +*`elasticsearch.shard.state`*:: + -- The state of this shard. @@ -18421,7 +18421,7 @@ type: keyword -- -*`node_stats.shard.relocating_node.name`*:: +*`elasticsearch.shard.relocating_node.name`*:: + -- The node the shard was relocated from. diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index b03bbbdba18..68b11acfe62 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -6,42 +6,6 @@ settings: ["ssl", "http"] short_config: false fields: - - name: elasticsearch - type: group - description: > - fields: - - name: cluster.name - type: keyword - description: > - Elasticsearch cluster name. - - name: cluster.id - type: keyword - description: > - Elasticsearch cluster id. - - name: cluster.state.id - type: keyword - description: > - Elasticsearch state id. - - name: node - type: group - fields: - - name: id - type: keyword - description: > - Node ID - - name: name - type: keyword - description: > - Node name. - - name: master - type: boolean - description: > - Is the node the master node? - - name: mlockall - type: boolean - description: > - Is mlockall enabled on the node? - # Field aliases for migration from legacy structure - name: cluster_uuid type: alias path: elasticsearch.cluster.id @@ -147,7 +111,6 @@ - name: miss_count path: elasticsearch.node.stats.indices.query_cache.misses.count type: alias - - name: request_cache type: group fields: @@ -442,3 +405,38 @@ - name: threads path: elasticsearch.node.stats.thread_pool.write.threads.count type: alias + - name: elasticsearch + type: group + description: > + fields: + - name: cluster.name + type: keyword + description: > + Elasticsearch cluster name. + - name: cluster.id + type: keyword + description: > + Elasticsearch cluster id. + - name: cluster.state.id + type: keyword + description: > + Elasticsearch state id. + - name: node + type: group + fields: + - name: id + type: keyword + description: > + Node ID + - name: name + type: keyword + description: > + Node name. + - name: master + type: boolean + description: > + Is the node the master node? + - name: mlockall + type: boolean + description: > + Is mlockall enabled on the node? diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 20625cebd60..972e5cc2fb1 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From 17b84dab9cc4c7a3e313b442c80a364ccffd4421 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 16 Jul 2020 16:26:58 -0700 Subject: [PATCH 10/32] More field fixes --- metricbeat/docs/fields.asciidoc | 29 ++++++++++--------- metricbeat/module/elasticsearch/fields.go | 2 +- .../elasticsearch/node_stats/_meta/fields.yml | 23 ++++++++------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 020d998f6da..a6050b17d23 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -18027,6 +18027,7 @@ type: long -- + *`elasticsearch.node.stats.os.cpu.load_avg.1m`*:: + -- @@ -18050,14 +18051,14 @@ type: long -*`elasticsearch.node.stats.os.cpu.cgroup.cpuacct.control_group`*:: +*`elasticsearch.node.stats.os.cgroup.cpuacct.control_group`*:: + -- -type: long +type: keyword -- -*`elasticsearch.node.stats.os.cpu.cgroup.cpuacct.usage.ns`*:: +*`elasticsearch.node.stats.os.cgroup.cpuacct.usage.ns`*:: + -- type: long @@ -18065,22 +18066,22 @@ type: long -- -*`elasticsearch.node.stats.os.cpu.cgroup.cpu.control_group`*:: +*`elasticsearch.node.stats.os.cgroup.cpu.control_group`*:: + -- -type: long +type: keyword -- -*`elasticsearch.node.stats.os.cpu.cgroup.cpu.cfs.period.us`*:: +*`elasticsearch.node.stats.os.cgroup.cpu.cfs.period.us`*:: + -- type: long -- -*`elasticsearch.node.stats.os.cpu.cgroup.cpu.cfs.quota.us`*:: +*`elasticsearch.node.stats.os.cgroup.cpu.cfs.quota.us`*:: + -- type: long @@ -18088,21 +18089,21 @@ type: long -- -*`elasticsearch.node.stats.os.cpu.cgroup.cpu.stat.elapsed_periods.count`*:: +*`elasticsearch.node.stats.os.cgroup.cpu.stat.elapsed_periods.count`*:: + -- type: long -- -*`elasticsearch.node.stats.os.cpu.cgroup.cpu.stat.times_throttled.count`*:: +*`elasticsearch.node.stats.os.cgroup.cpu.stat.times_throttled.count`*:: + -- type: long -- -*`elasticsearch.node.stats.os.cpu.cgroup.cpu.stat.time_throttled.ns`*:: +*`elasticsearch.node.stats.os.cgroup.cpu.stat.time_throttled.ns`*:: + -- type: long @@ -18110,14 +18111,14 @@ type: long -- -*`elasticsearch.node.stats.os.cpu.cgroup.memory.control_group`*:: +*`elasticsearch.node.stats.os.cgroup.memory.control_group`*:: + -- -type: long +type: keyword -- -*`elasticsearch.node.stats.os.cpu.cgroup.memory.limit.bytes`*:: +*`elasticsearch.node.stats.os.cgroup.memory.limit.bytes`*:: + -- type: long @@ -18126,7 +18127,7 @@ format: bytes -- -*`elasticsearch.node.stats.os.cpu.cgroup.memory.usage.bytes`*:: +*`elasticsearch.node.stats.os.cgroup.memory.usage.bytes`*:: + -- type: long diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 972e5cc2fb1..04dbc3241d1 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "eJzsXU2v2zaX3udXEFn1BRIB72I2dzFddNpOCiRTTNMCg8FApaVjm7mS6JCUc29//YDUhymJIimRylX6+q4S23rOcz5IHlIkz1v0CM8PCArMBck4YJadXyEkiCjgAb3+Uf/89SuEcuAZIxdBaPWA/v0VQggNfoNKmtcFvEKIQQGYwwM64VcIcRCCVCf+gP73NefF6zfo9VmIy+v/k9+dKRNpRqsjOT2gIy64fP5IoMj5gxLxFlW4hAeUFTUXwNK6Jrn6AiHxfIEHhAuCefvJBYvzSKOkfTBpH+vwKppDygUWfIB2YrS+tJ/oNPRHj7z/yPSY6VH9cUEFLgbfzKHMIelo+IpJgQ8FpKRKD88C+OSnZrtIAyTKAMmRJ7wuS8yekx4umcOaWn1K6sggEh+JFERFWTsOFwW1mExHhNBBuA0fW+N5UxzZEW2oOjK9AMOynZv09LNZp21rtBtiktG6EjO4NofqBBngPH0kBZ1zxiqSEjV5PMTgFt+CilxkM35hREB8OyrYcEM27OJbsqEXYMq+RVc5ySBsMDjUxWPEseCUcvJXSNfb6pRIXkmHF9QBSxBBSkWqJEVBYrCSgEkZNiZYI2sJIS2UmgibCyh/bjG9eEOMMJBG9eQNcpkvO0o5zeINp3NO81RIclns+D5fktxyLHA0beBKssDY7kklPVhQZJdQUvYcK7Rv7Brc9XlZlcMTqU7RTK8AozWUjl5yg13f8bUYM4njSkbhXd6ZUSEKiG+zAfK6PuZzDew5zXB2hj01To1WpOZ5JnIiHtQH6qTOROypu9CprewwBuQI5zGtJfFg/fjB4HMNXOwvTAfE9hOoQ1o7C9UhuZ0E64hUWLj2a43Th9bEadOQYg0e7Tc30PXDbYsRNtwO+awabG92P5VQRVyCCgyqjk9Q48tpll5xUQNP23YY3gR7YjfwGA3xSJ4gTw9EpBzEBmwH+DEINxmeWjBhG/DV4aN0dNEZRiBVUVZuEZoKNwbBCyWV2IJhAxyDIheUQZ423dEGTAf4MQgLYGV6hUxQtgVfHT4W3a14RiF4BcYJrdISXzagqaGHriaoSIo2vkbKKBWpZPEKYMfi07V85dLGtsZ9yiImHEXRhP2sDkEvvorc+L0L24VvUEHGm+3FA3K799O1TE5ZcrNJQos8ueFbX2wgjzcxM7SdmXYs/sbE25d8R/yZ1pPFvSHG3r2qNPim/TrRYJVntTQvWodyBjmi4KeAXlaqW0KZSKikxE9BA53iU3PIYxGSWJEYXYBlsGa+NyV0yXyne73TC5o94kKfSM9KNfzWBq22ApHcB3nwKydmibkA5sV4/EsbNg175Zxd6mjNp6A4T/EVGD6Nsx47sA1cF/DPcVPv/hwhR3mSXeqk5XdKZnF8h5F/i0RkFseXyD9jMZkHcnXAmcmjAUndpcaZpUMIiZ+MVoLRIrWN8R52U48nLdHEB9TXnTXHJ0grXNGVG1ym9BRkMrthxqfTn/YRaJfuiOqK7MjlGEdonpYkY1EckmRHnjSgSb3GI2OCn2sqcGR+CjOcnoTfPNGu6vIALKXHFAp8adMSQvOAfHVoEPlZMsKOmnHfNJAJN0+7l9RzU891Goywo2qgJgo9tLXzWk9e4z7blbmIDxeG99+jtYtPMTu1gpRE2CYTawgq0NlZxRJ6zfAXmV4zAC6l16+HM5oB30+OvXra1SqimpX/hEsXLSfGR1JA2p39mC68eXIYo6iJsqlPclGiF6i24iSxvUlpu5cA5+mF0ul888V2An+uoTZNyByW0XRpdmgqnKDXsww+QSaMg9tSMh1U6GYzwMZsYSmdFmn12/gTVMBIvLXxCD5vKe3G7R2f/Xi+YxTufHMf82KOFztyutiVw0Wws9U+hz25WxHajcMbNvtxecMn1OklrvAJymnm9qKev7Hajfs1SvuJAY1UaCDE3+0YGgS3LYW7CID22/04v/021PFfsMjOg7c66KU931Lajes7Pvvxfcco2PmMiHgbgWK4Xh173Y3jFZsduV3xWer0/qTE6A4NZHS24QKN+Usmumsr5P8m6wqP8PyFMt0FRuzmb3hJR4urpCSzUg3vuSPIJPm8ROkS4/v1ALkK0yhVRkHQag0Zx/8cWQdh+feB5oDe/YdRzsj9MSQNPY8GKetoF8JN3IHSAnC1TNw7jsQZlLHVPxp89f/vzQSmGzfCKXSgCCp8KCBHtOppfT+Nx2y6DWMcGBaZPzDK+dsu4BlcCpKps+FofPnH8JKc7s8WcwXgPGI6YZqVIkd8ObTv/j7gEhA9toxnJOmLzBw+pxWdJVNQ4xY+Dybv8RMp6xJx+FxDlUH79k2S64/tdwHRsuVnPNK7P79Bi4J++bZc0HF2OEEpnTTG2cANH3qrS0MrYegLEWfSWN7O7Xa/gjorImDcB8RleBPX8IIcfdc1ZMj/gUglqGLdm7bR58hoaY8jNH6HykmVQSrHrFTd72I5abZes4+khDeIVKjkb5CSOGQvxaMjyLR3osQs/VNBD7hIszNkj+qcxwbEf1Yy0E0GUkexZHMdmt6aVLhf5Nm687YjD++8JcJkh0XAUK4zqzn67sQAqjfoGaRh3iAG+T/Mg7wc9vxPAHokFFxxICrvSrw6QPvxQUvYOIPmIxW40Pp4payM/S4iZpgYM58wKrcOpQF/CwU5kUMB3qQMF4LEoiShHTy0MWp0yxEKiZh3DdyOY6ZV2MNBqvOZdtm2TSVONr+psWTeOusP5QaPIyM7NdpbzKRvqSAlZsSyBz0erUbWs5ve7VSu100yISH2XgGjmssRljJN5GTogoqRwWrx4jHrR4UQYchq1oo4+cs8AzWYwjVa3GKnmaC3twooL8mko5FoJMOgpALS7oloKXhWM2beXRMamD80yPqMoxZc4Con1anVp7fAfNuxX/MYJeGdp4XgCbJaQN4mjmoqzwVmor6Y/dQ9kDYuhvZOtM0jSJyxaBtPt4OLMo7O+Ap+SszNyRa3vzHA8oYXd9HnneRjWfWJex+txz1o8fr6nGa1OsKL9InkfFtS5HIowLx+HZ1eI2kxTe/zujNUj5SVWDyguYe9VZEUukm74iwVUKgW8n6XesSzckOsF+sm5nXEe2vT3viXWnJweG4WSFqqBnOb+6uEQUavMNjj/AId18yq+PJ+vsmCO6UGS/i6PAkfr6McCZVIZrFtimmUvGqV+iOrAZFR7mqWzcX0qF2Azv/daatwDWGmyxaYnUAkMd99fFSQzZA86+VG7Jly81aaYMESGeE8Z8A5+i6jdZGjA6B3v/YfUqZ+JPnMLKu0JOMO3TrJ4QBujg1aswyi+uc3BWn3Tys2rn90wTH805KM6x+dpPmFatM7tzfIv2znPDcJv+d6Uejdc717rufkvyzXQ/dZ2r3l3lvuN9hybxtakk/0EDLul8UWM7JV2c7vFflcAyoL9Ike5rNBgWc2Pq4S+gs9NJBmaTkWuLlxqT/XB3kq53AsN97EtHZG+msH3rw7g+s0jE2cSHXFBcnTHAuIyufjWd/L0ijM1Z4KBEScgSGsLv4l1UkSgiZKZKKMm/+rBdMml66okPn0BTMOuWGOMQlrr+1zFgVGzy8P6/bGvnhhpnbGtahmrw5vwZtX20PYL3+8R++qI/V78+nS2qW5B6GOlNEAaHKQvrnIiVSWM+Bbd8//CfiCJINBjyx1cI99uhLu+7o21qHET+tVqGj18q74QKu3EdzR6fKSHulV8ffK6NYA091jKHAL67EDRxIbcrWXqzGasWcO3/Y0KY6I1iUfcbeOqD6aaPtHxsi7mvXAE+FCjb7dvGK/M54dzRO+tRlCN/lyTONRxInjqomhEupBznANBXLsafK7KMdZTM6pN/Lw21DefPkGD2HT7ceO8m4LMD1qskU2h6vWmkPcZLPUJjHiLhDjoImmecWG9h0s8k9LiKEoNnHV/fLQYwQVLYjd1bUcaNpOs5kiW2h/cWUtF7QAZ/v4HEizl+xxSLvtwpsvNIXurtqTq4zXDqAoPnLVRnIwNECFdEnjvHATlf0LAXkovyQYFtX0iSx7SX2eyKK9qttElulXryay0EWlZyLLXlJGZgPRX1vmgjIvgZK1NeP+4nvvVRDXKsZGC2QdfM0taxAhXejXasXGmy4XCTHduDl26YXSItrK1i9/vO9eMErcVYtb5to1drd5rCT8V5FPqU2XD/xCwBa6KE4YDJWa+Yk6Fz63EqITvgB+3AnjXwE/+lJO92NoRbv0s7a1VsnXpf17s/hvXSqbqywU3Ob+RwLfW90eGN9b3d5aHa/ZlVzp/C0VAQ3vtxb73vb2wPje9vbQ9vTEd1DVLVby+/MPt7KO5sbmkfpqxeW2yoJvEtApW9sfBCxGehHt+53VAeUQMkh+NrZ6kwf9a9vd2BaP8c5wTI+muDEtdPW/n0gBiD9zAaVFjI/3mvXhr9pPOvx8ZLD5q9tFhPAVkwIfipdn1a8e08kWoiGNkMWkuVsR3OguCcj86t+vfpLFsvpLNGyr9eSm76OCLvDxYP2ZF3m0ziye6B2y6dbcKdTf3zY9mqreE62zt5fD9HjHZi9juQTAXH3SA8FYfNJuFptpBtCzhSjd+C4ZAzke9b3QsobjqPnogaYZ4Vs0QDbJiZZR96GPBpNOe03HBSqgwftwaynGBaj6eZyvapmltRM99dFFLC1uuFKEbwlCD/jhTpJvsYG5a/55AvolmeOubWPBo2380UZcV+09x6vaudp/t90h1kJ4du42/mi0hhlhE9VsdT0Hjrbd0FBoz66iyz2b7Xa211mwaDsGcpZIWIDlKm/ggOpgzIXr0N1uTrttU+P872wz+w3pd6uZYWZrj6G76V502+zf1mzmWlfobjeX3WYWvO5W06Es/+gT7faS5wuoi2xTgbme2ZntaVnJ/tME+KeaWGFScYRR+wWSX+hI+iuqNWdmOTCRUjZX6mX5VRHvFCSaQt4mPYQyIswXGq65KsMA1/ev6so0o6SAK9gS9BNlCJ5weSmkQrV4W+LLZXwmazC5J1XatJHJO7u1in8kpTpiOazW1ms+qgeyOCTbMiMqeIJibLP7K8WZcESaqk8ed1kay82sNv7gQhTFxH6NZsxbaj6qE7ZYgI9sBgXNsJCdijquX8W9M1KvuNVW2sG8E9qWeEle/X8AAAD//6XSQK8=" + return "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" } diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml index ab9c954c9b5..aec05872955 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml @@ -288,15 +288,18 @@ type: long - name: operations.count type: long - - name: os.cpu + - name: os type: group fields: - - name: load_avg.1m - type: long - - name: load_avg.5m - type: long - - name: load_avg.15m - type: long + - name: cpu + type: group + fields: + - name: load_avg.1m + type: long + - name: load_avg.5m + type: long + - name: load_avg.15m + type: long - name: cgroup type: group fields: @@ -304,14 +307,14 @@ type: group fields: - name: control_group - type: long + type: keyword - name: usage.ns type: long - name: cpu type: group fields: - name: control_group - type: long + type: keyword - name: cfs type: group fields: @@ -332,7 +335,7 @@ type: group fields: - name: control_group - type: long + type: keyword - name: limit.bytes type: long format: bytes From cd4ab8c5ae25f1b5ca97b7d0a59e427d4f78b78a Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 20 Jul 2020 09:05:46 -0700 Subject: [PATCH 11/32] Making cgroups metrics collection optional --- metricbeat/module/elasticsearch/node_stats/data.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 1154b9b8c2b..0e37c5d559f 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -275,7 +275,7 @@ var ( "bytes": c.Str("usage_in_bytes"), }, }), - }), + }, c.DictOptional), }), "process": c.Dict("process", s.Schema{ "cpu": c.Dict("cpu", s.Schema{ From d0e3488c760ca874565a33268fce009d18821ed9 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 20 Jul 2020 09:19:20 -0700 Subject: [PATCH 12/32] Marking os.load_avg as optional for Windows --- metricbeat/module/elasticsearch/node_stats/data.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 0e37c5d559f..31d39f7e6a4 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -231,10 +231,10 @@ var ( "os": c.Dict("os", s.Schema{ "cpu": c.Dict("cpu", s.Schema{ "load_avg": c.Dict("load_average", s.Schema{ - "1m": c.Float("1m"), - "5m": c.Float("5m"), - "15m": c.Float("15m"), - }), + "1m": c.Float("1m", s.Optional), + "5m": c.Float("5m", s.Optional), + "15m": c.Float("15m", s.Optional), + }, c.DictOptional), // No load average reported by ES on Windows }), "cgroup": c.Dict("cgroup", s.Schema{ "cpuacct": c.Dict("cpuacct", s.Schema{ From 2940b5781c338f95f94175c71ee9933567de673b Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 21 Jul 2020 10:26:44 -0700 Subject: [PATCH 13/32] Aliasing type => metricset.name --- metricbeat/module/elasticsearch/_meta/fields.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index 68b11acfe62..2c12ee97e39 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -6,6 +6,9 @@ settings: ["ssl", "http"] short_config: false fields: + - name: type + type: alias + path: metricset.name - name: cluster_uuid type: alias path: elasticsearch.cluster.id From c6ed43953b0febaaf1a162251adadc48d8f8ccb3 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 21 Jul 2020 10:31:13 -0700 Subject: [PATCH 14/32] Aliasing source_node fields --- metricbeat/docs/fields.asciidoc | 28 +++++++++++++++++++ .../module/elasticsearch/_meta/fields.yml | 9 ++++++ metricbeat/module/elasticsearch/fields.go | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index a6050b17d23..6d45a5ae54c 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -15772,6 +15772,15 @@ Elasticsearch module +*`type`*:: ++ +-- +type: alias + +alias to: metricset.name + +-- + *`cluster_uuid`*:: + -- @@ -15782,6 +15791,25 @@ alias to: elasticsearch.cluster.id -- +*`source_node.uuid`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.id + +-- + +*`source_node.name`*:: ++ +-- +type: alias + +alias to: elasticsearch.node.name + +-- + + *`node_stats.fs.total.available_in_bytes`*:: diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index 2c12ee97e39..af860f0e1c1 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -12,6 +12,15 @@ - name: cluster_uuid type: alias path: elasticsearch.cluster.id + - name: source_node + type: group + fields: + - name: uuid + type: alias + path: elasticsearch.node.id + - name: name + type: alias + path: elasticsearch.node.name - name: node_stats type: group fields: diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 04dbc3241d1..eab93333219 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From 32cb5199125b7b6bd93d7fc5857d02e8dfb8ca9e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 21 Jul 2020 11:22:41 -0700 Subject: [PATCH 15/32] Aliasing timestamp => @timestamp --- metricbeat/docs/fields.asciidoc | 9 +++++++++ metricbeat/module/elasticsearch/_meta/fields.yml | 3 +++ metricbeat/module/elasticsearch/fields.go | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 6d45a5ae54c..b1c4497208a 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -15781,6 +15781,15 @@ alias to: metricset.name -- +*`timestamp`*:: ++ +-- +type: alias + +alias to: @timestamp + +-- + *`cluster_uuid`*:: + -- diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index af860f0e1c1..0be093b83bd 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -9,6 +9,9 @@ - name: type type: alias path: metricset.name + - name: timestamp + type: alias + path: "@timestamp" - name: cluster_uuid type: alias path: elasticsearch.cluster.id diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index eab93333219..cb2700cad55 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "eJzsXVuP3LYVfvevIPYpAWwBeejLPjQF0iR1ALtB4wQoikLhSGdm6JXEWZIa7+bXF6RulESRlER55XT2yZ4Zfec7F15FnvMGPcDzPYIMc0ESDpgl51cICSIyuEd33+uf371CKAWeMHIRhBb36K+vEEKo9xuU07TM4BVCDDLAHO7RCb9CiIMQpDjxe/SfO86zu9fo7izE5e6/8rszZSJOaHEkp3t0xBmXzx8JZCm/VyLeoALncI/E8wXUB0j98x7hjGBef3LB4nyPchBMkhGRfKT/NMmBC5xfHBB3f2t/edcDSLKSC2BxWZLUgdEzaFQ/GNWPNXicliyBuKBpX6sTo2VDUjeD/qzGwcxjiouUFmnPNoCtuRYBjowtP425wILPVu3IRzz0x0yP9txMBc5630yhTCHpaPiKSYYPGcSkiA/PAvjopxazKANERx7xMs8xe45auGgKy2z4gYUYBOIjkVZRUdYOw0VBzSbTECG0F279x5Z43hRHdkQbqo5ML8Cw7EJNevrZrNG2NlqHGCW0LMQErs2hOkEGOI0fSEannLGIpESNHg4huIW3oCIX2IyfGBEQ3o4Kdr0hK3bhLVnRW2HKtkUXKUlg3WBwKLOHgGPBKebkjzVdb61TJHlFDd6qDliCyPmKJJWTLCMhWEnAKF83Jlgjaw4hLZSqCJsKKH9uIb3YIQYYSIN6soOc58uGUkqTcMPplNM8FZJcZju+nS9JbikWOJg2cCXJythuSUUt2KrIziGn7DlUaHfsKtzl87IihSdSnIKZXgEGaygNvaiDXd7x1RgTE8eFjNZ3eWdGhcggvM16yMv6mMcS2HOc4OQMe2qcGq1AzfNMRLyyD9RJnYnYU3ehU1vYYfTIEc5DWkviwfLxg8FjCVzsL0x7xPYTqH1aOwvVPrmdBOuA1Lpwbbdxxw8tidOqIYUaPOpvOtDlw22NsW647fNZNNh2dj/lUATcgloZVA2fVY0vpUl8xVkJPK7b4fom2BLrwEM0xCN5gjQ+EBFzEBuw7eGHIFzN8NSGCduArw4fpKMLzjAAqYKyfIvQVLghCF4oKcQWDCvgEBS5oAzSuOqONmDaww9BWADL4yskgrIt+OrwoehuxTMIwSswTmgR5/iyAU0Nfe1ugoqkYONroBmlIhXN3gFsWHy85q9c2tj2uE9JwAlHllVhP6nDqhdfWWr83oXtwjeoIOPN9uIBud378ZpHpyTqbBLRLI06fOuLDeTxJmaCtnOmHYq/ceLtS74h/kzL0eZeH2PvXlUafNF+HWmwyLPaNC9Yh3IGOaLgpxW9rFQ3hzySUFGOn1YNdIpPySENRUhiBWJ0AZbAkvXemNAl8V3utU7PaPKAM30hPSnV8FsbtDoK1Dut5HMuyQMzx1wA82I8/KUNm6575ZxcymDNJ6M4jfEVGD4NZz12YBu4LuCbYVNv/hwhR3mUXMqo5neKJnF8h5G/BCIyieNL5JtQTKaBXB1wYvLoikndpcSJpUNYEz8JLQSjWWwb4z3sph6PaqKRD6ivO0uOTxAXuKALD7iM6SnIaPLAjE+nP+4j0C7dEdQVyZHLMY7QNM5JwoI4JEqOPKpAo3KJR4YEH0sqcGB+CnM9PQm/+US7KPMDsJgeY8jwpZ6WEJqumK/2DSI/iwbYQWfcnQbqGHfcvKSeWnou02CAHVQDtVBooa2d13LyGvfJrsxFvL8xvP8erd58CtmpZSQnwraYWEJQgU6uKubQq4a/wPSqAXAuvXY/nNEE+H7m2IuXXbUiqln5L7h00XJhfCQZxM21mvHGmyeHIYpaKJv6JBcleoFiK04S25uUdnoJcBpfKB2vN1/sJPBjCaVpQeawjKZLdUJT4ax6PcvgIyTCOLjNJdNArT1sBtg4W5hLp0Za/Db+BAUwEm5vPIDPa0q7cXvDZz+ebxitd765j3kxx4sdOV3syuFitbPVOYc9uVsR2o3DKzb7cXnFZ63Tc1zgE+TjmduLer5jtRv3a5T2EwMaqbWBEP6049og6I4U7iIA6m/34/z627WO/4RFcu691UEv7fma0m5c3/DZj+8bRqudz4gIdxAohOvVtdfdOF6x2ZHbFZ+5Tm9vSgzSkyCjsw25SaaTTDQpOQpT2osHeP5Eme4CI3b1189/UuMqKdGkVMN77gAySTotUbrE+H59hVyFaZSqpTQx+8rkGh2ADON/iqyDsPx7T1NAb/9ulDNwfwhJfc+j3pR1cAqhE3egNANczBP3liNxBmVs9Y8KX/3/WzOB8cGN9RQaUAQFPmSQIlq0tL4dx2MyPoYxDAyLzO8Y5fxNE/AMLhlJ1N1wNEz+0c8/1PzZYi4DnAacTphWpcgRXw7tm7/3OAdEjzXjCUn6JjOHx7igk2QyajzC58HkHX4ieZkjDo8lFAnUb98kufbafhMQNVt+xgO92/sbNMvopy/LBQ1nhxOU0lFlnA3c8L61ujS0EoY+EXEmleXt3Lr8CuquiIBhHxCWYSeu4gUp+qppyJB+jUghqGLdmrbS58hobo8jNHyHykmRQCzHrFjld7HcNFuu2QeSw2tECpTz10hJ7LOX4tER5LR3pMQk/VNGDziLkzMkD+qexwbEf1QyUCcDqatYsrn2TW+dVLhf5Nm687ojX995S4TRCYsVQ7nOrOToqxMDKF6jZ5CGeY0YpF+bB3k57PnfAPSYUHDFgah5V+TVAdqvD1rCxhk0H6jAmdbHK2Vl7DcRMcHEOPNZR6XrUCrwN5CREzlk4E3KkBAkFCUJ7eChjVGDLEdoTcS8reB2HDO1wh4OUp3PuMu2HSpxsvlFjSXT1ll+KXf1ODKwU6W9xUz6kQqSY0YsZ9DD0apkPbvpdbdyvTLJrAmxdwoYlVyOsJRpIkdDFxSM9HaLZ49Z3yuEAENWtVfEyR/mFajBFK7RooudaoFeZxVQXpKTjkqikQyDnAqImyeCTcGTkjHz6Zq1gfldhayvOErBBS5SUpxqfVoLTLcde5rHIBPeaVoIniApBaT1xFEt5bnATJQXs5+aB+LKxVDnRNs8gsQZi7rxNCe4KOPojK/gp8TUmmx2+xsCzG94YTd93ko+ll2fsPloPfKghevrU5qU6gov0heS021JkUshA/P+dXB6laTZNL3v605QPVKWY3GPph72VkVSaBbtirNUQKFayPsl9Qhn5YpYK9ZNzOuK99am7fjn2uTg8FxtkNRUDeY291cRg4ReoXfG+QU6rold8fn9fDULbpTqbeHr8kSXb70vcVFHORAqkcxi6ymmUfKiXeoPrAREBnNXs2wuxlftVuj8r0ZbhWsIM122wOwEIgr57uODgqyG5EkvV2LPlJuP0qwWLJERTlMGnKOvElpmKToAevtz+yFl6keSz8S2Sk0y7NCtk+wP4ObYUPn6g/rnFwVp908tNqx/dMEh/FOTDOsfnaT5hWrVO9cZ5F+2c55ahN/mekHo3eZ6t7mek/+8uR66rdJuLffWcr/AltsdaIk+0sOacT/PtliRLZrt/FqQxxJQnqGP9DA9GxR44uDjIqE/0UMFaZaWYoGrjEvtvT5IY7mGY6kxE9PSFenPDXj17gyu4zA2cSLFFWckjVMsICifD2f9LEulMFdnKhAQcQaGsEr8S4qTJARVlMiJMq7+rzZMq7l0QYWcT18w45Aa1hijsPY6PmdRYPD8/LCuM/aFCzN1Mq5GNXu1nwVvWm0PYT/99g69LY7U782nS2uX5h6EGlJGA6DRRfoqkRMpLHfAt+6e/wH4giSDXo8sdXCPfboS7nxdG+uQ46flKhS0eHlXvKfFmwDuaHR5SY+0qvh7ZZA1wJR7DK08wnpswJHEhlSd5aqMZuyZ1x97GhVHRMsmH2GPjqg+mmjnR4bIu1r1wBPhQo2+zbpivyueHa0TvrQVQrP4cizjUcCF46KFoRLqQc6QhgI5zjT5JcpxFpNz6o08/NaXN12+wUPY+Pixo7zbDEyPmmyBzeGqteYQNzostUmMuAvEOGii8bxiQ/v2NvnHJcRQEJu46n556DGAChbE7upaDjTtpNlEkS20v7iylguagbN9fPak2Uv2OKR1p/CmC02hm6v25Cpj2gEUxEeu2kgOhgaoNV3ScF64icr+hYA8lJ8TDLNq+gSWPac+T2DRXtVtAsv0q1cTWOis0jOBZc8pI7OB6M8tc0aZl5WStT3jNvG99y6Iaxdjow2yBr7klj2INV3o52rFxkyXs4SYMm4OXXqhNAu2s/XTb++aF4wSd9Hmlrl2jd1tHjsJ/8zSMbXx9oFfCNhCF4UJg75SEz9R98KndkJ0whfADzth/DPgB1/K8X4MrWjnfta21ir5vLR/rTb/rVtlU5WFVre5f0vgW6vbA+Nbq9tbq+Mlu5Irnc5SsaLh/VJj39reHhjf2t4e2p4+8e1VdQs1+f3xu66so7mxeUx9teJyW82COwnolCztD1ZsRnoRbfudxQHlENKb/Gxs9Woe9P9td2NbPIa7wzG+muLGtNDV/34gGSD+zAXkFjE+3qv2hz9rP+nw85HB5q9uZxHCV0wyfMhenlW7e0xHR4j6NNZsJk1lRXCjuyQg86t/v/pJFsvqL9GwrdaTm76PCrrAh4P1Z17k0TKzeKI3yKasuWOoP79tWrSAiU42KunnW2LT+SrQt0SmP5CrwqX1daKxyCUKYrLpgpdufJeMnhyPOmLI4/R4H9VRXhL5O8ockugLsEEymoHNY++jAeotce0VJPuSvTsrR+HHGaj67Z/Papm5lRo99dFFzC2luFCEb8FDD/j+uZUvtI25iwwiX0P7zGqHHdzGggf3BkIO89Zif453w1PFBrvjKNbKe3buNv5osGka4NTWZDk/B452vtFQ2c+uoss9mx2vthd2sGg7BHLWZJiB5aqn4IBqYMyV8tDNbk67bVNU/c9sM3tK9pvVzDCTxc7QzXQvek73T2s2c3EtdLOby24TO2w3q+lQln+0E+06q/QFVObcWGCuz+zM9rRsnf9uAvxdra0wKTjCqP4CyS90JP2d2JJLuhyYiCmbqi0zPzfFWwWJxpDdoodQRoQ5g+KS3BwGuLZ/VTnajJJW5HyL0A+UIXjC+SWTCpXiTY4vl+ElsN76nhRx1UZGLwmXKv6B5OpOZ788XKv5oADJ7JCs65qo4FkVY5slzBRnwhGpykx5JM801rdZbPxeBhbFxJ63M2RanA/qSi8W4CObQUYTLGSnovIDFGGTVOolvurSPpg3QuuaMtGr/wUAAP//brq4rw==" } From f481fb3ad078c9efd86faa4d687725bd245bc008 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 3 Aug 2020 16:40:10 -0700 Subject: [PATCH 16/32] Removing field alias mappings for unused fields --- .../module/elasticsearch/_meta/fields.yml | 153 +----------------- 1 file changed, 6 insertions(+), 147 deletions(-) diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index 0be093b83bd..1702997f4da 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -36,12 +36,6 @@ - name: available_in_bytes path: elasticsearch.node.stats.fs.summary.available.bytes type: alias - - name: free_in_bytes - path: elasticsearch.node.stats.fs.summary.free.bytes - type: alias - - name: total_in_bytes - path: elasticsearch.node.stats.fs.summary.total.bytes - type: alias - name: io_stats type: group fields: @@ -51,54 +45,15 @@ - name: operations path: elasticsearch.node.stats.fs.io_stats.total.operations.count type: alias - - name: read_kilobytes - path: elasticsearch.node.stats.fs.io_stats.total.read.kb - type: alias - name: read_operations path: elasticsearch.node.stats.fs.io_stats.total.read.operations.count type: alias - - name: write_kilobytes - path: elasticsearch.node.stats.fs.io_stats.total.write.kb - type: alias - name: write_operations path: elasticsearch.node.stats.fs.io_stats.total.write.operations.count type: alias - name: indices type: group fields: - - name: bulk - type: group - fields: - - name: avg_size_in_bytes - path: elasticsearch.node.stats.indices.bulk.avg_size.bytes - type: alias - - name: avg_time_in_millis - path: elasticsearch.node.stats.indices.bulk.avg_time.ms - type: alias - - name: total_operations - path: elasticsearch.node.stats.indices.bulk.operations.total.count - type: alias - - name: total_size_in_bytes - path: elasticsearch.node.stats.indices.bulk.total_size.bytes - type: alias - - name: total_time_in_millis - path: elasticsearch.node.stats.indices.bulk.total_time.ms - type: alias - - name: docs - type: group - fields: - - name: count - path: elasticsearch.node.stats.indices.docs.count - type: alias - - name: fielddata - type: group - fields: - - name: evictions - path: elasticsearch.node.stats.indices.fielddata.evictions.count - type: alias - - name: memory_size_in_bytes - path: elasticsearch.node.stats.indices.fielddata.memory.bytes - type: alias - name: indexing type: group fields: @@ -111,36 +66,24 @@ - name: throttle_time_in_millis path: elasticsearch.node.stats.indices.indexing.throttle_time.ms type: alias - - name: query_cache + - name: fielddata type: group fields: - - name: evictions - path: elasticsearch.node.stats.indices.query_cache.evictions.count - type: alias - - name: hit_count - path: elasticsearch.node.stats.indices.query_cache.hits.count + - name: memory_size_in_bytes + path: elasticsearch.node.stats.indices.fielddata.memory.bytes type: alias + - name: query_cache + type: group + fields: - name: memory_size_in_bytes path: elasticsearch.node.stats.indices.query_cache.memory.bytes type: alias - - name: miss_count - path: elasticsearch.node.stats.indices.query_cache.misses.count - type: alias - name: request_cache type: group fields: - - name: evictions - path: elasticsearch.node.stats.indices.request_cache.evictions.count - type: alias - - name: hit_count - path: elasticsearch.node.stats.indices.request_cache.hits.count - type: alias - name: memory_size_in_bytes path: elasticsearch.node.stats.indices.request_cache.memory.bytes type: alias - - name: miss_count - path: elasticsearch.node.stats.indices.request_cache.misses.count - type: alias - name: search type: group fields: @@ -186,12 +129,6 @@ - name: version_map_memory_in_bytes path: elasticsearch.node.stats.indices.segments.version_map.memory.bytes type: alias - - name: store - type: group - fields: - - name: size_in_bytes - path: elasticsearch.node.stats.indices.store.size.bytes - type: alias - name: jvm type: group fields: @@ -231,15 +168,9 @@ - name: heap_used_percent path: elasticsearch.node.stats.jvm.mem.heap.used.pct type: alias - - name: mlockall - path: elasticsearch.node.mlockall - type: alias - name: node_id path: elasticsearch.node.id type: alias - - name: node_master - path: elasticsearch.node.master - type: alias - name: os type: group fields: @@ -252,33 +183,18 @@ - name: 1m path: elasticsearch.node.stats.os.cpu.load_avg.1m type: alias - - name: 5m - path: elasticsearch.node.stats.os.cpu.load_avg.5m - type: alias - - name: 15m - path: elasticsearch.node.stats.os.cpu.load_avg.15m - type: alias - name: cgroup type: group fields: - name: cpuacct type: group fields: - - name: control_group - path: elasticsearch.node.stats.os.cgroup.cpuacct.control_group - type: alias - name: usage_nanos path: elasticsearch.node.stats.os.cgroup.cpuacct.usage.ns type: alias - name: cpu type: group fields: - - name: control_group - path: elasticsearch.node.stats.os.cgroup.cpu.control_group - type: alias - - name: cfs_period_micros - path: elasticsearch.node.stats.os.cgroup.cpu.cfs.period.us - type: alias - name: cfs_quota_micros path: elasticsearch.node.stats.os.cgroup.cpu.cfs.quota.us type: alias @@ -315,12 +231,6 @@ - name: percent path: elasticsearch.node.stats.process.cpu.pct type: alias - - name: max_file_descriptors - path: elasticsearch.node.stats.process.file_descriptors.max.count - type: alias - - name: open_file_descriptors - path: elasticsearch.node.stats.process.file_descriptors.open.count - type: alias - name: thread_pool type: group fields: @@ -333,21 +243,6 @@ - name: rejected path: elasticsearch.node.stats.thread_pool.bulk.rejected.count type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.bulk.threads.count - type: alias - - name: generic - type: group - fields: - - name: queue - path: elasticsearch.node.stats.thread_pool.generic.queue.count - type: alias - - name: rejected - path: elasticsearch.node.stats.thread_pool.generic.rejected.count - type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.generic.threads.count - type: alias - name: get type: group fields: @@ -357,9 +252,6 @@ - name: rejected path: elasticsearch.node.stats.thread_pool.get.rejected.count type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.get.threads.count - type: alias - name: index type: group fields: @@ -369,21 +261,6 @@ - name: rejected path: elasticsearch.node.stats.thread_pool.index.rejected.count type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.index.threads.count - type: alias - - name: management - type: group - fields: - - name: queue - path: elasticsearch.node.stats.thread_pool.management.queue.count - type: alias - - name: rejected - path: elasticsearch.node.stats.thread_pool.management.rejected.count - type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.management.threads.count - type: alias - name: search type: group fields: @@ -393,21 +270,6 @@ - name: rejected path: elasticsearch.node.stats.thread_pool.search.rejected.count type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.search.threads.count - type: alias - - name: watcher - type: group - fields: - - name: queue - path: elasticsearch.node.stats.thread_pool.watcher.queue.count - type: alias - - name: rejected - path: elasticsearch.node.stats.thread_pool.watcher.rejected.count - type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.watcher.threads.count - type: alias - name: write type: group fields: @@ -417,9 +279,6 @@ - name: rejected path: elasticsearch.node.stats.thread_pool.write.rejected.count type: alias - - name: threads - path: elasticsearch.node.stats.thread_pool.write.threads.count - type: alias - name: elasticsearch type: group description: > From be801e415f811bf56e6b618b88ea2e62facc77b8 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 3 Aug 2020 16:57:19 -0700 Subject: [PATCH 17/32] Removing unnecessary fields from mapping --- .../elasticsearch/node_stats/_meta/fields.yml | 124 ++---------------- 1 file changed, 11 insertions(+), 113 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml index aec05872955..b9db2dc2ebe 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml @@ -30,26 +30,9 @@ type: long description: > Total size of the store in bytes. - - name: bulk - type: group - fields: - - name: avg_size.bytes - type: long - format: bytes - - name: avg_time.ms - type: long - - name: operations.total.count - type: long - - name: total_size.bytes - type: long - format: bytes - - name: total_time.ms - type: long - name: fielddata type: group fields: - - name: evictions.count - type: long - name: memory.bytes type: long format: bytes @@ -65,27 +48,15 @@ - name: query_cache type: group fields: - - name: evictions.count - type: long - - name: hits.count - type: long - name: memory.bytes type: long format: bytes - - name: misses.count - type: long - name: request_cache type: group fields: - - name: evictions.count - type: long - - name: hits.count - type: long - name: memory.bytes type: long format: bytes - - name: misses.count - type: long - name: search type: group fields: @@ -274,20 +245,10 @@ fields: - name: operations.count type: long - - name: read - type: group - fields: - - name: kb - type: long - - name: operations.count - type: long - - name: write - type: group - fields: - - name: kb - type: long - - name: operations.count - type: long + - name: read.operations.count + type: long + - name: write.operations.count + type: long - name: os type: group fields: @@ -296,32 +257,16 @@ fields: - name: load_avg.1m type: long - - name: load_avg.5m - type: long - - name: load_avg.15m - type: long - name: cgroup type: group fields: - - name: cpuacct - type: group - fields: - - name: control_group - type: keyword - - name: usage.ns - type: long + - name: cpuacct.usage.ns + type: long - name: cpu type: group fields: - - name: control_group - type: keyword - - name: cfs - type: group - fields: - - name: period.us - type: long - - name: quota.us - type: long + - name: cfs.quota.us + type: long - name: stat type: group fields: @@ -342,19 +287,9 @@ - name: usage.bytes type: long format: bytes - - name: process - type: group - fields: - - name: cpu.pct - type: long - format: percent - - name: file_descriptors - type: group - fields: - - name: max.count - type: long - - name: open.count - type: long + - name: process.cpu.pct + type: long + format: percent - name: thread_pool type: group fields: @@ -365,17 +300,6 @@ type: long - name: rejected.count type: long - - name: threads.count - type: long - - name: generic - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - name: get type: group fields: @@ -383,8 +307,6 @@ type: long - name: rejected.count type: long - - name: threads.count - type: long - name: index type: group fields: @@ -392,17 +314,6 @@ type: long - name: rejected.count type: long - - name: threads.count - type: long - - name: management - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - name: search type: group fields: @@ -410,17 +321,6 @@ type: long - name: rejected.count type: long - - name: threads.count - type: long - - name: watcher - type: group - fields: - - name: queue.count - type: long - - name: rejected.count - type: long - - name: threads.count - type: long - name: write type: group fields: @@ -428,8 +328,6 @@ type: long - name: rejected.count type: long - - name: threads.count - type: long From 207d11d0eb1c8fc687892f04b65a8fa36f58f88d Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 3 Aug 2020 16:58:47 -0700 Subject: [PATCH 18/32] Updating generated files --- metricbeat/docs/fields.asciidoc | 674 +--------------------- metricbeat/module/elasticsearch/fields.go | 2 +- 2 files changed, 21 insertions(+), 655 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index b1c4497208a..a559847474d 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -15830,24 +15830,6 @@ alias to: elasticsearch.node.stats.fs.summary.available.bytes -- -*`node_stats.fs.total.free_in_bytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.fs.summary.free.bytes - --- - -*`node_stats.fs.total.total_in_bytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.fs.summary.total.bytes - --- - *`node_stats.fs.io_stats.total.operations`*:: @@ -15859,15 +15841,6 @@ alias to: elasticsearch.node.stats.fs.io_stats.total.operations.count -- -*`node_stats.fs.io_stats.total.read_kilobytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.fs.io_stats.total.read.kb - --- - *`node_stats.fs.io_stats.total.read_operations`*:: + -- @@ -15877,15 +15850,6 @@ alias to: elasticsearch.node.stats.fs.io_stats.total.read.operations.count -- -*`node_stats.fs.io_stats.total.write_kilobytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.fs.io_stats.total.write.kb - --- - *`node_stats.fs.io_stats.total.write_operations`*:: + -- @@ -15897,81 +15861,6 @@ alias to: elasticsearch.node.stats.fs.io_stats.total.write.operations.count -*`node_stats.indices.bulk.avg_size_in_bytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.bulk.avg_size.bytes - --- - -*`node_stats.indices.bulk.avg_time_in_millis`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.bulk.avg_time.ms - --- - -*`node_stats.indices.bulk.total_operations`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.bulk.operations.total.count - --- - -*`node_stats.indices.bulk.total_size_in_bytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.bulk.total_size.bytes - --- - -*`node_stats.indices.bulk.total_time_in_millis`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.bulk.total_time.ms - --- - - -*`node_stats.indices.docs.count`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.docs.count - --- - - -*`node_stats.indices.fielddata.evictions`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.fielddata.evictions.count - --- - -*`node_stats.indices.fielddata.memory_size_in_bytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.fielddata.memory.bytes - --- - - *`node_stats.indices.indexing.index_time_in_millis`*:: + -- @@ -16000,23 +15889,15 @@ alias to: elasticsearch.node.stats.indices.indexing.throttle_time.ms -- -*`node_stats.indices.query_cache.evictions`*:: +*`node_stats.indices.fielddata.memory_size_in_bytes`*:: + -- type: alias -alias to: elasticsearch.node.stats.indices.query_cache.evictions.count - --- +alias to: elasticsearch.node.stats.indices.fielddata.memory.bytes -*`node_stats.indices.query_cache.hit_count`*:: -+ -- -type: alias -alias to: elasticsearch.node.stats.indices.query_cache.hits.count - --- *`node_stats.indices.query_cache.memory_size_in_bytes`*:: + @@ -16027,33 +15908,6 @@ alias to: elasticsearch.node.stats.indices.query_cache.memory.bytes -- -*`node_stats.indices.query_cache.miss_count`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.query_cache.misses.count - --- - - -*`node_stats.indices.request_cache.evictions`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.request_cache.evictions.count - --- - -*`node_stats.indices.request_cache.hit_count`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.request_cache.hits.count - --- *`node_stats.indices.request_cache.memory_size_in_bytes`*:: + @@ -16064,15 +15918,6 @@ alias to: elasticsearch.node.stats.indices.request_cache.memory.bytes -- -*`node_stats.indices.request_cache.miss_count`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.request_cache.misses.count - --- - *`node_stats.indices.search.query_time_in_millis`*:: + @@ -16193,16 +16038,6 @@ alias to: elasticsearch.node.stats.indices.segments.version_map.memory.bytes -- -*`node_stats.indices.store.size_in_bytes`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.indices.store.size.bytes - --- - - @@ -16271,15 +16106,6 @@ alias to: elasticsearch.node.stats.jvm.mem.heap.used.pct -- -*`node_stats.mlockall`*:: -+ --- -type: alias - -alias to: elasticsearch.node.mlockall - --- - *`node_stats.node_id`*:: + -- @@ -16289,15 +16115,6 @@ alias to: elasticsearch.node.id -- -*`node_stats.node_master`*:: -+ --- -type: alias - -alias to: elasticsearch.node.master - --- - @@ -16310,34 +16127,7 @@ alias to: elasticsearch.node.stats.os.cpu.load_avg.1m -- -*`node_stats.os.cpu.load_average.5m`*:: -+ --- -type: alias -alias to: elasticsearch.node.stats.os.cpu.load_avg.5m - --- - -*`node_stats.os.cpu.load_average.15m`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.os.cpu.load_avg.15m - --- - - - -*`node_stats.os.cgroup.cpuacct.control_group`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.os.cgroup.cpuacct.control_group - --- *`node_stats.os.cgroup.cpuacct.usage_nanos`*:: + @@ -16349,24 +16139,6 @@ alias to: elasticsearch.node.stats.os.cgroup.cpuacct.usage.ns -- -*`node_stats.os.cgroup.cpu.control_group`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.os.cgroup.cpu.control_group - --- - -*`node_stats.os.cgroup.cpu.cfs_period_micros`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.os.cgroup.cpu.cfs.period.us - --- - *`node_stats.os.cgroup.cpu.cfs_quota_micros`*:: + -- @@ -16443,218 +16215,80 @@ alias to: elasticsearch.node.stats.process.cpu.pct -- -*`node_stats.process.max_file_descriptors`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.process.file_descriptors.max.count - --- - -*`node_stats.process.open_file_descriptors`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.process.file_descriptors.open.count - --- - - - -*`node_stats.thread_pool.bulk.queue`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.bulk.queue.count - --- - -*`node_stats.thread_pool.bulk.rejected`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.bulk.rejected.count - --- - -*`node_stats.thread_pool.bulk.threads`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.bulk.threads.count - --- - - -*`node_stats.thread_pool.generic.queue`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.generic.queue.count - --- - -*`node_stats.thread_pool.generic.rejected`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.generic.rejected.count - --- - -*`node_stats.thread_pool.generic.threads`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.generic.threads.count - --- - - -*`node_stats.thread_pool.get.queue`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.get.queue.count - --- - -*`node_stats.thread_pool.get.rejected`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.get.rejected.count - --- - -*`node_stats.thread_pool.get.threads`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.get.threads.count - --- - - -*`node_stats.thread_pool.index.queue`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.index.queue.count - --- - -*`node_stats.thread_pool.index.rejected`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.index.rejected.count - --- - -*`node_stats.thread_pool.index.threads`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.index.threads.count - --- - - -*`node_stats.thread_pool.management.queue`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.management.queue.count --- -*`node_stats.thread_pool.management.rejected`*:: +*`node_stats.thread_pool.bulk.queue`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.management.rejected.count +alias to: elasticsearch.node.stats.thread_pool.bulk.queue.count -- -*`node_stats.thread_pool.management.threads`*:: +*`node_stats.thread_pool.bulk.rejected`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.management.threads.count +alias to: elasticsearch.node.stats.thread_pool.bulk.rejected.count -- -*`node_stats.thread_pool.search.queue`*:: +*`node_stats.thread_pool.get.queue`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.search.queue.count +alias to: elasticsearch.node.stats.thread_pool.get.queue.count -- -*`node_stats.thread_pool.search.rejected`*:: +*`node_stats.thread_pool.get.rejected`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.search.rejected.count +alias to: elasticsearch.node.stats.thread_pool.get.rejected.count -- -*`node_stats.thread_pool.search.threads`*:: + +*`node_stats.thread_pool.index.queue`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.search.threads.count +alias to: elasticsearch.node.stats.thread_pool.index.queue.count -- - -*`node_stats.thread_pool.watcher.queue`*:: +*`node_stats.thread_pool.index.rejected`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.watcher.queue.count +alias to: elasticsearch.node.stats.thread_pool.index.rejected.count -- -*`node_stats.thread_pool.watcher.rejected`*:: + +*`node_stats.thread_pool.search.queue`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.watcher.rejected.count +alias to: elasticsearch.node.stats.thread_pool.search.queue.count -- -*`node_stats.thread_pool.watcher.threads`*:: +*`node_stats.thread_pool.search.rejected`*:: + -- type: alias -alias to: elasticsearch.node.stats.thread_pool.watcher.threads.count +alias to: elasticsearch.node.stats.thread_pool.search.rejected.count -- @@ -16677,15 +16311,6 @@ alias to: elasticsearch.node.stats.thread_pool.write.rejected.count -- -*`node_stats.thread_pool.write.threads`*:: -+ --- -type: alias - -alias to: elasticsearch.node.stats.thread_pool.write.threads.count - --- - [float] === elasticsearch @@ -17500,53 +17125,6 @@ type: long -- -*`elasticsearch.node.stats.indices.bulk.avg_size.bytes`*:: -+ --- -type: long - -format: bytes - --- - -*`elasticsearch.node.stats.indices.bulk.avg_time.ms`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.indices.bulk.operations.total.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.indices.bulk.total_size.bytes`*:: -+ --- -type: long - -format: bytes - --- - -*`elasticsearch.node.stats.indices.bulk.total_time.ms`*:: -+ --- -type: long - --- - - -*`elasticsearch.node.stats.indices.fielddata.evictions.count`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.indices.fielddata.memory.bytes`*:: + -- @@ -17579,20 +17157,6 @@ type: long -- -*`elasticsearch.node.stats.indices.query_cache.evictions.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.indices.query_cache.hits.count`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.indices.query_cache.memory.bytes`*:: + -- @@ -17602,27 +17166,6 @@ format: bytes -- -*`elasticsearch.node.stats.indices.query_cache.misses.count`*:: -+ --- -type: long - --- - - -*`elasticsearch.node.stats.indices.request_cache.evictions.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.indices.request_cache.hits.count`*:: -+ --- -type: long - --- *`elasticsearch.node.stats.indices.request_cache.memory.bytes`*:: + @@ -17633,13 +17176,6 @@ format: bytes -- -*`elasticsearch.node.stats.indices.request_cache.misses.count`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.indices.search.query_time.ms`*:: + @@ -18033,14 +17569,6 @@ type: long -- - -*`elasticsearch.node.stats.fs.io_stats.total.read.kb`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.fs.io_stats.total.read.operations.count`*:: + -- @@ -18048,14 +17576,6 @@ type: long -- - -*`elasticsearch.node.stats.fs.io_stats.total.write.kb`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.fs.io_stats.total.write.operations.count`*:: + -- @@ -18072,28 +17592,6 @@ type: long -- -*`elasticsearch.node.stats.os.cpu.load_avg.5m`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.os.cpu.load_avg.15m`*:: -+ --- -type: long - --- - - - -*`elasticsearch.node.stats.os.cgroup.cpuacct.control_group`*:: -+ --- -type: keyword - --- *`elasticsearch.node.stats.os.cgroup.cpuacct.usage.ns`*:: + @@ -18103,21 +17601,6 @@ type: long -- -*`elasticsearch.node.stats.os.cgroup.cpu.control_group`*:: -+ --- -type: keyword - --- - - -*`elasticsearch.node.stats.os.cgroup.cpu.cfs.period.us`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.os.cgroup.cpu.cfs.quota.us`*:: + -- @@ -18173,7 +17656,6 @@ format: bytes -- - *`elasticsearch.node.stats.process.cpu.pct`*:: + -- @@ -18184,21 +17666,6 @@ format: percent -- -*`elasticsearch.node.stats.process.file_descriptors.max.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.process.file_descriptors.open.count`*:: -+ --- -type: long - --- - - *`elasticsearch.node.stats.thread_pool.bulk.queue.count`*:: + @@ -18214,35 +17681,6 @@ type: long -- -*`elasticsearch.node.stats.thread_pool.bulk.threads.count`*:: -+ --- -type: long - --- - - -*`elasticsearch.node.stats.thread_pool.generic.queue.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.thread_pool.generic.rejected.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.thread_pool.generic.threads.count`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.thread_pool.get.queue.count`*:: + @@ -18258,13 +17696,6 @@ type: long -- -*`elasticsearch.node.stats.thread_pool.get.threads.count`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.thread_pool.index.queue.count`*:: + @@ -18280,35 +17711,6 @@ type: long -- -*`elasticsearch.node.stats.thread_pool.index.threads.count`*:: -+ --- -type: long - --- - - -*`elasticsearch.node.stats.thread_pool.management.queue.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.thread_pool.management.rejected.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.thread_pool.management.threads.count`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.thread_pool.search.queue.count`*:: + @@ -18324,35 +17726,6 @@ type: long -- -*`elasticsearch.node.stats.thread_pool.search.threads.count`*:: -+ --- -type: long - --- - - -*`elasticsearch.node.stats.thread_pool.watcher.queue.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.thread_pool.watcher.rejected.count`*:: -+ --- -type: long - --- - -*`elasticsearch.node.stats.thread_pool.watcher.threads.count`*:: -+ --- -type: long - --- - *`elasticsearch.node.stats.thread_pool.write.queue.count`*:: + @@ -18368,13 +17741,6 @@ type: long -- -*`elasticsearch.node.stats.thread_pool.write.threads.count`*:: -+ --- -type: long - --- - [float] === cluster.pending_task diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index cb2700cad55..10dc9114ab1 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "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" } From 514628f4ba61667e76fa68e94a8d47d63d2e5a44 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 10 Aug 2020 16:51:03 -0700 Subject: [PATCH 19/32] Reducing visibility of isMaster function --- metricbeat/module/elasticsearch/elasticsearch.go | 4 ++-- metricbeat/module/elasticsearch/metricset.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index 52ee233d88c..00463c782b6 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -137,14 +137,14 @@ func GetClusterID(http *helper.HTTP, uri string, nodeID string) (string, error) return info.ClusterID, nil } -// IsMaster checks if the given node host is a master node. +// isMaster checks if the given node host is a master node. // // The detection of the master is done in two steps: // * Fetch node name from /_nodes/_local/name // * Fetch current master name from cluster state /_cluster/state/master_node // // The two names are compared -func IsMaster(http *helper.HTTP, uri string) (bool, error) { +func isMaster(http *helper.HTTP, uri string) (bool, error) { node, err := getNodeName(http, uri) if err != nil { diff --git a/metricbeat/module/elasticsearch/metricset.go b/metricbeat/module/elasticsearch/metricset.go index 22b4b2c6c49..1fdf9eb3517 100644 --- a/metricbeat/module/elasticsearch/metricset.go +++ b/metricbeat/module/elasticsearch/metricset.go @@ -122,7 +122,7 @@ func (m *MetricSet) ShouldSkipFetch() (bool, error) { // If we're talking to a set of ES nodes directly, only collect stats from the master node so // we don't collect the same stats from every node and end up duplicating them. if m.Scope == ScopeNode { - isMaster, err := IsMaster(m.HTTP, m.GetServiceURI()) + isMaster, err := isMaster(m.HTTP, m.GetServiceURI()) if err != nil { return false, errors.Wrap(err, "error determining if connected Elasticsearch node is master") } From ca6c51f983f85b4a6c1927e517e75f5e98ab0703 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 10 Aug 2020 16:51:45 -0700 Subject: [PATCH 20/32] Adding methods to metricset --- .../module/elasticsearch/elasticsearch.go | 10 ++++++++-- .../module/elasticsearch/node_stats/data.go | 19 ++++++++++--------- .../elasticsearch/node_stats/data_xpack.go | 4 ++-- .../elasticsearch/node_stats/node_stats.go | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index 00463c782b6..e4abd471a5a 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -416,7 +416,10 @@ func GetIndicesSettings(http *helper.HTTP, resetURI string) (map[string]IndexSet } // IsMLockAllEnabled returns if the given Elasticsearch node has mlockall enabled -func IsMLockAllEnabled(http *helper.HTTP, resetURI, nodeID string) (bool, error) { +func (m *MetricSet) IsMLockAllEnabled(nodeID string) (bool, error) { + http := m.HTTP + resetURI := m.GetServiceURI() + content, err := fetchPath(http, resetURI, "_nodes/"+nodeID, "filter_path=nodes.*.process.mlockall") if err != nil { return false, err @@ -437,7 +440,10 @@ func IsMLockAllEnabled(http *helper.HTTP, resetURI, nodeID string) (bool, error) } // GetMasterNodeID returns the ID of the Elasticsearch cluster's master node -func GetMasterNodeID(http *helper.HTTP, resetURI string) (string, error) { +func (m *MetricSet) GetMasterNodeID() (string, error) { + http := m.HTTP + resetURI := m.GetServiceURI() + content, err := fetchPath(http, resetURI, "_nodes/_master", "filter_path=nodes.*.name") if err != nil { return "", err diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 31d39f7e6a4..5847d528de6 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -341,22 +341,23 @@ type nodesStruct struct { Nodes map[string]map[string]interface{} `json:"nodes"` } -func eventsMapping(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { +func eventsMapping(r mb.ReporterV2, m *elasticsearch.MetricSet, info elasticsearch.Info, content []byte) error { nodeData := &nodesStruct{} err := json.Unmarshal(content, nodeData) if err != nil { return errors.Wrap(err, "failure parsing Elasticsearch Node Stats API response") } + masterNodeID, err := m.GetMasterNodeID() + if err != nil { + return err + } + var errs multierror.Errors - for id, node := range nodeData.Nodes { - isMaster, err := elasticsearch.IsMaster(m.HTTP, m.HTTP.GetURI()) - if err != nil { - errs = append(errs, errors.Wrap(err, "error determining if connected Elasticsearch node is master")) - continue - } + for nodeID, node := range nodeData.Nodes { + isMaster := nodeID == masterNodeID - mlockall, err := elasticsearch.IsMLockAllEnabled(m.HTTP, m.HTTP.GetURI(), id) + mlockall, err := m.IsMLockAllEnabled(nodeID) if err != nil { errs = append(errs, errors.Wrap(err, "error determining if mlockall is set on Elasticsearch node")) continue @@ -369,7 +370,7 @@ func eventsMapping(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, conte event.ModuleFields = common.MapStr{ "node": common.MapStr{ - "id": id, + "id": nodeID, "mlockall": mlockall, "master": isMaster, }, diff --git a/metricbeat/module/elasticsearch/node_stats/data_xpack.go b/metricbeat/module/elasticsearch/node_stats/data_xpack.go index b1d4c5aee84..10c69957335 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/node_stats/data_xpack.go @@ -187,7 +187,7 @@ func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, return errors.Wrap(err, "failure parsing Elasticsearch Node Stats API response") } - masterNodeID, err := elasticsearch.GetMasterNodeID(m.HTTP, m.HTTP.GetURI()) + masterNodeID, err := m.GetMasterNodeID() if err != nil { return err } @@ -207,7 +207,7 @@ func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, nodeData["node_master"] = isMaster nodeData["node_id"] = nodeID - mlockall, err := elasticsearch.IsMLockAllEnabled(m.HTTP, m.HTTP.GetURI(), nodeID) + mlockall, err := m.IsMLockAllEnabled(nodeID) if err != nil { errs = append(errs, err) continue diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats.go b/metricbeat/module/elasticsearch/node_stats/node_stats.go index b32260748d1..ebe11d8c933 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats.go @@ -84,7 +84,7 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { return nil } } else { - return eventsMapping(r, m, *info, content) + return eventsMapping(r, m.MetricSet, *info, content) } return nil From 460d470b7f4787c69585b2567dad51a9f6bdb8b6 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 10 Aug 2020 17:08:41 -0700 Subject: [PATCH 21/32] Refactoring for testability --- .../module/elasticsearch/elasticsearch.go | 49 ---------------- metricbeat/module/elasticsearch/metricset.go | 57 +++++++++++++++++++ .../node_stats/_meta/test/node_stats.243.json | 4 +- .../node_stats/_meta/test/node_stats.522.json | 4 +- .../node_stats/_meta/test/node_stats.623.json | 4 +- .../module/elasticsearch/node_stats/data.go | 2 +- .../elasticsearch/node_stats/data_test.go | 35 +++++++++++- .../elasticsearch/node_stats/data_xpack.go | 2 +- metricbeat/module/elasticsearch/testing.go | 26 +++++++++ 9 files changed, 125 insertions(+), 58 deletions(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index e4abd471a5a..6b5bc46464d 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -415,55 +415,6 @@ func GetIndicesSettings(http *helper.HTTP, resetURI string) (map[string]IndexSet return ret, nil } -// IsMLockAllEnabled returns if the given Elasticsearch node has mlockall enabled -func (m *MetricSet) IsMLockAllEnabled(nodeID string) (bool, error) { - http := m.HTTP - resetURI := m.GetServiceURI() - - content, err := fetchPath(http, resetURI, "_nodes/"+nodeID, "filter_path=nodes.*.process.mlockall") - if err != nil { - return false, err - } - - var response map[string]map[string]map[string]map[string]bool - err = json.Unmarshal(content, &response) - if err != nil { - return false, err - } - - for _, nodeInfo := range response["nodes"] { - mlockall := nodeInfo["process"]["mlockall"] - return mlockall, nil - } - - return false, fmt.Errorf("could not determine if mlockall is enabled on node ID = %v", nodeID) -} - -// GetMasterNodeID returns the ID of the Elasticsearch cluster's master node -func (m *MetricSet) GetMasterNodeID() (string, error) { - http := m.HTTP - resetURI := m.GetServiceURI() - - content, err := fetchPath(http, resetURI, "_nodes/_master", "filter_path=nodes.*.name") - if err != nil { - return "", err - } - - var response struct { - Nodes map[string]interface{} `json:"nodes"` - } - - if err := json.Unmarshal(content, &response); err != nil { - return "", err - } - - for nodeID, _ := range response.Nodes { - return nodeID, nil - } - - return "", errors.New("could not determine master node ID") -} - // PassThruField copies the field at the given path from the given source data object into // the same path in the given target data object. func PassThruField(fieldPath string, sourceData, targetData common.MapStr) error { diff --git a/metricbeat/module/elasticsearch/metricset.go b/metricbeat/module/elasticsearch/metricset.go index 1fdf9eb3517..8df29590503 100644 --- a/metricbeat/module/elasticsearch/metricset.go +++ b/metricbeat/module/elasticsearch/metricset.go @@ -18,6 +18,7 @@ package elasticsearch import ( + "encoding/json" "fmt" "github.com/pkg/errors" @@ -65,6 +66,12 @@ func (h *Scope) Unpack(str string) error { return nil } +type MetricSetAPI interface{ + Module() mb.Module + GetMasterNodeID() (string, error) + IsMLockAllEnabled(string) (bool, error) +} + // MetricSet can be used to build other metric sets that query RabbitMQ // management plugin type MetricSet struct { @@ -136,3 +143,53 @@ func (m *MetricSet) ShouldSkipFetch() (bool, error) { return false, nil } + +// GetMasterNodeID returns the ID of the Elasticsearch cluster's master node +func (m *MetricSet) GetMasterNodeID() (string, error) { + http := m.HTTP + resetURI := m.GetServiceURI() + + content, err := fetchPath(http, resetURI, "_nodes/_master", "filter_path=nodes.*.name") + if err != nil { + return "", err + } + + var response struct { + Nodes map[string]interface{} `json:"nodes"` + } + + if err := json.Unmarshal(content, &response); err != nil { + return "", err + } + + for nodeID, _ := range response.Nodes { + return nodeID, nil + } + + return "", errors.New("could not determine master node ID") +} + +// IsMLockAllEnabled returns if the given Elasticsearch node has mlockall enabled +func (m *MetricSet) IsMLockAllEnabled(nodeID string) (bool, error) { + http := m.HTTP + resetURI := m.GetServiceURI() + + content, err := fetchPath(http, resetURI, "_nodes/"+nodeID, "filter_path=nodes.*.process.mlockall") + if err != nil { + return false, err + } + + var response map[string]map[string]map[string]map[string]bool + err = json.Unmarshal(content, &response) + if err != nil { + return false, err + } + + for _, nodeInfo := range response["nodes"] { + mlockall := nodeInfo["process"]["mlockall"] + return mlockall, nil + } + + return false, fmt.Errorf("could not determine if mlockall is enabled on node ID = %v", nodeID) +} + diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json b/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json index cf8e33b9811..f008e6de235 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json +++ b/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json @@ -1,7 +1,7 @@ { "cluster_name" : "elasticsearch", "nodes" : { - "Tf3ps4nBSruDoLz3jx2uqg" : { + "test_node_id" : { "timestamp" : 1491553881539, "name" : "Projector", "transport_address" : "127.0.0.1:9300", @@ -423,4 +423,4 @@ } } } -} \ No newline at end of file +} diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.522.json b/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.522.json index 31dcdd8a3b7..09ced1c2cfa 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.522.json +++ b/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.522.json @@ -6,7 +6,7 @@ }, "cluster_name" : "elasticsearch", "nodes" : { - "x6_Rm157RqilNEqtdgcNrA" : { + "test_node_id" : { "timestamp" : 1491553781643, "name" : "x6_Rm15", "transport_address" : "127.0.0.1:9300", @@ -437,4 +437,4 @@ } } } -} \ No newline at end of file +} diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.623.json b/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.623.json index 627b117321f..1767caedeb5 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.623.json +++ b/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.623.json @@ -6,7 +6,7 @@ }, "cluster_name": "842d2a3cdf39e9ae2e0b2c7ca7cea075", "nodes": { - "r4XD9O8eTrCHyN_GJswZ5A": { + "test_node_id": { "timestamp": 1524464610026, "name": "instance-0000000016", "transport_address": "172.25.133.112:19608", @@ -503,7 +503,7 @@ } }, "adaptive_selection": { - "r4XD9O8eTrCHyN_GJswZ5A": { + "test_node_id": { "outgoing_searches": 0, "avg_queue_size": 0, "avg_service_time_ns": 79338, diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 5847d528de6..bd924c56bc4 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -341,7 +341,7 @@ type nodesStruct struct { Nodes map[string]map[string]interface{} `json:"nodes"` } -func eventsMapping(r mb.ReporterV2, m *elasticsearch.MetricSet, info elasticsearch.Info, content []byte) error { +func eventsMapping(r mb.ReporterV2, m elasticsearch.MetricSetAPI, info elasticsearch.Info, content []byte) error { nodeData := &nodesStruct{} err := json.Unmarshal(content, nodeData) if err != nil { diff --git a/metricbeat/module/elasticsearch/node_stats/data_test.go b/metricbeat/module/elasticsearch/node_stats/data_test.go index 043a1447f25..05b54ca87e4 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_test.go +++ b/metricbeat/module/elasticsearch/node_stats/data_test.go @@ -22,9 +22,42 @@ package node_stats import ( "testing" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestStats(t *testing.T) { - elasticsearch.TestMapperWithInfo(t, "./_meta/test/node_stats.*.json", eventsMapping) + ms := mockMetricSet{} + elasticsearch.TestMapperWithMetricSetAndInfo(t, "./_meta/test/node_stats.*.json", ms, eventsMapping) } + +type mockMetricSet struct{} + +func (m mockMetricSet) GetMasterNodeID() (string, error) { + return "test_node_id", nil +} + +func (m mockMetricSet) IsMLockAllEnabled(_ string) (bool, error) { + return true, nil +} + +func (m mockMetricSet) Module() mb.Module { + return mockModule{} +} + +type mockModule struct {} + +func (m mockModule) Name() string { + return "mock_module" +} + +func (m mockModule) Config() mb.ModuleConfig { + return mb.ModuleConfig{ + Period: 10000, + } +} + +func (m mockModule) UnpackConfig(to interface{}) error { + return nil +} + diff --git a/metricbeat/module/elasticsearch/node_stats/data_xpack.go b/metricbeat/module/elasticsearch/node_stats/data_xpack.go index 10c69957335..b7ae06080ce 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/node_stats/data_xpack.go @@ -176,7 +176,7 @@ var ( } ) -func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { +func eventsMappingXPack(r mb.ReporterV2, m elasticsearch.MetricSetAPI, info elasticsearch.Info, content []byte) error { nodesStruct := struct { ClusterName string `json:"cluster_name"` Nodes map[string]map[string]interface{} `json:"nodes"` diff --git a/metricbeat/module/elasticsearch/testing.go b/metricbeat/module/elasticsearch/testing.go index a68685dd62d..b5d72e74315 100644 --- a/metricbeat/module/elasticsearch/testing.go +++ b/metricbeat/module/elasticsearch/testing.go @@ -76,3 +76,29 @@ func TestMapperWithInfo(t *testing.T, glob string, mapper func(mb.ReporterV2, In }) } } + +// TestMapperWithMetricSetAndInfo tests mapping methods with Info fields +func TestMapperWithMetricSetAndInfo(t *testing.T, glob string, ms MetricSetAPI, mapper func(mb.ReporterV2, MetricSetAPI, Info, []byte) error) { + files, err := filepath.Glob(glob) + require.NoError(t, err) + // Makes sure glob matches at least 1 file + require.True(t, len(files) > 0) + + info := Info{ + ClusterID: "1234", + ClusterName: "helloworld", + } + + for _, f := range files { + t.Run(f, func(t *testing.T) { + input, err := ioutil.ReadFile(f) + require.NoError(t, err) + + reporter := &mbtest.CapturingReporterV2{} + err = mapper(reporter, ms, info, input) + require.NoError(t, err) + require.True(t, len(reporter.GetEvents()) >= 1) + require.Equal(t, 0, len(reporter.GetErrors())) + }) + } +} From 80507a6994992b85355390b845050c955baf2ab9 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 10 Aug 2020 17:34:07 -0700 Subject: [PATCH 22/32] Fixing formatting --- metricbeat/module/elasticsearch/metricset.go | 3 +-- metricbeat/module/elasticsearch/node_stats/data_test.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/metricbeat/module/elasticsearch/metricset.go b/metricbeat/module/elasticsearch/metricset.go index 8df29590503..7e8afbf268a 100644 --- a/metricbeat/module/elasticsearch/metricset.go +++ b/metricbeat/module/elasticsearch/metricset.go @@ -66,7 +66,7 @@ func (h *Scope) Unpack(str string) error { return nil } -type MetricSetAPI interface{ +type MetricSetAPI interface { Module() mb.Module GetMasterNodeID() (string, error) IsMLockAllEnabled(string) (bool, error) @@ -192,4 +192,3 @@ func (m *MetricSet) IsMLockAllEnabled(nodeID string) (bool, error) { return false, fmt.Errorf("could not determine if mlockall is enabled on node ID = %v", nodeID) } - diff --git a/metricbeat/module/elasticsearch/node_stats/data_test.go b/metricbeat/module/elasticsearch/node_stats/data_test.go index 05b54ca87e4..a48e3106889 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_test.go +++ b/metricbeat/module/elasticsearch/node_stats/data_test.go @@ -45,7 +45,7 @@ func (m mockMetricSet) Module() mb.Module { return mockModule{} } -type mockModule struct {} +type mockModule struct{} func (m mockModule) Name() string { return "mock_module" @@ -60,4 +60,3 @@ func (m mockModule) Config() mb.ModuleConfig { func (m mockModule) UnpackConfig(to interface{}) error { return nil } - From 2bae1f4492228f70ec161b8c9b24e8ef279e73e2 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 11 Aug 2020 04:28:46 -0700 Subject: [PATCH 23/32] Making indices.bulk and thread_pool.write fields optional for BC --- metricbeat/module/elasticsearch/node_stats/data.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index bd924c56bc4..7976284a432 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -79,7 +79,7 @@ var ( "count": c.Int("total_operations"), }, }, - }), + }, c.DictOptional), "docs": c.Dict("docs", s.Schema{ "count": c.Int("count"), "deleted": c.Int("deleted"), @@ -293,7 +293,7 @@ var ( "thread_pool": c.Dict("thread_pool", s.Schema{ "bulk": c.Dict("bulk", threadPoolStatsSchema, c.DictOptional), "index": c.Dict("index", threadPoolStatsSchema, c.DictOptional), - "write": c.Dict("write", threadPoolStatsSchema), + "write": c.Dict("write", threadPoolStatsSchema, c.DictOptional), "generic": c.Dict("generic", threadPoolStatsSchema), "get": c.Dict("get", threadPoolStatsSchema), "management": c.Dict("management", threadPoolStatsSchema), From 6abc109ecb092ea983eb10715db985bed321de6d Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 11 Aug 2020 05:39:08 -0700 Subject: [PATCH 24/32] Deleting sample file from unsupported ES version --- .../node_stats/_meta/test/node_stats.243.json | 426 ------------------ 1 file changed, 426 deletions(-) delete mode 100644 metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json b/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json deleted file mode 100644 index f008e6de235..00000000000 --- a/metricbeat/module/elasticsearch/node_stats/_meta/test/node_stats.243.json +++ /dev/null @@ -1,426 +0,0 @@ -{ - "cluster_name" : "elasticsearch", - "nodes" : { - "test_node_id" : { - "timestamp" : 1491553881539, - "name" : "Projector", - "transport_address" : "127.0.0.1:9300", - "host" : "127.0.0.1", - "ip" : [ "127.0.0.1:9300", "NONE" ], - "indices" : { - "docs" : { - "count" : 0, - "deleted" : 0 - }, - "store" : { - "size_in_bytes" : 0, - "throttle_time_in_millis" : 0 - }, - "indexing" : { - "index_total" : 0, - "index_time_in_millis" : 0, - "index_current" : 0, - "index_failed" : 0, - "delete_total" : 0, - "delete_time_in_millis" : 0, - "delete_current" : 0, - "noop_update_total" : 0, - "is_throttled" : false, - "throttle_time_in_millis" : 0 - }, - "get" : { - "total" : 0, - "time_in_millis" : 0, - "exists_total" : 0, - "exists_time_in_millis" : 0, - "missing_total" : 0, - "missing_time_in_millis" : 0, - "current" : 0 - }, - "search" : { - "open_contexts" : 0, - "query_total" : 0, - "query_time_in_millis" : 0, - "query_current" : 0, - "fetch_total" : 0, - "fetch_time_in_millis" : 0, - "fetch_current" : 0, - "scroll_total" : 0, - "scroll_time_in_millis" : 0, - "scroll_current" : 0 - }, - "merges" : { - "current" : 0, - "current_docs" : 0, - "current_size_in_bytes" : 0, - "total" : 0, - "total_time_in_millis" : 0, - "total_docs" : 0, - "total_size_in_bytes" : 0, - "total_stopped_time_in_millis" : 0, - "total_throttled_time_in_millis" : 0, - "total_auto_throttle_in_bytes" : 0 - }, - "refresh" : { - "total" : 0, - "total_time_in_millis" : 0 - }, - "flush" : { - "total" : 0, - "total_time_in_millis" : 0 - }, - "warmer" : { - "current" : 0, - "total" : 0, - "total_time_in_millis" : 0 - }, - "query_cache" : { - "memory_size_in_bytes" : 0, - "total_count" : 0, - "hit_count" : 0, - "miss_count" : 0, - "cache_size" : 0, - "cache_count" : 0, - "evictions" : 0 - }, - "fielddata" : { - "memory_size_in_bytes" : 0, - "evictions" : 0 - }, - "percolate" : { - "total" : 0, - "time_in_millis" : 0, - "current" : 0, - "memory_size_in_bytes" : -1, - "memory_size" : "-1b", - "queries" : 0 - }, - "completion" : { - "size_in_bytes" : 0 - }, - "segments" : { - "count" : 0, - "memory_in_bytes" : 0, - "terms_memory_in_bytes" : 0, - "stored_fields_memory_in_bytes" : 0, - "term_vectors_memory_in_bytes" : 0, - "norms_memory_in_bytes" : 0, - "doc_values_memory_in_bytes" : 0, - "index_writer_memory_in_bytes" : 0, - "index_writer_max_memory_in_bytes" : 0, - "version_map_memory_in_bytes" : 0, - "fixed_bit_set_memory_in_bytes" : 0 - }, - "translog" : { - "operations" : 0, - "size_in_bytes" : 0 - }, - "suggest" : { - "total" : 0, - "time_in_millis" : 0, - "current" : 0 - }, - "request_cache" : { - "memory_size_in_bytes" : 0, - "evictions" : 0, - "hit_count" : 0, - "miss_count" : 0 - }, - "recovery" : { - "current_as_source" : 0, - "current_as_target" : 0, - "throttle_time_in_millis" : 0 - } - }, - "os" : { - "timestamp" : 1491553881554, - "cpu_percent" : 46, - "load_average" : 2.7578125, - "mem" : { - "total_in_bytes" : 17179869184, - "free_in_bytes" : 91217920, - "used_in_bytes" : 17088651264, - "free_percent" : 1, - "used_percent" : 99 - }, - "swap" : { - "total_in_bytes" : 2147483648, - "free_in_bytes" : 1660157952, - "used_in_bytes" : 487325696 - } - }, - "process" : { - "timestamp" : 1491553881554, - "open_file_descriptors" : 152, - "max_file_descriptors" : 10240, - "cpu" : { - "percent" : 13, - "total_in_millis" : 11733 - }, - "mem" : { - "total_virtual_in_bytes" : 5196320768 - } - }, - "jvm" : { - "timestamp" : 1491553881554, - "uptime_in_millis" : 14105, - "mem" : { - "heap_used_in_bytes" : 70949408, - "heap_used_percent" : 6, - "heap_committed_in_bytes" : 259522560, - "heap_max_in_bytes" : 1038876672, - "non_heap_used_in_bytes" : 45168576, - "non_heap_committed_in_bytes" : 46948352, - "pools" : { - "young" : { - "used_in_bytes" : 49528368, - "max_in_bytes" : 279183360, - "peak_used_in_bytes" : 71630848, - "peak_max_in_bytes" : 279183360 - }, - "survivor" : { - "used_in_bytes" : 8912896, - "max_in_bytes" : 34865152, - "peak_used_in_bytes" : 8912896, - "peak_max_in_bytes" : 34865152 - }, - "old" : { - "used_in_bytes" : 12508144, - "max_in_bytes" : 724828160, - "peak_used_in_bytes" : 12508144, - "peak_max_in_bytes" : 724828160 - } - } - }, - "threads" : { - "count" : 52, - "peak_count" : 52 - }, - "gc" : { - "collectors" : { - "young" : { - "collection_count" : 4, - "collection_time_in_millis" : 81 - }, - "old" : { - "collection_count" : 1, - "collection_time_in_millis" : 14 - } - } - }, - "buffer_pools" : { - "direct" : { - "count" : 30, - "used_in_bytes" : 3154146, - "total_capacity_in_bytes" : 3154146 - }, - "mapped" : { - "count" : 0, - "used_in_bytes" : 0, - "total_capacity_in_bytes" : 0 - } - }, - "classes" : { - "current_loaded_count" : 6631, - "total_loaded_count" : 6631, - "total_unloaded_count" : 0 - } - }, - "thread_pool" : { - "bulk" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "fetch_shard_started" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "fetch_shard_store" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "flush" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "force_merge" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "generic" : { - "threads" : 5, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 5, - "completed" : 32 - }, - "get" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "index" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "listener" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "management" : { - "threads" : 1, - "queue" : 0, - "active" : 1, - "rejected" : 0, - "largest" : 1, - "completed" : 1 - }, - "percolate" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "refresh" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "search" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "snapshot" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "suggest" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - }, - "warmer" : { - "threads" : 0, - "queue" : 0, - "active" : 0, - "rejected" : 0, - "largest" : 0, - "completed" : 0 - } - }, - "fs" : { - "timestamp" : 1491553881555, - "total" : { - "total_in_bytes" : 249779191808, - "free_in_bytes" : 18257371136, - "available_in_bytes" : 17995227136 - }, - "data" : [ { - "path" : "/Users/ruflin/Downloads/elasticsearch-2.4.3/data/elasticsearch/nodes/0", - "mount" : "/ (/dev/disk1)", - "type" : "hfs", - "total_in_bytes" : 249779191808, - "free_in_bytes" : 18257371136, - "available_in_bytes" : 17995227136 - } ] - }, - "transport" : { - "server_open" : 0, - "rx_count" : 6, - "rx_size_in_bytes" : 2472, - "tx_count" : 6, - "tx_size_in_bytes" : 2472 - }, - "http" : { - "current_open" : 1, - "total_opened" : 1 - }, - "breakers" : { - "request" : { - "limit_size_in_bytes" : 415550668, - "limit_size" : "396.2mb", - "estimated_size_in_bytes" : 0, - "estimated_size" : "0b", - "overhead" : 1.0, - "tripped" : 0 - }, - "fielddata" : { - "limit_size_in_bytes" : 623326003, - "limit_size" : "594.4mb", - "estimated_size_in_bytes" : 0, - "estimated_size" : "0b", - "overhead" : 1.03, - "tripped" : 0 - }, - "in_flight_requests" : { - "limit_size_in_bytes" : 1038876672, - "limit_size" : "990.7mb", - "estimated_size_in_bytes" : 0, - "estimated_size" : "0b", - "overhead" : 1.0, - "tripped" : 0 - }, - "parent" : { - "limit_size_in_bytes" : 727213670, - "limit_size" : "693.5mb", - "estimated_size_in_bytes" : 0, - "estimated_size" : "0b", - "overhead" : 1.0, - "tripped" : 0 - } - }, - "script" : { - "compilations" : 0, - "cache_evictions" : 0 - } - } - } -} From c26776203203f386ed1f490b5f98b8c57591c735 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 11 Aug 2020 10:30:33 -0700 Subject: [PATCH 25/32] Remove xpack.enabled code path!!! --- .../module/elasticsearch/elasticsearch.go | 1 - .../elasticsearch/node_stats/data_xpack.go | 239 ------------------ .../elasticsearch/node_stats/node_stats.go | 15 +- 3 files changed, 1 insertion(+), 254 deletions(-) delete mode 100644 metricbeat/module/elasticsearch/node_stats/data_xpack.go diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index 6b5bc46464d..e7a083e5ff6 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -54,7 +54,6 @@ func NewModule(base mb.BaseModule) (mb.Module, error) { "index_recovery", "index_summary", "ml_job", - "node_stats", "shard", } return elastic.NewModule(&base, xpackEnabledMetricSets, logp.NewLogger(ModuleName)) diff --git a/metricbeat/module/elasticsearch/node_stats/data_xpack.go b/metricbeat/module/elasticsearch/node_stats/data_xpack.go deleted file mode 100644 index b7ae06080ce..00000000000 --- a/metricbeat/module/elasticsearch/node_stats/data_xpack.go +++ /dev/null @@ -1,239 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package node_stats - -import ( - "encoding/json" - - "time" - - "github.com/joeshaw/multierror" - "github.com/pkg/errors" - - "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" -) - -var ( - schemaXpack = s.Schema{ - "name": c.Str("name"), - "transport_address": c.Str("transport_address"), - "indices": c.Dict("indices", s.Schema{ - "docs": c.Dict("docs", s.Schema{ - "count": c.Int("count"), - }), - "store": c.Dict("store", s.Schema{ - "size_in_bytes": c.Int("size_in_bytes"), - }), - "indexing": c.Dict("indexing", s.Schema{ - "index_total": c.Int("index_total"), - "index_time_in_millis": c.Int("index_time_in_millis"), - "throttle_time_in_millis": c.Int("throttle_time_in_millis"), - }), - "bulk": elasticsearch.BulkStatsDict, - "search": c.Dict("search", s.Schema{ - "query_total": c.Int("query_total"), - "query_time_in_millis": c.Int("query_time_in_millis"), - }), - "query_cache": c.Dict("query_cache", s.Schema{ - "memory_size_in_bytes": c.Int("memory_size_in_bytes"), - "hit_count": c.Int("hit_count"), - "miss_count": c.Int("miss_count"), - "evictions": c.Int("evictions"), - }), - "fielddata": c.Dict("fielddata", s.Schema{ - "memory_size_in_bytes": c.Int("memory_size_in_bytes"), - "evictions": c.Int("evictions"), - }), - "segments": c.Dict("segments", s.Schema{ - "count": c.Int("count"), - "memory_in_bytes": c.Int("memory_in_bytes"), - "terms_memory_in_bytes": c.Int("terms_memory_in_bytes"), - "stored_fields_memory_in_bytes": c.Int("stored_fields_memory_in_bytes"), - "term_vectors_memory_in_bytes": c.Int("term_vectors_memory_in_bytes"), - "norms_memory_in_bytes": c.Int("norms_memory_in_bytes"), - "points_memory_in_bytes": c.Int("points_memory_in_bytes"), - "doc_values_memory_in_bytes": c.Int("doc_values_memory_in_bytes"), - "index_writer_memory_in_bytes": c.Int("index_writer_memory_in_bytes"), - "version_map_memory_in_bytes": c.Int("version_map_memory_in_bytes"), - "fixed_bit_set_memory_in_bytes": c.Int("fixed_bit_set_memory_in_bytes"), - }), - "request_cache": c.Dict("request_cache", s.Schema{ - "memory_size_in_bytes": c.Int("memory_size_in_bytes"), - "evictions": c.Int("evictions"), - "hit_count": c.Int("hit_count"), - "miss_count": c.Int("miss_count"), - }), - }), - "os": c.Dict("os", s.Schema{ - "cpu": c.Dict("cpu", s.Schema{ - "load_average": c.Dict("load_average", s.Schema{ - "1m": c.Float("1m", s.Optional), - "5m": c.Float("5m", s.Optional), - "15m": c.Float("15m", s.Optional), - }, c.DictOptional), // No load average reported by ES on Windows - }), - "cgroup": c.Dict("cgroup", s.Schema{ - "cpuacct": c.Dict("cpuacct", s.Schema{ - "control_group": c.Str("control_group"), - "usage_nanos": c.Int("usage_nanos"), - }), - "cpu": c.Dict("cpu", s.Schema{ - "control_group": c.Str("control_group"), - "cfs_period_micros": c.Int("cfs_period_micros"), - "cfs_quota_micros": c.Int("cfs_quota_micros"), - "stat": c.Dict("stat", s.Schema{ - "number_of_elapsed_periods": c.Int("number_of_elapsed_periods"), - "number_of_times_throttled": c.Int("number_of_times_throttled"), - "time_throttled_nanos": c.Int("time_throttled_nanos"), - }), - }), - "memory": c.Dict("memory", s.Schema{ - "control_group": c.Str("control_group"), - // The two following values are currently string. See https://github.com/elastic/elasticsearch/pull/26166 - "limit_in_bytes": c.Str("limit_in_bytes"), - "usage_in_bytes": c.Str("usage_in_bytes"), - }), - }, c.DictOptional), - }), - "process": c.Dict("process", s.Schema{ - "open_file_descriptors": c.Int("open_file_descriptors"), - "max_file_descriptors": c.Int("max_file_descriptors"), - "cpu": c.Dict("cpu", s.Schema{ - "percent": c.Int("percent"), - }), - }), - "jvm": c.Dict("jvm", s.Schema{ - "mem": c.Dict("mem", s.Schema{ - "heap_used_in_bytes": c.Int("heap_used_in_bytes"), - "heap_used_percent": c.Int("heap_used_percent"), - "heap_max_in_bytes": c.Int("heap_max_in_bytes"), - }), - "gc": c.Dict("gc", s.Schema{ - "collectors": c.Dict("collectors", s.Schema{ - "young": c.Dict("young", s.Schema{ - "collection_count": c.Int("collection_count"), - "collection_time_in_millis": c.Int("collection_time_in_millis"), - }), - "old": c.Dict("young", s.Schema{ - "collection_count": c.Int("collection_count"), - "collection_time_in_millis": c.Int("collection_time_in_millis"), - }), - }), - }), - }), - "thread_pool": c.Dict("thread_pool", s.Schema{ - "bulk": c.Dict("bulk", xpackThreadPoolStatsSchema, c.DictOptional), - "index": c.Dict("index", xpackThreadPoolStatsSchema, c.DictOptional), - "write": c.Dict("write", xpackThreadPoolStatsSchema), - "generic": c.Dict("generic", xpackThreadPoolStatsSchema), - "get": c.Dict("get", xpackThreadPoolStatsSchema), - "management": c.Dict("management", xpackThreadPoolStatsSchema), - "search": c.Dict("search", xpackThreadPoolStatsSchema), - "watcher": c.Dict("watcher", xpackThreadPoolStatsSchema, c.DictOptional), - }), - "fs": c.Dict("fs", s.Schema{ - "total": c.Dict("total", s.Schema{ - "total_in_bytes": c.Int("total_in_bytes"), - "free_in_bytes": c.Int("free_in_bytes"), - "available_in_bytes": c.Int("available_in_bytes"), - }), - "io_stats": c.Dict("io_stats", s.Schema{ - "total": c.Dict("total", s.Schema{ - "operations": c.Int("operations"), - "read_kilobytes": c.Int("read_kilobytes"), - "read_operations": c.Int("read_operations"), - "write_kilobytes": c.Int("write_kilobytes"), - "write_operations": c.Int("write_operations"), - }, c.DictOptional), - }, c.DictOptional), - }), - } - - xpackThreadPoolStatsSchema = s.Schema{ - "threads": c.Int("threads"), - "queue": c.Int("queue"), - "rejected": c.Int("rejected"), - } -) - -func eventsMappingXPack(r mb.ReporterV2, m elasticsearch.MetricSetAPI, info elasticsearch.Info, content []byte) error { - nodesStruct := struct { - ClusterName string `json:"cluster_name"` - Nodes map[string]map[string]interface{} `json:"nodes"` - }{} - - err := json.Unmarshal(content, &nodesStruct) - if err != nil { - return errors.Wrap(err, "failure parsing Elasticsearch Node Stats API response") - } - - masterNodeID, err := m.GetMasterNodeID() - if err != nil { - return err - } - - var errs multierror.Errors - for nodeID, node := range nodesStruct.Nodes { - isMaster := nodeID == masterNodeID - - event := mb.Event{} - - nodeData, err := schemaXpack.Apply(node) - if err != nil { - errs = append(errs, errors.Wrap(err, "failure to apply node schema")) - continue - } - - nodeData["node_master"] = isMaster - nodeData["node_id"] = nodeID - - mlockall, err := m.IsMLockAllEnabled(nodeID) - if err != nil { - errs = append(errs, err) - continue - } - nodeData["mlockall"] = mlockall - - // Build source_node object - sourceNode := common.MapStr{ - "uuid": nodeID, - "name": nodeData["name"], - "transport_address": nodeData["transport_address"], - } - nodeData.Delete("name") - nodeData.Delete("transport_address") - - event.RootFields = common.MapStr{ - "timestamp": time.Now(), - "cluster_uuid": info.ClusterID, - "interval_ms": m.Module().Config().Period.Nanoseconds() / 1000 / 1000, - "type": "node_stats", - "node_stats": nodeData, - "source_node": sourceNode, - } - - event.Index = elastic.MakeXPackMonitoringIndexName(elastic.Elasticsearch) - r.Event(event) - } - return errs.Err() -} diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats.go b/metricbeat/module/elasticsearch/node_stats/node_stats.go index ebe11d8c933..2ab26ffe8ed 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats.go @@ -74,20 +74,7 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { return err } - if m.XPack && false { // ignoring xpack.enabled: true for POC - err = eventsMappingXPack(r, m, *info, content) - if err != nil { - // Since this is an x-pack code path, we log the error but don't - // return it. Otherwise it would get reported into `metricbeat-*` - // indices. - m.Logger().Error(err) - return nil - } - } else { - return eventsMapping(r, m.MetricSet, *info, content) - } - - return nil + return eventsMapping(r, m.MetricSet, *info, content) } func (m *MetricSet) updateServiceURI() error { From 312fedb36651a754478158f5bb327cec9f7002e9 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 12 Aug 2020 12:22:34 -0700 Subject: [PATCH 26/32] Updating xpack unit test --- metricbeat/module/elasticsearch/elasticsearch_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch_test.go b/metricbeat/module/elasticsearch/elasticsearch_test.go index 9b9682aef3b..f5b19f9b22d 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_test.go @@ -45,12 +45,12 @@ func TestXPackEnabledMetricsets(t *testing.T) { } metricSets := mbtest.NewReportingMetricSetV2Errors(t, config) - require.Len(t, metricSets, 9) + require.Len(t, metricSets, 8) for _, ms := range metricSets { name := ms.Name() switch name { case "ccr", "enrich", "cluster_stats", "index", "index_recovery", - "index_summary", "ml_job", "node_stats", "shard": + "index_summary", "ml_job", "shard": default: t.Errorf("unexpected metricset name = %v", name) } From a04ab7d45d48f20cec2f24a219a185a837f39ab7 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 12 Aug 2020 12:24:32 -0700 Subject: [PATCH 27/32] Updating python system tests for xpack --- metricbeat/module/elasticsearch/test_elasticsearch.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/metricbeat/module/elasticsearch/test_elasticsearch.py b/metricbeat/module/elasticsearch/test_elasticsearch.py index 2ccf3b0fddd..8a39857cf99 100644 --- a/metricbeat/module/elasticsearch/test_elasticsearch.py +++ b/metricbeat/module/elasticsearch/test_elasticsearch.py @@ -95,7 +95,6 @@ def test_xpack(self): "index_recovery", "index_summary", "ml_job", - "node_stats", "shard" ], "hosts": self.get_hosts(), @@ -128,7 +127,6 @@ def test_xpack_cluster_stats(self): "index_recovery", "index_summary", "ml_job", - "node_stats", "shard" ], "hosts": self.get_hosts(), From 47b1a0d3048ef1db556ff86dfb1b591239e4ee2b Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 13 Aug 2020 04:09:52 -0700 Subject: [PATCH 28/32] Remove top-level type field --- metricbeat/docs/fields.asciidoc | 9 --------- metricbeat/module/elasticsearch/_meta/fields.yml | 3 --- metricbeat/module/elasticsearch/fields.go | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index a559847474d..236b476e1ce 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -15772,15 +15772,6 @@ Elasticsearch module -*`type`*:: -+ --- -type: alias - -alias to: metricset.name - --- - *`timestamp`*:: + -- diff --git a/metricbeat/module/elasticsearch/_meta/fields.yml b/metricbeat/module/elasticsearch/_meta/fields.yml index 1702997f4da..1ae2a10ed7a 100644 --- a/metricbeat/module/elasticsearch/_meta/fields.yml +++ b/metricbeat/module/elasticsearch/_meta/fields.yml @@ -6,9 +6,6 @@ settings: ["ssl", "http"] short_config: false fields: - - name: type - type: alias - path: metricset.name - name: timestamp type: alias path: "@timestamp" diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 10dc9114ab1..b289382e5a7 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -32,5 +32,5 @@ func init() { // AssetElasticsearch returns asset data. // This is the base64 encoded gzipped contents of module/elasticsearch. func AssetElasticsearch() string { - return "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" + return "eJzsXd2P2zYSf89fQexTCyQC7nUfrgf02t4WSK64pgUOh4NKS2ObWUr0ktRmt3/9gdSHKZlfkqjEya0fgqxt/eY3w+Hwazh+g+7h+RYBxUKSQgDmxfEVQpJICrfo5gfz/ZtXCJUgCk5OkrD6Fv31FUIIjb6DKlY2FF4hxIECFnCLDvgVQgKkJPVB3KL/3AhBb16jm6OUp5v/qs+OjMu8YPWeHG7RHlOhnt8ToKW41SLeoBpXcIskqUBIXJ30uwjJ5xPcIkwJFt07JyyPt+jmb8M3b0YABW2EBJ43DSkDGCOTZN2DWfdYjydYwwvIa1bCCO7AWdOTNBUxnzU42Hm4uChpmfFsD6j+XQ44PD3AsRJyIbEUs1Xbiwse5mO2R0fNzCSmo09cKC4kEw0/YkLxjkJO6nz3LEFcfNVjFm2AbC8y0VQV5s/ZAJe5sOyGPxMibGTW9Rra7OVH9KGayOwEHKvObtMzzm69tplmmZ0Rs4I1tXTgumw4JcgBl3l6lgo2NdWPnEjYgKvGXUN28Mu6JAWs67qkLuGJ1Idkvq0BcxXOVfetCKVkQf/tVMt6etkZNqvm9GELNUfnW8hIN6mrBWNYySNnUlJIb7MR8jyzDQODau0SS5zMPyqoGH/OBflzTXzvdR34ZS3u4hj/0AB/zgtcHOFKVTUYrlWWw0MDQl61uiOOaxUe5slpNG2bIlV/7T45gy6PcB3Gugg35rMovp3tfqigTjhzchGJVq3lsypgl6zIHzFtQOSdy6/39oHYGXypz6NR+H6CMt8RmQuQG7Ad4acg3A6qeobEN+Brwqegm55hAlI149UWrqlxUxA8MVLLLRi2wCkoCsk4lHkbjjZgOsJPQVgCr/JHKCTjW/A14VPR3YpnEoKPwAVhdV7h0wY0DfQlZHuSHx6rVYu/Q5FwYKa0dY9t9jVo6V0gu7BD+BYVVLv4VuQo3N4fHqvsUGRnm2SMltkZ37viRxFbFA7awRlpKv7WCWos+Z74M2su9h3GGNfeqlqDL7pdLzRY1LLGdChZQDmCirz4aUXYVepWUGUKKqvw06oBQfNpBJSpCCmsRIxOwAtYsi66JHQqYpdFo2OH0clIzBmIH5Ot29QsTk0yP6QMlzl+BI4P060SP7AP3BTwl2mf6V+BtmMiK05N1vE7ZE6cUK8tbOxXzARODS48XrTGVo3AB8hrXLOFu/HKaJpA1tHMNGTm3N2P6YiX7pZG22Iv8oeGSZxXpOBJVM6Kvcg0ZtYsURmN1kjYf2qRYvium2oHPGf7HCg+dcGOsHLFKDg2iHovm2AnHcfPGugz7rzflXdNaJdpMMFOqoGefgzQ3u63nLzB3dkZQ8TH2zLb9ElWS85o7vPtaAN0S78YzNhOSUlFpG+KsoSgBnXOVebQawN4YnptCJ9Lb9iN4qwAcT0TjsWTuU4R3a3mT+PkUR/Nnxijq0yxa+h9Mls8NNDYZl0BSxi6ZIpPpnFWbfpz+ACFtAbtuWR6qMWnKgeYPvVZLXwAeTUGVlxW21efElyThTWhq7Fxy2a1ldOfya418/ng8yrs3H262tD6uOua7NwmQF2LmVs2s63ck5hm4tqta0nDdWdj9rmr1vzQe3j+yLipsxW7fY1TfTtcLSVzSrVs0iSQSUq3RNUm1s2hFXI1plWqkftrbytb05gAZOpwLrIBwur1jpWA7v5ulTNp/hSSxi1vCquwagqruB1jFHA9T9ydQPII2tj6Py2+/vs7OwHKintM7WnESyn0oAhqvKNQIlYPtL679MeCBx3DI/N7zoR40zs8hxMlhc7wRNPs4XGqff/y+RwFXDqaZ3GSpjPI2f0roH3/eocrQGzfMXZIOnvdUy7gIa+Zkwxl1kOiCCZv8ROpmgoJeGigLqDbiVHkhuTb3iE6tuKIJ3oPmTSMUvbxy2qCnnOgEbTSWWucDZrh3WB1ZWgtDH0k8khay/u5nbOkddaOhGkMSMvwLK7lBSX6pu/IUH6LSC2ZZj2YttVnz1nl9yM03U8TpC4gV2NWrpPXPTl/yzV7Typ4jUiNKvEaaYlj9ko82oMsjnChhJP+gbIdpnlxhOJeZ9xsQPwnLQOdZSCdFKe669j03klFeFPHF867QL4+eCuEi932FUO5yawR6JsDB6hfo2dQhnmNOJTf2gd5NezF52JGTCiE5kD0vCuLCoD+RE6P2wSd5j2TmBoxXiurfL/3CAcT68xnHZVzQGnB3wAlB7KjEE3KknKfipKCDvBwXzBBazzmroW7Yp/pFI5oIB18LkO274AhyOZXPZa4rbM8PXr1ODKxU6u9x0zm9jqpMCeeLId0tFpZz2F6F9db/Fl4a1zsrQZGjVAjLOOGyIuhC2pORjtis8esHzRCgiGr3ZwR5E/7CtRiitBocfaddoHe3e/QraQmHa1EKxkOFZOQ908km4IXDef2k5a1jvl9i2yuOBopJK5LUh86fQYLuPuO/55okgmvmxaCJygaCWU3cdRLeSExl83J3k79A3nbxNBdeNzcg+QRy67z9Kd5jAt0xI8Qp4RrTTa7/00B5ne8tJs+d4qPZ9cn7cXtkhWhmzXpYn3JikYnUyNzIenuS5pcCRTsG8bJ6bWSZtPUFwN04A3kBjqo7hmvsLxFroejVVEU+kW75qwU0Kge8nHXq9JZuSU2iA0Ti0q239q0Z/6VMTnYPbcbJB1Vi7nt8SrjULBHGOW7fIbA5dgVnx/n21lwr9RoC9+Up+DTBcqJUIVkF9tNMa2SF+1Sv+cNIDKZu9plC3mZg7pC53/12mpci5uZsiXmB5BZyrOP9xqyHZKdrdyKPTJhT3lYLVghI1yWHIRA3xSsoSXaAbr7ZXiTcf0lxcexrdKRTDt0myTHA7jdN3Rhm6Tt86uG9LdPJzZt+5iCU7RPRzJt+5gk7QeqbXTuytB83uDsWoS/zPWS0HuZ673M9YL858310Msq7aXnvvTcL7DnnhNasg9st2bcr+gWK7JFs53favLQAKoo+sB27tmgxI5Mw0VCf2a7FtIurcQSt3d6h9x3KHO1huOl9a7v0hXpLz14e3YGj5dubONE6kdMSZmXWEJSPu+PZi5Lq7DQORUIiDwCRxhVRAhSHxQhaL1ETZRx+7feMG3n0jWTaj59wlxAaVljXLh1VPqcR4HJ8/PduqudkM7NdGZch2pv1XGdBbfaEcJ+/v0tuqv3LO7kM6R1SPMIQj0pqwHQxaWq9qowqT33gbYOz/8AfEKKwSgiKx3CY5+pRPhG+MY6VPhpuQo1qz9/U7xj9ZsEzdHr8jlbZFAlvlUmN8iyDVJY9z04UthQ6lyu1mjWyLw+7emiijBaNvlImzqiYzQx8kemyFe16oEnIqQefft1xfWueK5onfClrRD6xVdgGY8SLhwXLQy10AhyrmKvKMnN6UCTBVVHwaYbbbxe1jROo0aoEHGEHhMob4XNGXAR5X4DaEb2j6MYLvrCXMFX6fZL08V6YTKNEqHasxFaTKDWOPU02m+icnyh1Qjlw4OKGWVn1ExNLHtO/dPEoqOqhyaWGVcPNLHQWaU9E8ueU6ZzA9GfWuaMMporJRs7QUPBtOi1TbBw+jbL3h5eLWY3CaGfqhdba5nMEmKrqTJt0hNjNNl69eff3/bHBgp30ZLVXvPU32wR64N/0vKS2uWiIHL243FdlMYNxko5vqJve7rWNybhE+D7K2H8C+D7WMr59Rha067irO2tcflpaf/Wbul5F8CuirSr+9y/FfBLr7sGxi+97tp6nWj4I3lk7rvnKzrerx32S9+7BsYvfe8a+p458R1VA081+f3p+/PPAdg7W8TU1yhKvtUs+CwBHYql8WDFxm0U0SHuLHaogJDR5Gdjq7fzoP9vu1v74j5dZvZlwnkY00PXfP1IKCDxLCRUHjExrdfuD3/SOBlo5z2HmBqyn45Q+HdrPxWrYffY/ju4KMlmkuuucxg9JMGUEvmrqyjGsuYpU/yvz86EnvVjsR7swQAJr89vVPY+9hcNvGdH1h81SMNv1i8HBM/L7FYMMw2xHckIF/2PYIwmmb5BJB/1GPqmwLkV+iP1MUXMLaG/UERsofsI+PEZ9PZuFFGnHkVkpI5Rw8XlUayhY8Y6c6kWKhufQPA0R9BenN0pJOYAw165Ha2K7ZYq7n5AHygapwd4qv56bTEGChbsDWD1OJfF1L9SRf0FJ78qVbfNlLkuXW3Vvb8SVT3/GYakrr7XCXQNo1xiYcat2dnPf9gA/9AjHya1QBh1HyD1gYlk7mMsSZcWwGXOuKvK7/xbQncaEl1CGpfCGSfSXstiyS0pC9zQI/VteaukFbfvM/Qj4wiecHWiSqFGvqnw6TRN/RzNvkidt459sbGz+DoWqXR27bgy/qD5pBTsbJfsKsxq51nlY5uVLpFHIhBpC35HlDGxVhpOcxdOM/FXUEl5QfG9Tq7GEmJkc6CswFIFFX1To05bLsQstt4VWcaiF9pV981e/S8AAP//Cti0jQ==" } From 61b1c81ffcccbac721b49237c58e54b6fdff5be5 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 13 Aug 2020 14:31:11 -0700 Subject: [PATCH 29/32] Removing data-xpack.json --- .../node_stats/_meta/data-xpack.json | 148 ------------------ 1 file changed, 148 deletions(-) delete mode 100644 metricbeat/module/elasticsearch/node_stats/_meta/data-xpack.json diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/data-xpack.json b/metricbeat/module/elasticsearch/node_stats/_meta/data-xpack.json deleted file mode 100644 index 2dbc5c5801b..00000000000 --- a/metricbeat/module/elasticsearch/node_stats/_meta/data-xpack.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "@timestamp": "2018-04-05T12:17:50.378Z", - "@metadata": { - "beat": "metricbeat", - "type": "doc", - "version": "7.0.0-alpha1" - }, - "cluster_uuid": "elasticsearch", - "interval_ms": 10000, - "type": "node_stats", - "source_node": { - "transport_address": "127.0.0.1:9300", - "ip": "127.0.0.1:9300", - "name": "0F564AX", - "uuid": "0F564AXWTwme40EvgjAyPg", - "host": "127.0.0.1" - }, - "node_stats": { - "node_id": "0F564AXWTwme40EvgjAyPg", - "mlockall": false, - "node_master": true - }, - "beat": { - "hostname": "ruflin", - "version": "7.0.0-alpha1", - "name": "ruflin" - }, - "indices": { - "fs": { - "total": { - "free_in_bytes": 20373749760, - "available_in_bytes": 20111605760, - "total_in_bytes": 249779191808 - } - }, - "indices": { - "indexing": { - "throttle_time_in_millis": 0, - "index_total": 147, - "index_time_in_millis": 3635 - }, - "search": { - "query_total": 16, - "query_time_in_millis": 261 - }, - "query_cache": { - "hit_count": 0, - "miss_count": 0, - "evictions": 0, - "memory_size_in_bytes": 0 - }, - "fielddata": { - "evictions": 0, - "memory_size_in_bytes": 0 - }, - "segments": { - "index_writer_memory_in_bytes": 0, - "memory_in_bytes": 51216, - "terms_memory_in_bytes": 39654, - "term_vectors_memory_in_bytes": 0, - "version_map_memory_in_bytes": 0, - "stored_fields_memory_in_bytes": 4072, - "points_memory_in_bytes": 406, - "fixed_bit_set_memory_in_bytes": 0, - "count": 13, - "doc_values_memory_in_bytes": 1900, - "norms_memory_in_bytes": 5184 - }, - "request_cache": { - "memory_size_in_bytes": 0, - "evictions": 0, - "hit_count": 0, - "miss_count": 3 - }, - "docs": { - "count": 139 - }, - "store": { - "size_in_bytes": 333573 - } - }, - "os": { - "cpu": {} - }, - "process": { - "max_file_descriptors": 10240, - "cpu": {}, - "open_file_descriptors": 190 - }, - "jvm": { - "mem": { - "heap_used_in_bytes": 225025520, - "heap_used_percent": 21, - "heap_max_in_bytes": 1038876672 - }, - "gc": { - "collectors": { - "young": { - "collection_time_in_millis": 1444, - "collection_count": 8 - }, - "old": { - "collection_count": 8, - "collection_time_in_millis": 1444 - } - } - } - }, - "thread_pool": { - "bulk": { - "threads": 4, - "queue": 0, - "rejected": 0 - }, - "generic": { - "queue": 0, - "rejected": 0, - "threads": 4 - }, - "get": { - "threads": 4, - "queue": 0, - "rejected": 0 - }, - "index": { - "threads": 2, - "queue": 0, - "rejected": 0 - }, - "management": { - "queue": 0, - "rejected": 0, - "threads": 4 - }, - "search": { - "threads": 7, - "queue": 0, - "rejected": 0 - } - } - }, - "metricset": { - "name": "node_stats", - "module": "elasticsearch", - "host": "localhost:9200", - "rtt": 5047 - } -} From d7066eb150b2259fc5fd0e2e12466008ea744a4b Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 13 Aug 2020 14:39:01 -0700 Subject: [PATCH 30/32] Updating data.json --- .../elasticsearch/node_stats/_meta/data.json | 253 +++++++++++++++--- 1 file changed, 216 insertions(+), 37 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/_meta/data.json b/metricbeat/module/elasticsearch/node_stats/_meta/data.json index cb33996adf0..9de1ea7ec42 100644 --- a/metricbeat/module/elasticsearch/node_stats/_meta/data.json +++ b/metricbeat/module/elasticsearch/node_stats/_meta/data.json @@ -1,45 +1,142 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", - "agent": { - "hostname": "host.example.com", - "name": "host.example.com" - }, "elasticsearch": { "cluster": { - "id": "3LbUkLkURz--FR-YO0wLNA", - "name": "es1" + "id": "w3oo88LcQ1i-7K4f-wrEgQ", + "name": "docker-cluster" }, "node": { - "id": "FMRmkE3HTU6xxxoFK-06Ww", - "name": "es1_1", + "id": "EjV2AqqvQNq5ZF5cVlaPDQ", + "master": true, + "mlockall": false, + "name": "foo", "stats": { "fs": { + "io_stats": {}, "summary": { "available": { - "bytes": 350828584960 + "bytes": 45897547776 }, "free": { - "bytes": 354770468864 + "bytes": 49114263552 }, "total": { - "bytes": 499963170816 + "bytes": 62725623808 } } }, "indices": { + "bulk": { + "avg_size": { + "bytes": 111 + }, + "avg_time": { + "ms": 0 + }, + "operations": { + "total": { + "count": 10 + } + }, + "total_size": { + "bytes": 2939 + }, + "total_time": { + "ms": 75 + } + }, "docs": { - "count": 30880, - "deleted": 124 + "count": 9207, + "deleted": 43 + }, + "fielddata": { + "memory": { + "bytes": 0 + } + }, + "indexing": { + "index_time": { + "ms": 21 + }, + "index_total": { + "count": 4 + }, + "throttle_time": { + "ms": 0 + } + }, + "query_cache": { + "memory": { + "bytes": 0 + } + }, + "request_cache": { + "memory": { + "bytes": 3736 + } + }, + "search": { + "query_time": { + "ms": 83 + }, + "query_total": { + "count": 18 + } }, "segments": { - "count": 39, + "count": 63, + "doc_values": { + "memory": { + "bytes": 117620 + } + }, + "fixed_bit_set": { + "memory": { + "bytes": 3912 + } + }, + "index_writer": { + "memory": { + "bytes": 0 + } + }, "memory": { - "bytes": 300797 + "bytes": 330956 + }, + "norms": { + "memory": { + "bytes": 2688 + } + }, + "points": { + "memory": { + "bytes": 0 + } + }, + "stored_fields": { + "memory": { + "bytes": 31000 + } + }, + "term_vectors": { + "memory": { + "bytes": 0 + } + }, + "terms": { + "memory": { + "bytes": 179648 + } + }, + "version_map": { + "memory": { + "bytes": 0 + } } }, "store": { "size": { - "bytes": 15205991 + "bytes": 18049725 } } }, @@ -48,76 +145,158 @@ "collectors": { "old": { "collection": { - "count": 3, - "ms": 219 + "count": 0, + "ms": 0 } }, "young": { "collection": { - "count": 505, - "ms": 2439 + "count": 10, + "ms": 290 } } } }, "mem": { + "heap": { + "max": { + "bytes": 1073741824 + }, + "used": { + "bytes": 177654272, + "pct": 16 + } + }, "pools": { "old": { "max": { - "bytes": 715849728 + "bytes": 1073741824 }, "peak": { - "bytes": 543519960 + "bytes": 40290816 }, "peak_max": { - "bytes": 715849728 + "bytes": 1073741824 }, "used": { - "bytes": 382281744 + "bytes": 40290816 } }, "survivor": { "max": { - "bytes": 35782656 + "bytes": 0 }, "peak": { - "bytes": 35782656 + "bytes": 53477376 }, "peak_max": { - "bytes": 35782656 + "bytes": 0 }, "used": { - "bytes": 6418816 + "bytes": 50331648 } }, "young": { "max": { - "bytes": 286326784 + "bytes": 0 }, "peak": { - "bytes": 286326784 + "bytes": 637534208 }, "peak_max": { - "bytes": 286326784 + "bytes": 0 }, "used": { - "bytes": 118870448 + "bytes": 87031808 } } } } + }, + "os": { + "cgroup": { + "cpu": { + "cfs": { + "quota": { + "us": -1 + } + }, + "stat": { + "elapsed_periods": { + "count": 0 + }, + "times_throttled": { + "count": 0 + } + } + }, + "cpuacct": { + "usage": { + "ns": 57724017512 + } + }, + "memory": { + "control_group": "/", + "limit": { + "bytes": "9223372036854771712" + }, + "usage": { + "bytes": "1508503552" + } + } + }, + "cpu": { + "load_avg": { + "1m": 2.06 + } + } + }, + "process": { + "cpu": { + "pct": 32 + } + }, + "thread_pool": { + "get": { + "queue": { + "count": 0 + }, + "rejected": { + "count": 0 + } + }, + "search": { + "queue": { + "count": 0 + }, + "rejected": { + "count": 0 + } + }, + "write": { + "queue": { + "count": 0 + }, + "rejected": { + "count": 0 + } + } } } } }, + "event": { + "dataset": "elasticsearch.node.stats", + "duration": 115000, + "module": "elasticsearch" + }, "metricset": { - "host": "127.0.0.1:9200", - "module": "elasticsearch", "name": "node_stats", - "namespace": "elasticsearch.node.stats", - "rtt": 115 + "period": 10000 }, "service": { - "name": "elasticsearch" + "address": "localhost:9200", + "name": "elasticsearch", + "type": "elasticsearch" } } \ No newline at end of file From 60e3074f41719a8348e0dbc61b4e54997bbcc0b3 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 13 Aug 2020 05:37:01 -0700 Subject: [PATCH 31/32] Not collecting unmapped fields --- .../module/elasticsearch/node_stats/data.go | 47 +------------------ 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index 7976284a432..b7fe9f35fad 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -85,9 +85,6 @@ var ( "deleted": c.Int("deleted"), }), "fielddata": c.Dict("fielddata", s.Schema{ - "evictions": s.Object{ - "count": c.Int("evictions"), - }, "memory": s.Object{ "bytes": c.Int("memory_size_in_bytes"), }, @@ -104,29 +101,11 @@ var ( }, }), "query_cache": c.Dict("query_cache", s.Schema{ - "evictions": s.Object{ - "count": c.Int("evictions"), - }, - "hits": s.Object{ - "count": c.Int("hit_count"), - }, - "misses": s.Object{ - "count": c.Int("miss_count"), - }, "memory": s.Object{ "bytes": c.Int("memory_size_in_bytes"), }, }), "request_cache": c.Dict("request_cache", s.Schema{ - "evictions": s.Object{ - "count": c.Int("evictions"), - }, - "hits": s.Object{ - "count": c.Int("hit_count"), - }, - "misses": s.Object{ - "count": c.Int("miss_count"), - }, "memory": s.Object{ "bytes": c.Int("memory_size_in_bytes"), }, @@ -231,24 +210,17 @@ var ( "os": c.Dict("os", s.Schema{ "cpu": c.Dict("cpu", s.Schema{ "load_avg": c.Dict("load_average", s.Schema{ - "1m": c.Float("1m", s.Optional), - "5m": c.Float("5m", s.Optional), - "15m": c.Float("15m", s.Optional), + "1m": c.Float("1m", s.Optional), }, c.DictOptional), // No load average reported by ES on Windows }), "cgroup": c.Dict("cgroup", s.Schema{ "cpuacct": c.Dict("cpuacct", s.Schema{ - "control_group": c.Str("control_group"), "usage": s.Object{ "ns": c.Int("usage_nanos"), }, }), "cpu": c.Dict("cpu", s.Schema{ - "control_group": c.Str("control_group"), "cfs": s.Object{ - "period": s.Object{ - "us": c.Int("cfs_period_micros"), - }, "quota": s.Object{ "us": c.Int("cfs_quota_micros"), }, @@ -260,9 +232,6 @@ var ( "times_throttled": s.Object{ "count": c.Int("number_of_times_throttled"), }, - "time_throtted": s.Object{ - "ns": c.Int("time_throttled_nanos"), - }, }), }), "memory": c.Dict("memory", s.Schema{ @@ -281,24 +250,13 @@ var ( "cpu": c.Dict("cpu", s.Schema{ "pct": c.Int("percent"), }), - "file_descriptors": s.Object{ - "max": s.Object{ - "count": c.Int("max_file_descriptors"), - }, - "open": s.Object{ - "count": c.Int("open_file_descriptors"), - }, - }, }), "thread_pool": c.Dict("thread_pool", s.Schema{ "bulk": c.Dict("bulk", threadPoolStatsSchema, c.DictOptional), "index": c.Dict("index", threadPoolStatsSchema, c.DictOptional), "write": c.Dict("write", threadPoolStatsSchema, c.DictOptional), - "generic": c.Dict("generic", threadPoolStatsSchema), "get": c.Dict("get", threadPoolStatsSchema), - "management": c.Dict("management", threadPoolStatsSchema), "search": c.Dict("search", threadPoolStatsSchema), - "watcher": c.Dict("watcher", threadPoolStatsSchema, c.DictOptional), }), } @@ -325,9 +283,6 @@ var ( } threadPoolStatsSchema = s.Schema{ - "threads": s.Object{ - "count": c.Int("threads"), - }, "queue": s.Object{ "count": c.Int("queue"), }, From cc08c76064431de829083ac3fee0fcfd70325f0f Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 13 Aug 2020 16:04:29 -0700 Subject: [PATCH 32/32] Fixing formatting --- metricbeat/module/elasticsearch/node_stats/data.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index b7fe9f35fad..41fd381a67b 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -252,11 +252,11 @@ var ( }), }), "thread_pool": c.Dict("thread_pool", s.Schema{ - "bulk": c.Dict("bulk", threadPoolStatsSchema, c.DictOptional), - "index": c.Dict("index", threadPoolStatsSchema, c.DictOptional), - "write": c.Dict("write", threadPoolStatsSchema, c.DictOptional), - "get": c.Dict("get", threadPoolStatsSchema), - "search": c.Dict("search", threadPoolStatsSchema), + "bulk": c.Dict("bulk", threadPoolStatsSchema, c.DictOptional), + "index": c.Dict("index", threadPoolStatsSchema, c.DictOptional), + "write": c.Dict("write", threadPoolStatsSchema, c.DictOptional), + "get": c.Dict("get", threadPoolStatsSchema), + "search": c.Dict("search", threadPoolStatsSchema), }), }