sensu-plugins-process-checks 2.7.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 876caee1acc9312011319211530a65c0277ba8827397e5b0efb1855417e95f64
-  data.tar.gz: 7d353e6e88a47b7d9edb50586f08e4569a2b4ebe578df3a91ececdf5c9cb01fb
+  metadata.gz: e5b5afd51c3a410249cf094508d91b7c7c4b78efc436b82fc9997f52922b3928
+  data.tar.gz: 0537e6f072b295a549c73621177eca769c95b69c04dfb520003639575364c4b2
 SHA512:
-  metadata.gz: e9cb951943643d96a22cd791b742db5dc7c5b1540a966373597149fabd365e5ae3e4fdbcf4a36844def13ce0a6c85106afef2bab9fb302eaba226b717e00743a
-  data.tar.gz: 8a07af4a8bc3eacb1b8ed6829a08db70cdc392cdc8e25bdf7bcbcf4460d6971ab451fdb048f40ef0cbe8b9308872930822ebb339a19fd9979f3d9ff9ea2691df
+  metadata.gz: f1574fa7c4e7a744dd594e7c47041305c73a0663158556f59c898aa4b2eb0afcb2a8a0e9b9000b9c4e4fb7717c4fc92d5cee7d566f2adcfb6555526cd709d35c
+  data.tar.gz: ce3d9ecd31545e84f8ad8ca7e891df4d5983833ed4e4ea7f8f1bb1c014a940d041dad3109d9fa9c46cfbf83b69bfc3a0b6beca231ca9ce7a1a230cd89fa93382

data/CHANGELOG.md

@@ -6,6 +6,16 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [3.0.0] - 2018-03-17
+### Security
+- updated rubocop dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@majormoses)
+
+### Breaking Changes
+- removed ruby `< 2.1` support (@majormoses)
+
+### Changed
+- appeased the cops (@majormoses)
+
 ## [2.7.0] - 2018-01-06
 ### Changed
 - metrics-per-processes.py: Add option to find processes by username (@rthouvenin)
