logstash-core 6.4.2-java → 6.4.3-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a950c2ba81f4f59944d4c45811741de0b4b1fff78fd9b8e75e30c8070b1f1e5e
4
- data.tar.gz: 662ea370b3242107f58d72c3596d55619a96b067495c7e2f3637d307a58c6831
3
+ metadata.gz: '0535700835dd16374433f064d770af9b96e7f226fce537eb5ea81fc802cf56de'
4
+ data.tar.gz: aaa23c13f0cf82109a1e05a527e28505c387558f7730d1e054ad2a48cfcae898
5
5
  SHA512:
6
- metadata.gz: d05a2b20dc5119d616711c52d82c7db3f2cbe5f19134b3345d87b191d889d424f2e098f0873dbf0e7853791041e6b4ab7bd142ebbcfa3b9738725692061cdf40
7
- data.tar.gz: 27c4c12c68a038b4e0e1db38b003f8def9d746c05c0fb228f63e33e1da6f25506a1933e65c7df4b6dd6d9660448032b7ff937715ad2ea756836395af07acb265
6
+ metadata.gz: cc82b0baeecec5bfaad991e94b7c72203a6b4cbebe5cdfa6c954fb7551b7814eb08b5fd3c8d6b6aa92ab5afa40fbeab351f027d33a4193f5a018e84128ed4d9e
7
+ data.tar.gz: 532c63a9bc508a8bdec9f2e50203e1c13938204529b5c167a51018f06219652c1a3edf78322dba1e46e6b2f20b500f8098cbb3dea8f07834ef36c575f290b3fb
@@ -11,46 +11,43 @@ describe LogStash::Instrument::PeriodicPoller::Os do
11
11
  let(:snapshot_store) { metric.collector.snapshot_metric.metric_store }
12
12
  let(:os_metrics) { snapshot_store.get_shallow(:os) }
13
13
 
14
- let(:cpuacct_control_group) { "/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61" }
14
+ let(:relative_path) { "/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61" }
15
+ let(:proc_self_cgroup_content) do
16
+ %W(14:name=systemd,holaunlimited:#{relative_path}
17
+ 13:pids:#{relative_path}
18
+ 12:hugetlb:#{relative_path}
19
+ 11:net_prio:#{relative_path}
20
+ 10:perf_event:#{relative_path}
21
+ 9:net_cls:#{relative_path}
22
+ 8:freezer:#{relative_path}
23
+ 7:devices:#{relative_path}
24
+ 6:memory:#{relative_path}
25
+ 5:blkio:#{relative_path}
26
+ 4:cpuacct:#{relative_path}
27
+ 3:cpu:#{relative_path}
28
+ 2:cpuset:#{relative_path}
29
+ 1:name=openrc:/docker
30
+ 0::/docker)
31
+ end
32
+
15
33
  let(:cpuacct_usage) { 1982 }
16
- let(:cpu_control_group) { "/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61" }
17
34
  let(:cpu_period_micros) { 500 }
18
35
  let(:cpu_quota_micros) { 98 }
19
36
  let(:cpu_stats_number_of_periods) { 1 }
20
37
  let(:cpu_stats_number_of_time_throttled) { 2 }
21
38
  let(:cpu_stats_time_throttled_nanos) { 3 }
22
- let(:proc_self_cgroup_content) {
23
- %W(14:name=systemd,holaunlimited:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
24
- 13:pids:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
25
- 12:hugetlb:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
26
- 11:net_prio:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
27
- 10:perf_event:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
28
- 9:net_cls:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
29
- 8:freezer:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
30
- 7:devices:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
31
- 6:memory:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
32
- 5:blkio:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
33
- 4:cpuacct:#{cpuacct_control_group}
34
- 3:cpu:#{cpu_control_group}
35
- 2:cpuset:/docker/a10687343f90e97bbb1f7181bd065a42de96c40c4aa91764a9d526ea30475f61
36
- 1:name=openrc:/docker) }
37
- let(:cpu_stat_file_content) {
38
- [
39
- "nr_periods #{cpu_stats_number_of_periods}",
40
- "nr_throttled #{cpu_stats_number_of_time_throttled}",
41
- "throttled_time #{cpu_stats_time_throttled_nanos}"
42
- ]
43
- }
44
-
45
- before do
46
- allow(LogStash::Instrument::PeriodicPoller::Cgroup).to receive(:are_cgroup_available?).and_return(true)
47
39
 
48
- allow(LogStash::Instrument::PeriodicPoller::Cgroup).to receive(:read_proc_self_cgroup_lines).and_return(proc_self_cgroup_content)
49
- allow(LogStash::Instrument::PeriodicPoller::Cgroup).to receive(:read_sys_fs_cgroup_cpuacct_cpu_stat).and_return(cpu_stat_file_content)
40
+ let(:cpu_stat_file_content) do
41
+ ["nr_periods #{cpu_stats_number_of_periods}", "nr_throttled #{cpu_stats_number_of_time_throttled}", "throttled_time #{cpu_stats_time_throttled_nanos}"]
42
+ end
50
43
 
51
- allow(LogStash::Instrument::PeriodicPoller::Cgroup).to receive(:cgroup_cpuacct_usage_nanos).with(cpuacct_control_group).and_return(cpuacct_usage)
52
- allow(LogStash::Instrument::PeriodicPoller::Cgroup).to receive(:cgroup_cpu_fs_period_micros).with(cpu_control_group).and_return(cpu_period_micros)
53
- allow(LogStash::Instrument::PeriodicPoller::Cgroup).to receive(:cgroup_cpu_fs_quota_micros).with(cpu_control_group).and_return(cpu_quota_micros)
44
+ before do
45
+ allow(::File).to receive(:exist?).and_return(true)
46
+ allow(IO).to receive(:readlines).with("/sys/fs/cgroup/cpuacct#{relative_path}/cpuacct.usage").and_return([cpuacct_usage])
47
+ allow(IO).to receive(:readlines).with("/sys/fs/cgroup/cpu#{relative_path}/cpu.cfs_period_us").and_return([cpu_period_micros])
48
+ allow(IO).to receive(:readlines).with("/sys/fs/cgroup/cpu#{relative_path}/cpu.cfs_quota_us").and_return([cpu_quota_micros])
49
+ allow(IO).to receive(:readlines).with("/sys/fs/cgroup/cpu#{relative_path}/cpu.stat").and_return(cpu_stat_file_content)
50
+ allow(IO).to receive(:readlines).with("/proc/self/cgroup").and_return(proc_self_cgroup_content)
54
51
 
55
52
  subject.collect
56
53
  end
@@ -1,6 +1,6 @@
1
1
  ---
2
- logstash: 6.4.2
3
- logstash-core: 6.4.2
2
+ logstash: 6.4.3
3
+ logstash-core: 6.4.3
4
4
  logstash-core-plugin-api: 2.1.16
5
5
 
6
6
  # jruby must reference a *released* version of jruby which can be downloaded from the official download url
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.4.2
4
+ version: 6.4.3
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-09-26 00:00:00.000000000 Z
11
+ date: 2018-10-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement