Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #7230 to 6.3: Fix system process CPU ticks field mapping #7245

Merged
merged 2 commits into from
Jun 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ https://github.com/elastic/beats/compare/v6.3.0...6.3[Check the HEAD diff]

*Metricbeat*

- Fix field mapping for the system process CPU ticks fields. {pull}7230[7230]

*Packetbeat*

*Winlogbeat*
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -13594,7 +13594,7 @@ The environment variables used to start the process. The data is available on Fr
CPU-specific statistics per process.


*`system.process.cpu.user`*::
*`system.process.cpu.user.ticks`*::
+
--
type: long
Expand Down Expand Up @@ -13638,7 +13638,7 @@ The percentage of CPU time spent by the process since the last event. This value

--

*`system.process.cpu.system`*::
*`system.process.cpu.system.ticks`*::
+
--
type: long
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/system/process/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
prefix: "[float]"
description: CPU-specific statistics per process.
fields:
- name: user
- name: user.ticks
type: long
description: >
The amount of CPU time the process spent in user space.
Expand All @@ -73,7 +73,7 @@
The percentage of CPU time spent by the process since the last event.
This value is normalized by the number of CPU cores and it ranges
from 0 to 100%.
- name: system
- name: system.ticks
type: long
description: >
The amount of CPU time the process spent in kernel space.
Expand Down
3 changes: 2 additions & 1 deletion metricbeat/tests/system/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@ def test_process(self):
"metricsets": ["process"],
"period": "5s",
"extras": {
"process.env.whitelist": ["PATH"]
"process.env.whitelist": ["PATH"],
"process.include_cpu_ticks": True,
}
}])
proc = self.start_beat()
Expand Down