diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 4a71215602f8..50bb65ebf0ab 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -253,7 +253,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix marshaling of ms-since-epoch values in `elasticsearch/cluster_stats` metricset. {pull}14378[14378] - Fix checking tagsFilter using length in cloudwatch metricset. {pull}14525[14525] - 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* diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index 30ee0ce0a9e2..f44de547e92e 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,