@@ -160,7 +170,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 - built against 1.9.3, 2.0, 2.1
 - cryptographically signed
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.7.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.7.0...3.0.0
 [2.7.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.6.0...2.7.0
 [2.6.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.5.0...2.6.0
 [2.5.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.4.0...2.5.0

data/bin/check-process-restart.rb

@@ -1,5 +1,4 @@
 #! /usr/bin/env ruby
-#  encoding: UTF-8
 #
 #   check-process-restart
 #

data/bin/check-process.rb

@@ -1,5 +1,4 @@
 #! /usr/bin/env ruby
-# encoding: UTF-8
 #
 # check-process
 #
@@ -209,7 +208,7 @@ class CheckProcess < Sensu::Plugin::Check::CLI
   #
   def on_cygwin?
     # #YELLOW
-    `ps -W 2>&1`; $CHILD_STATUS.exitstatus == 0 # rubocop:disable Semicolon
+    `ps -W 2>&1`; $CHILD_STATUS.zero? # rubocop:disable Semicolon
   end
 
   # Acquire all the proceeses on a system for further analysis
@@ -253,13 +252,13 @@ class CheckProcess < Sensu::Plugin::Check::CLI
     procs = acquire_procs
 
     if config[:file_pid] && (file_pid = read_pid(config[:file_pid]))
-      procs.reject! { |p| p[:pid].to_i != file_pid }
+      procs.select! { |p| p[:pid].to_i == file_pid }
     end
 
     procs.reject! { |p| p[:pid].to_i == $PROCESS_ID } unless config[:match_self]
     procs.reject! { |p| p[:pid].to_i == Process.ppid } unless config[:match_parent]
     procs.reject! { |p| p[:command] =~ /#{config[:exclude_pat]}/ } if config[:exclude_pat]
-    procs.reject! { |p| p[:command] !~ /#{config[:cmd_pat]}/ } if config[:cmd_pat]
+    procs.select! { |p| p[:command] =~ /#{config[:cmd_pat]}/ } if config[:cmd_pat]
     procs.select! { |p| p[:vsz].to_f > config[:vsz] } if config[:vsz]
     procs.select! { |p| p[:rss].to_f > config[:rss] } if config[:rss]
     procs.select! { |p| p[:cpu].to_f > config[:cpu_utilization] } if config[:cpu_utilization]
@@ -268,8 +267,8 @@ class CheckProcess < Sensu::Plugin::Check::CLI
     procs.reject! { |p| etime_to_esec(p[:etime]) <= config[:esec_over] } if config[:esec_over]
     procs.reject! { |p| cputime_to_csec(p[:time]) >= config[:cpu_under] } if config[:cpu_under]
     procs.reject! { |p| cputime_to_csec(p[:time]) <= config[:cpu_over] } if config[:cpu_over]
-    procs.reject! { |p| !config[:state].include?(p[:state]) } if config[:state]
-    procs.reject! { |p| !config[:user].include?(p[:user]) } if config[:user]
+    procs.select! { |p| config[:state].include?(p[:state]) } if config[:state]
+    procs.select! { |p| config[:user].include?(p[:user]) } if config[:user]
 
     msg = "Found #{procs.size} matching processes"
     msg += "; cmd /#{config[:cmd_pat]}/" if config[:cmd_pat]
@@ -287,7 +286,7 @@ class CheckProcess < Sensu::Plugin::Check::CLI
 
     if config[:metric]
       # #YELLOW
-      count = procs.map { |p| p[config[:metric]].to_i }.reduce { |a, b| a + b } # rubocop:disable SingleLineBlockParams
+      count = procs.map { |p| p[config[:metric]].to_i }.reduce { |a, b| a + b }
       msg += "; #{config[:metric]} == #{count}"
     else
       count = procs.size

data/bin/check-threads-count.rb

@@ -51,9 +51,13 @@ class ThreadsCount < Sensu::Plugin::Check::CLI
   # Takes a value to be tested as an integer. If a new Integer instance cannot be created from it, return 1.
   # See the comments on get_process_threads() for why 1 is returned.
   def test_int(i)
-    return Integer(i)
-  rescue
-    return 1
+    Integer(i)
+  rescue TypeError
+    1
+  rescue ArgumentError
+    1
+  rescue StandardError
+    1
   end
 
   # Takes a process struct from Sys::ProcTable.ps() as an argument
@@ -61,12 +65,12 @@ class ThreadsCount < Sensu::Plugin::Check::CLI
   # Returns the number of processes in those fields.
   # Otherwise, returns 1 as all processes are assumed to have at least one thread.
   def get_process_threads(p)
-    if p.respond_to?(:nlwp) # rubocop:disable Style/GuardClause
-      return test_int(p.nlwp)
+    if p.respond_to?(:nlwp)
+      test_int(p.nlwp)
     elsif p.respond_to?(:thread_count)
-      return test_int(p.thread_count)
+      test_int(p.thread_count)
     else
-      return 1
+      1
     end
   end
 

data/bin/metrics-per-process.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-bin_dir = File.expand_path(File.dirname(__FILE__))
+bin_dir = File.expand_path(__dir__)
 shell_script_path = File.join(bin_dir, File.basename($PROGRAM_NAME, '.rb') + '.py')
 
 exec shell_script_path, *ARGV

data/bin/metrics-process-status.rb

@@ -1,5 +1,4 @@
 #! /usr/bin/env ruby
-#  encoding: UTF-8
 #
 #   proc-status-metrics
 #
@@ -92,7 +91,7 @@ class ProcStatus < Sensu::Plugin::Metric::CLI::Graphite
   #
   def acquire_valid_pids(pgrep_output)
     res = pgrep_output.split("\n").map(&:strip)
-    pids = res.reject { |x| !x.integer? }
+    pids = res.select(&:integer?)
     pids
   end
 

data/bin/metrics-process-uptime.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-bin_dir = File.expand_path(File.dirname(__FILE__))
+bin_dir = File.expand_path(__dir__)
 shell_script_path = File.join(bin_dir, File.basename($PROGRAM_NAME, '.rb') + '.sh')
 
 exec shell_script_path, *ARGV

data/bin/metrics-process-uptime.sh

@@ -3,7 +3,7 @@
 #Author: Abhishek Jain<abhi111jain@gmail.com
 
 #This script greps for a process if the process name is specified or looks for the pid file in case the path to the pid file is specified.
-#If the grep is successful in the former case or the pid file is present with a valid running state in the latter case, a value of 1 is 
+#If the grep is successful in the former case or the pid file is present with a valid running state in the latter case, a value of 1 is
 #associated with the metric (<metric_name> <metric value> <timestamp>) format and outputted otherwise a value of 0 is emitted with the same format.
 #The metric name is constructed based on the scheme prefix specified. If not specified, the hostname is picked as the metric scheme and the metric
 #name is <hostname>.<process_name>.<uptime>

data/bin/metrics-processes-threads-count.rb

@@ -62,7 +62,7 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
   # See the comments on get_process_threads() for why 1 is returned.
   def test_int(i)
     return Integer(i)
-  rescue
+  rescue StandardError
     return 1
   end
 
@@ -71,12 +71,12 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
   # Returns the number of processes in those fields.
   # Otherwise, returns 1 as all processes are assumed to have at least one thread.
   def get_process_threads(p)
-    if p.respond_to?(:nlwp) # rubocop:disable Style/GuardClause
-      return test_int(p.nlwp)
+    if p.respond_to?(:nlwp)
+      test_int(p.nlwp)
     elsif p.respond_to?(:thread_count)
-      return test_int(p.thread_count)
+      test_int(p.thread_count)
     else
-      return 1
+      1
     end
   end
 
@@ -92,7 +92,7 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
   # Counts the processes by status and returns the hash
   def count_processes_by_status(ps_table)
     list_proc = {}
-    %w(S R D T t X Z).each do |v|
+    %w[S R D T t X Z].each do |v|
       list_proc[v] = 0
     end
     if ps_table.first.respond_to?(:state)

data/lib/sensu-plugins-process-checks/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsProcessChecks
   module Version
-    MAJOR = 2
-    MINOR = 7
+    MAJOR = 3
+    MINOR = 0
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-process-checks
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for checking running processes