From 2fe6888be6e4e8053ca07a3a041ed86374a86f28 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 18 Nov 2019 11:16:57 -0800 Subject: [PATCH 1/2] Fix license ID field name --- metricbeat/module/elasticsearch/elasticsearch.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index 30ee0ce0a9e..f44de547e92 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -485,10 +485,9 @@ func (l *License) IsOneOf(candidateLicenses ...string) bool { // particular it ensures that ms-since-epoch values are marshaled as longs // and not floats in scientific notation as Elasticsearch does not like that. func (l *License) ToMapStr() common.MapStr { - m := common.MapStr{ "status": l.Status, - "id": l.ID, + "uid": l.ID, "type": l.Type, "issue_date": l.IssueDate, "issue_date_in_millis": l.IssueDateInMillis, From 793570189ccb118278317dc76cfaf297487f3788 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 18 Nov 2019 15:46:32 -0800 Subject: [PATCH 2/2] Adding CHANGELOG entry --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index cc38c362513..c0684bf57ae 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -258,6 +258,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Log bulk failures from bulk API requests to monitoring cluster. {issue}14303[14303] {pull}14356[14356] - Fixed bug with `elasticsearch/cluster_stats` metricset not recording license expiration date correctly. {issue}14541[14541] {pull}14591[14591] - Vshpere module splits `virtualmachine.host` into `virtualmachine.host.id` and `virtualmachine.host.hostname`. {issue}7187[7187] {pull}7213[7213] +- Fixed bug with `elasticsearch/cluster_stats` metricset not recording license ID in the correct field. {pull}14592[14592] *Packetbeat*