sensu-plugins-process-checks 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f15fc531214b09f781c533578d443bb4365b6da
-  data.tar.gz: c10670a3beb7f91a1f3eb4e8b08c673a47d497c1
+  metadata.gz: cac4dabc14637107d249a25b6433d181aced85ba
+  data.tar.gz: 0b4518cc291f7353a0e6df9f922c3be91d7ffcb2
 SHA512:
-  metadata.gz: bfaac1db94ea36f55d45a4cbc085e5db88e9268cee70fd163521c959cc241a8120b9403d03e0fe018cfe1cb9724c8e5494516df38ce21b4dfea8365f9608ffd5
-  data.tar.gz: e96f93533cf597ea4bbb6cfa4b3ba2b320f207a8efefa0e47bba8c3ecc5755eb01ad2b3b4191f816356ebf8703068de8bde0a61778ebf3a4e101326cf6e6c86e
+  metadata.gz: b2cae1dbced906dbf167e698d22f8c1ef12742624452eca8aec5e0a31a0122854902e5dedcd1332bfd0295f7d453af48f115856b43026ba9bee28abcdc6e499a
+  data.tar.gz: b9d48b6ed2e4e354551537eb0288ab81c9803897190e2ad3f4793eb068e872edf2d17a4b45fe437477d4cf1af76777d26540b95cf83ad13afb6e56aae1657ed7

data/CHANGELOG.md

@@ -4,6 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [2.0.0] 2017-05-18
+### Breaking Changes
+- check-process.rb: renamed `--propotional-set-size` to `--cpu-utilization` as that's really what it was. (@majormoses)
+- check-process.rb: Flip the meaning of `-z`, `-r`, `-P` and `-T` to match what the help messages say they do. (@maoe)
+
+### Changed
+- check-process.rb: Added `-F` option to trigger a critical if pid file is specified but non-existent. (@swibowo)
+
+### Added
+- check-process-restart.rb: Allow additional arguments to be passed to the underlying tool using `-a`. (@tomduckering)
 
 ## [1.0.0] - 2016-06-21
 ### Fixed
@@ -103,7 +113,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - built against 1.9.3, 2.0, 2.1
 - cryptographically signed
 
-[unreleased]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/1.0.0...HEAD
+[unreleased]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/1.0.0...2.0.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/0.0.6...1.0.0
 [0.0.6]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/0.0.5...0.0.6
 [0.0.5]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/0.0.4...0.0.5

data/bin/check-process-restart.rb

@@ -53,6 +53,11 @@ class CheckProcessRestart < Sensu::Plugin::Check::CLI
          description: 'the number of processes to need restart before critical',
          default: 2
 
+  option :args,
+         short: '-a ARGS',
+         description: 'arguments to pass to the checkrestart or needs-restarting tool. Quote flags like this: -a \'-p\'',
+         default: ''
+
   # Debian command to run
   CHECK_RESTART = '/usr/sbin/checkrestart'.freeze
 
@@ -84,8 +89,8 @@ class CheckProcessRestart < Sensu::Plugin::Check::CLI
   def run_checkrestart
     checkrestart_hash = { found: '', pids: [] }
 
-    out = `sudo #{CHECK_RESTART} 2>&1`
-    if $CHILD_STATUS.to_i != 0
+    out = `sudo #{CHECK_RESTART} #{config[:args]} 2>&1`
+    if $CHILD_STATUS.to_i.nonzero?
       checkrestart_hash[:found] = "Failed to run checkrestart: #{out}"
     else
       out.lines do |l|
@@ -108,11 +113,11 @@ class CheckProcessRestart < Sensu::Plugin::Check::CLI
   def run_needs_restarting
     needs_restarting_hash = { found: '', pids: [] }
 
-    out = `sudo #{NEEDS_RESTARTING} 2>&1`
-    if $CHILD_STATUS.to_i != 0
+    out = `sudo #{NEEDS_RESTARTING} #{config[:args]} 2>&1`
+    if $CHILD_STATUS.to_i.nonzero?
       needs_restarting_hash[:found] = "Failed to run needs-restarting: #{out}"
     else
-      needs_restarting_hash[:found] = `sudo #{NEEDS_RESTARTING} | wc -l | tr -d "\n"`
+      needs_restarting_hash[:found] = `sudo #{NEEDS_RESTARTING} #{config[:args]} | wc -l | tr -d "\n"`
 
       out.lines do |l|
         m = /(\d+)\s:\s(.*)$/.match(l)

data/bin/check-process.rb

