github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-23 22:27:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Renamed cgroups metric to number_of_elapsed_periods

Browse source 
Renamed number_of_periods to number_of_elapsed_periods to be consistent with ES.

Fixes #6536
This commit is contained in:
Suyog Rao 2017-01-13 16:55:33 -08:00
parent 9cbb074468
commit df2ff69a0e
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,10 +65,10 @@ module LogStash module Instrument module PeriodicPoller
end
class CpuStats
attr_reader :number_of_periods, :number_of_times_throttled, :time_throttled_nanos
attr_reader :number_of_elapsed_periods, :number_of_times_throttled, :time_throttled_nanos
def initialize(number_of_periods, number_of_times_throttled, time_throttled_nanos)
@number_of_periods = number_of_periods
def initialize(number_of_elapsed_periods, number_of_times_throttled, time_throttled_nanos)
@number_of_elapsed_periods = number_of_elapsed_periods
@number_of_times_throttled = number_of_times_throttled
@time_throttled_nanos = time_throttled_nanos
end
@ -81,20 +81,20 @@ module LogStash module Instrument module PeriodicPoller
def cgroup_cpuacct_cpu_stat(control_group)
lines = read_sys_fs_cgroup_cpuacct_cpu_stat(control_group);
number_of_periods = -1;
number_of_elapsed_periods = -1;
number_of_times_throttled = -1;
time_throttled_nanos = -1;
lines.each do |line|
fields = line.split(/\s+/)
case fields.first
when "nr_periods" then number_of_periods = fields[1].to_i
when "nr_periods" then number_of_elapsed_periods = fields[1].to_i
when "nr_throttled" then number_of_times_throttled= fields[1].to_i
when "throttled_time" then time_throttled_nanos = fields[1].to_i
end
end
CpuStats.new(number_of_periods, number_of_times_throttled, time_throttled_nanos)
CpuStats.new(number_of_elapsed_periods, number_of_times_throttled, time_throttled_nanos)
end
def get_all
@ -118,7 +118,7 @@ module LogStash module Instrument module PeriodicPoller
cpu_stats = cgroup_cpuacct_cpu_stat(cpu_group)
cgroups_stats[:cpu][:stat] = {
:number_of_periods => cpu_stats.number_of_periods,
:number_of_elapsed_periods => cpu_stats.number_of_elapsed_periods,
:number_of_times_throttled => cpu_stats.number_of_times_throttled,
:time_throttled_nanos => cpu_stats.time_throttled_nanos
}

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

@ -126,7 +126,7 @@ describe LogStash::Instrument::PeriodicPoller::Cgroup do
:cfs_period_micros => cfs_period_micros,
:cfs_quota_micros => cfs_quota_micros,
:stat => {
:number_of_periods => cpu_stats_number_of_periods,
:number_of_elapsed_periods => cpu_stats_number_of_periods,
:number_of_times_throttled => cpu_stats_number_of_time_throttled,
:time_throttled_nanos => cpu_stats_time_throttled_nanos
}

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

@ -72,7 +72,7 @@ describe LogStash::Instrument::PeriodicPoller::Os do
[:cgroup, :cpuacct, :usage_nanos],
[:cgroup, :cpu, :cfs_period_micros],
[:cgroup, :cpu, :cfs_quota_micros],
[:cgroup, :cpu, :stat, :number_of_periods],
[:cgroup, :cpu, :stat, :number_of_elapsed_periods],
[:cgroup, :cpu, :stat, :number_of_times_throttled],
[:cgroup, :cpu, :stat, :time_throttled_nanos]
].each do |path|