Skip to content

Commit

Permalink
[8.3](backport #32197) [Stack Monitoring] Switch cgroup memory fields…
Browse files Browse the repository at this point in the history
… to keyword (#32295)

* [Stack Monitoring] Switch cgroup memory fields to keyword (#32197)

* [Stack Monitoring] Switch cgroup memory fields to keyword

Per https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html they should be strings. data.go appears to also consider them strings, so just updating the field definitions might be enough.

* make update

* Update changelog

(cherry picked from commit 1f2895e)

# Conflicts:
#	metricbeat/module/elasticsearch/fields.go

* make update

* Remove unrelated changelog entries

* Put trailing lines back

Co-authored-by: Mat Schaffer <mat@elastic.co>
  • Loading branch information
mergify[bot] and matschaffer authored Jul 13, 2022
1 parent 6259881 commit 6f05426
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]

*Metricbeat*

- update elasticsearch node_stats metricset to use keyword for cgroup memory instead of long {pull}32197[32197]

*Packetbeat*

Expand Down
8 changes: 2 additions & 6 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -32367,18 +32367,14 @@ type: keyword
*`elasticsearch.node.stats.os.cgroup.memory.limit.bytes`*::
+
--
type: long

format: bytes
type: keyword

--

*`elasticsearch.node.stats.os.cgroup.memory.usage.bytes`*::
+
--
type: long

format: bytes
type: keyword

--

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,9 @@
- name: control_group
type: keyword
- name: limit.bytes
type: long
format: bytes
type: keyword
- name: usage.bytes
type: long
format: bytes
type: keyword
- name: process.cpu.pct
type: double
format: percent
Expand Down

0 comments on commit 6f05426

Please sign in to comment.