@@ -106,6 +106,11 @@ class CheckProcess < Sensu::Plugin::Check::CLI
          long: '--file-pid PID',
          description: 'Check against a specific PID'
 
+  option :file_pid_crit,
+         short: '-F',
+         long: '--file-pid-crit',
+         description: 'Trigger a critical if pid file is specified but non-existent'
+
   option :vsz,
          short: '-z VSZ',
          long: '--virtual-memory-size VSZ',
@@ -118,9 +123,9 @@ class CheckProcess < Sensu::Plugin::Check::CLI
          description: 'Trigger on a Resident Set size is bigger than this',
          proc: proc(&:to_i)
 
-  option :pcpu,
-         short: '-P PCPU',
-         long: '--proportional-set-size PCPU',
+  option :cpu_utilization,
+         short: '-P xx',
+         long: '--cpu-utilization xx',
          description: 'Trigger on a Proportional Set Size is bigger than this',
          proc: proc(&:to_f)
 
@@ -146,7 +151,7 @@ class CheckProcess < Sensu::Plugin::Check::CLI
          short: '-e SECONDS',
          long: '--esec-over SECONDS',
          proc: proc(&:to_i),
-         description: 'Match processes that older that this, in SECONDS'
+         description: 'Match processes that are older than this, in SECONDS'
 
   option :esec_under,
          short: '-E SECONDS',
@@ -176,8 +181,10 @@ class CheckProcess < Sensu::Plugin::Check::CLI
   def read_pid(path)
     if File.exist?(path)
       File.read(path).strip.to_i
-    else
+    elsif config[:file_pid_crit].nil?
       unknown "Could not read pid file #{path}"
+    else
+      critical "Could not read pid file #{path}"
     end
   end
 
@@ -221,7 +228,7 @@ class CheckProcess < Sensu::Plugin::Check::CLI
       end
     else
       read_lines('ps axwwo user,pid,vsz,rss,pcpu,nlwp,state,etime,time,command').drop(1).map do |line|
-        line_to_hash(line, :user, :pid, :vsz, :rss, :pcpu, :thcount, :state, :etime, :time, :command)
+        line_to_hash(line, :user, :pid, :vsz, :rss, :cpu, :thcount, :state, :etime, :time, :command)
       end
     end
   end
@@ -248,14 +255,15 @@ class CheckProcess < Sensu::Plugin::Check::CLI
     if config[:file_pid] && (file_pid = read_pid(config[:file_pid]))
       procs.reject! { |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.reject! { |p| p[:vsz].to_f > config[:vsz] } if config[:vsz]
-    procs.reject! { |p| p[:rss].to_f > config[:rss] } if config[:rss]
-    procs.reject! { |p| p[:pcpu].to_f > config[:pcpu] } if config[:pcpu]
-    procs.reject! { |p| p[:thcount].to_i > config[:thcount] } if config[:thcount]
+    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]
+    procs.select! { |p| p[:thcount].to_i > config[:thcount] } if config[:thcount]
     procs.reject! { |p| etime_to_esec(p[:etime]) >= config[:esec_under] } if config[:esec_under]
     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]
@@ -267,10 +275,10 @@ class CheckProcess < Sensu::Plugin::Check::CLI
     msg += "; cmd /#{config[:cmd_pat]}/" if config[:cmd_pat]
     msg += "; state #{config[:state].join(',')}" if config[:state]
     msg += "; user #{config[:user].join(',')}" if config[:user]
-    msg += "; vsz < #{config[:vsz]}" if config[:vsz]
-    msg += "; rss < #{config[:rss]}" if config[:rss]
-    msg += "; pcpu < #{config[:pcpu]}" if config[:pcpu]
-    msg += "; thcount < #{config[:thcount]}" if config[:thcount]
+    msg += "; vsz > #{config[:vsz]}" if config[:vsz]
+    msg += "; rss > #{config[:rss]}" if config[:rss]
+    msg += "; cpu > #{config[:cpu_utilization]}" if config[:cpu_utilization]
+    msg += "; thcount > #{config[:thcount]}" if config[:thcount]
     msg += "; esec < #{config[:esec_under]}" if config[:esec_under]
     msg += "; esec > #{config[:esec_over]}" if config[:esec_over]
     msg += "; csec < #{config[:cpu_under]}" if config[:cpu_under]

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

@@ -1,6 +1,6 @@
 module SensuPluginsProcessChecks
   module Version
-    MAJOR = 1
+    MAJOR = 2
     MINOR = 0
     PATCH = 0
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-process-checks
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -232,9 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for checking running processes
 test_files: []
-has_rdoc: