Skip to content

Commit

Permalink
[7.5] Fix license ID field name (#14592) (#14635)
Browse files Browse the repository at this point in the history
* Fix license ID field name (#14592)

* Fix license ID field name

* Adding CHANGELOG entry

* Fixing up CHANGELOG
  • Loading branch information
ycombinator committed Nov 20, 2019
1 parent d277fc3 commit 64b2679
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix cloudwatch metricset with names and dimensions in config. {issue}14376[14376] {pull}14391[14391]
- Fix marshaling of ms-since-epoch values in `elasticsearch/cluster_stats` metricset. {pull}14378[14378]
- 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 ID in the correct field. {pull}14592[14592]

*Packetbeat*

Expand Down
3 changes: 1 addition & 2 deletions metricbeat/module/elasticsearch/elasticsearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 64b2679

Please sign in to comment.