From 733b1595bb421606d1032f674e06e1e2673029d5 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 19 Nov 2019 17:14:23 -0800 Subject: [PATCH 1/2] Fix license ID field name (#14592) * Fix license ID field name * Adding CHANGELOG entry --- CHANGELOG.next.asciidoc | 5 +++++ metricbeat/module/elasticsearch/elasticsearch.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 780f01c76f4..bb256d4a688 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -50,6 +50,11 @@ https://github.com/elastic/beats/compare/v6.8.0...6.8.1[Check the HEAD diff] *Metricbeat* - 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] +- 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* diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index 6f7aff1c9a8..735aa1bbe71 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -483,7 +483,7 @@ func (l *License) IsOneOf(candidateLicenses ...string) bool { func (l *License) ToMapStr() common.MapStr { return 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 ed8710b437606e8e2915efbb1bef0764fc4c350c Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 5 Dec 2019 10:48:33 -0800 Subject: [PATCH 2/2] Fixing CHANGELOG --- CHANGELOG.next.asciidoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index bb256d4a688..ef78a3ff84c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -50,10 +50,6 @@ https://github.com/elastic/beats/compare/v6.8.0...6.8.1[Check the HEAD diff] *Metricbeat* - 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] -- 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*