github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename cgroup usage to usage_nanos to align with ES' api

Browse source 
Fixes #6428
This commit is contained in:
Pier-Hugues Pellerin 2016-12-16 10:01:01 -05:00
parent 241db0472b
commit f0ab5fd955
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/lib/logstash/instrument/periodic_poller/cgroup.rb
View file

@ -108,7 +108,7 @@ module LogStash module Instrument module PeriodicPoller
cpuacct_group = groups[GROUP_CPUACCT]
cgroups_stats[:cpuacct][:control_group] = cpuacct_group
cgroups_stats[:cpuacct][:usage] = cgroup_cpuacct_usage_nanos(cpuacct_group)
cgroups_stats[:cpuacct][:usage_nanos] = cgroup_cpuacct_usage_nanos(cpuacct_group)
cpu_group = groups[GROUP_CPU]
cgroups_stats[:cpu][:control_group] = cpu_group

2
logstash-core/spec/logstash/instrument/periodic_poller/cgroup_spec.rb
View file

@ -119,7 +119,7 @@ describe LogStash::Instrument::PeriodicPoller::Cgroup do
expect(subject.get_all).to match(
:cpuacct => {
:control_group => cpuacct_control_group,
:usage => cpuacct_usage,
:usage_nanos => cpuacct_usage,
},
:cpu => {
:control_group => cpu_control_group,

2
logstash-core/spec/logstash/instrument/periodic_poller/os_spec.rb
View file

@ -69,7 +69,7 @@ describe LogStash::Instrument::PeriodicPoller::Os do
end
[
[:cgroup, :cpuacct, :usage],
[:cgroup, :cpuacct, :usage_nanos],
[:cgroup, :cpu, :cfs_period_micros],
[:cgroup, :cpu, :cfs_quota_micros],
[:cgroup, :cpu, :stat, :number_of_periods],