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

Make system process metricset honor cpu_ticks config option #3776

Merged
merged 1 commit into from
Mar 21, 2017

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Mar 20, 2017

When cpu_ticks is true in the config file, the system process metricset will report the number of "ticks" (actually jiffies on linux) used in user space (system.process.cpu.user), system (system.process.cpu.system), and total (system.process.cpu.total.ticks).

Fixes #3590

When `cpu_ticks` is true in the config file, the system process metricset will report the number of “ticks” (actually jiffies on linux) used in user space (`system.process.cpu.user`), system (`system.process.cpu.system`), and total (`system.process.cpu.total.ticks`).

Fixes elastic#3590
},
"start_time": unixTimeMsToTime(process.Cpu.StartTime),
}
proc.Put("cpu.user", process.Cpu.User)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, that also cleans up the code. It bugs me that we only use .ticks for the total but that would be a BC break.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I felt the same way, but didn't want to break BC.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets keep it in mind to "potentially" break for 6.0 ;-)

@ruflin ruflin added the needs_backport PR is waiting to be backported to other branches. label Mar 20, 2017
@ruflin
Copy link
Contributor

ruflin commented Mar 20, 2017

@andrewkroh I added needs backport label as I think we should backport it to at least 5.3.

@ruflin ruflin merged commit 92fa6c4 into elastic:master Mar 21, 2017
monicasarbu pushed a commit to monicasarbu/beats that referenced this pull request Mar 29, 2017
…3776)

When `cpu_ticks` is true in the config file, the system process metricset will report the number of “ticks” (actually jiffies on linux) used in user space (`system.process.cpu.user`), system (`system.process.cpu.system`), and total (`system.process.cpu.total.ticks`).

Fixes elastic#3590
(cherry picked from commit 92fa6c4)
@andrewkroh andrewkroh deleted the bugfix/process-cpu-ticks branch March 31, 2017 05:24
@tsg tsg added v5.4.0 and removed needs_backport PR is waiting to be backported to other branches. labels Apr 12, 2017
tsg pushed a commit to tsg/beats that referenced this pull request Apr 12, 2017
…3776)

When `cpu_ticks` is true in the config file, the system process metricset will report the number of “ticks” (actually jiffies on linux) used in user space (`system.process.cpu.user`), system (`system.process.cpu.system`), and total (`system.process.cpu.total.ticks`).

Fixes elastic#3590
(cherry picked from commit 92fa6c4)
ruflin pushed a commit that referenced this pull request Apr 12, 2017
…4005)

When `cpu_ticks` is true in the config file, the system process metricset will report the number of “ticks” (actually jiffies on linux) used in user space (`system.process.cpu.user`), system (`system.process.cpu.system`), and total (`system.process.cpu.total.ticks`).

Fixes #3590
(cherry picked from commit 92fa6c4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants