sensu-plugins-process-checks 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d660f3baaa8a58c1e650df9362856dfae1f9ba6d
-  data.tar.gz: 51a2c180c7739e02928afc398aa9b02e140538a2
+  metadata.gz: 5f15fc531214b09f781c533578d443bb4365b6da
+  data.tar.gz: c10670a3beb7f91a1f3eb4e8b08c673a47d497c1
 SHA512:
-  metadata.gz: 6d616ff7316378223b2886efb642cc0b82f68ed3d5891d4712e581bc524e0fe9069e940a71859a9a2d80df690695f174a723867c0e2e6d007e24dc578322b63b
-  data.tar.gz: 46aa8151e54b798bb722d81e00db1d74a1ee5c118520d78fc472ddd07c75c1f042de2712ff278d3a1f569bfa6687186f864826abdd2df132566f684564db484c
+  metadata.gz: bfaac1db94ea36f55d45a4cbc085e5db88e9268cee70fd163521c959cc241a8120b9403d03e0fe018cfe1cb9724c8e5494516df38ce21b4dfea8365f9608ffd5
+  data.tar.gz: e96f93533cf597ea4bbb6cfa4b3ba2b320f207a8efefa0e47bba8c3ecc5755eb01ad2b3b4191f816356ebf8703068de8bde0a61778ebf3a4e101326cf6e6c86e

data/CHANGELOG.md

@@ -3,7 +3,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
+
+## [1.0.0] - 2016-06-21
+### Fixed
+- metrics-per-process.py: avoid false alerts by adding exception handling for `OSError` errors
+- check-process.rb: avoid 'invalid byte sequence' messages by adding configurable encoding which defaults to `ASCII-8BIT`
+
+### Added
+- check-process-restart.rb: added support for Red Hat "needs-restarting" script
+
+### Changed
+- Updated Rubocop to 0.40, applied auto-correct
+- Remove Ruby 1.9.3 support; add Ruby 2.3.0 support to test matrix
+
 
 ## [0.0.6] - 2015-08-24
 ### Fixed
@@ -14,7 +27,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - include hostname in default scheme in metrics-processes-threads-count
 
 ### Changed
-rename process-uptime metrics.sh -> metrics-process-uptime.sh
+- rename process-uptime metrics.sh -> metrics-process-uptime.sh
 
 ## [0.1.0] - 2015-08-11
 ### Added
@@ -35,20 +48,17 @@ rename process-uptime metrics.sh -> metrics-process-uptime.sh
 - puts deps in order in Gemspec
 
 ## [0.0.2] - 2015-06-03
-
 ### Fixed
 - added binstubs
 
 ### Changed
 - removed cruft from /lib
 
-## [0.0.1] - [2015-05-01]
-
+## 0.0.1 - [2015-05-01]
 ### Added
 - initial stable release
 
-## [0.0.1.alpha.6]
-
+## 0.0.1.alpha.6
 ### Added
 - add chef provisioner to Vagrantfile
 - add metadata to gemspec
@@ -56,26 +66,22 @@ rename process-uptime metrics.sh -> metrics-process-uptime.sh
 ### Fixed
 - fix rubocop errors
 
-## [0.0.1.alpha.5]
-
+## 0.0.1.alpha.5
 ### Added
 - add new check for process uptime metrics
 
-## [0.0.1.alpha.4]
-
+## 0.0.1.alpha.4
 ### Changed
 - convert scrips to sys-proctable gem for platform independence
 
-## [0.0.1-alpha.3]
-
+## 0.0.1-alpha.3
 ### Added
 - add proc-status-metrics
 
 ### Changed
 - change proc-status-metrics to process-status-metrics
 
-## [0.0.1-alpha.2]
-
+## 0.0.1-alpha.2
 ### Changed
 - bump Vagrant to Chef 6.6
 - update LICENSE and gemspec authors
@@ -85,8 +91,7 @@ rename process-uptime metrics.sh -> metrics-process-uptime.sh
 - add required Ruby version *>= 1.9.3*
 - add test/spec_help.rb
 
-## [0.1.0-alpha.1]
-
+## 0.1.0-alpha.1
 - baseline release identical to **sensu-community-plugins** repo
 
 ### Changed
@@ -98,7 +103,9 @@ rename process-uptime metrics.sh -> metrics-process-uptime.sh
 - built against 1.9.3, 2.0, 2.1
 - cryptographically signed
 
-[unreleased]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/0.0.5...HEAD
+[unreleased]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/1.0.0...HEAD
+[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
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/0.0.3...0.0.4
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/0.0.2...0.0.3

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-process-checks/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-process-checks)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-process-checks/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-process-checks)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-process-checks.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-process-checks)
-[![Codeship Status for sensu-plugins/sensu-plugins-process-checks](https://codeship.com/projects/feb27000-d25e-0132-6aab-4ad10baf29cc/status?branch=master)](https://codeship.com/projects/77521)
 
 ## Functionality
 

data/bin/check-process-restart.rb

@@ -13,7 +13,7 @@
 #             WARNING if 1 process requires a restart
 #
 # PLATFORMS:
-#   Linux (Debian based distributions)
+#   Linux
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
@@ -26,8 +26,9 @@
 #   check-process-restart.rb -w 2 -c 5
 #
 # NOTES:
-#   This will only work on Debian based distributions and requires the
-#   debian-goodies package.
+#   This will only work on Debian or Red Hat-based distributions.
+#   In the case of Debian-based distributions, the debian-goodies
+#   package will need to be installed.
 #
 #   Also make sure the user "sensu" can sudo without password
 #
@@ -53,7 +54,10 @@ class CheckProcessRestart < Sensu::Plugin::Check::CLI
          default: 2
 
   # Debian command to run
-  CHECK_RESTART = '/usr/sbin/checkrestart'
+  CHECK_RESTART = '/usr/sbin/checkrestart'.freeze
+
+  # Red Hat command to run
+  NEEDS_RESTARTING = '/usr/bin/needs-restarting'.freeze
 
   # Set path for the checkrestart script
   #
@@ -68,6 +72,13 @@ class CheckProcessRestart < Sensu::Plugin::Check::CLI
     File.exist?('/etc/debian_version') && File.exist?(CHECK_RESTART)
   end
 
+  # Check if we can run needs-restarting script
+  # @return [Boolean]
+  #
+  def needs_restarting?
+    File.exist?(NEEDS_RESTARTING)
+  end
+
   # Run checkrestart and parse process(es) and pid(s)
   # @return [Hash]
   def run_checkrestart
@@ -92,21 +103,59 @@ class CheckProcessRestart < Sensu::Plugin::Check::CLI
     checkrestart_hash
   end
 
+  # Run needs-restarting and parse process(es) and pid(s)
+  # @return [Hash]
+  def run_needs_restarting
+    needs_restarting_hash = { found: '', pids: [] }
+
+    out = `sudo #{NEEDS_RESTARTING} 2>&1`
+    if $CHILD_STATUS.to_i != 0
+      needs_restarting_hash[:found] = "Failed to run needs-restarting: #{out}"
+    else
+      needs_restarting_hash[:found] = `sudo #{NEEDS_RESTARTING} | wc -l | tr -d "\n"`
+
+      out.lines do |l|
+        m = /(\d+)\s:\s(.*)$/.match(l)
+
+        if m
+          needs_restarting_hash[:pids] << { m[1] => m[2] }
+        end
+      end
+    end
+    needs_restarting_hash
+  end
+
   # Main run method for the check
   #
   def run
-    unless checkrestart?
-      unknown "Can't seem to find checkrestart. This check only works in a Debian based distribution and you need debian-goodies package installed"
-    end
+    if checkrestart?
+      checkrestart_out = run_checkrestart
+
+      if /^Failed/ =~ checkrestart_out[:found]
+        unknown checkrestart_out[:found]
+      end
 
-    checkrestart_out = run_checkrestart
-    if /^Failed/.match(checkrestart_out[:found])
-      unknown checkrestart_out[:found]
+      message JSON.generate(checkrestart_out)
+      found = checkrestart_out[:found].to_i
+
+      warning if found >= config[:warn].to_i && found < config[:crit].to_i
+      critical if found >= config[:crit].to_i
+      ok
+    elsif needs_restarting?
+      needs_restarting_out = run_needs_restarting
+
+      if /^Failed/ =~ needs_restarting_out[:found]
+        unknown needs_restarting_out[:found]
+      end
+
+      message JSON.generate(needs_restarting_out)
+      found = needs_restarting_out[:found].to_i
+
+      warning if found >= config[:warn].to_i && found < config[:crit].to_i
+      critical if found >= config[:crit].to_i
+      ok
+    else
+      unknown "Can't seem to find either checkrestart or needs-restarting. For checkrestart, you will need to install the debian-goodies package."
     end
-    message JSON.generate(checkrestart_out)
-    found = checkrestart_out[:found].to_i
-    warning if found >= config[:warn].to_i && found < config[:crit].to_i
-    critical if found >= config[:crit].to_i
-    ok
   end
 end

data/bin/check-process.rb

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# encoding: UTF-8
 #
 # check-process
 #
@@ -24,10 +25,10 @@
 #
 # USAGE:
 #   # chef-client is running
-#   check-procs -p chef-client -W 1
+#   check-process.rb -p chef-client -W 1
 #
 #   # there are not too many zombies
-#   check-procs -s Z -w 5 -c 10
+#   check-process.rb -s Z -w 5 -c 10
 #
 # NOTES:
 #
@@ -165,6 +166,11 @@ class CheckProcess < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          description: 'Match processes cpu time that is younger than this, in SECONDS'
 
+  option :encoding,
+         description: 'Explicit encoding when reading process list',
+         long: '--encoding ENCODING',
+         default: 'ASCII-8BIT'
+
   # Read the pid file
   # @param path [String] the path to the pid file, including the file
   def read_pid(path)
@@ -178,7 +184,7 @@ class CheckProcess < Sensu::Plugin::Check::CLI
   # read the output of a command
   # @param cmd [String] the command to read the output from
   def read_lines(cmd)
-    IO.popen(cmd + ' 2>&1') do |child|
+    IO.popen(cmd + ' 2>&1', external_encoding: config[:encoding]) do |child|
       child.read.split("\n")
     end
   end
@@ -236,7 +242,7 @@ class CheckProcess < Sensu::Plugin::Check::CLI
 
   # The main function
   #
-  def run # rubocop:disable all
+  def run
     procs = acquire_procs
 
     if config[:file_pid] && (file_pid = read_pid(config[:file_pid]))

data/bin/check-threads-count.rb

@@ -48,7 +48,7 @@ class ThreadsCount < Sensu::Plugin::Check::CLI
          default: 32_000,
          proc: proc(&:to_i)
 
-  PROCTABLE_MSG = 'sys-proctable version newer than 0.9.5 is required for counting threads with -t or --threads'
+  PROCTABLE_MSG = 'sys-proctable version newer than 0.9.5 is required for counting threads with -t or --threads'.freeze
 
   # Exit with an unknown if sys-proctable is not high enough to support counting threads.
   def check_proctable_version
@@ -58,7 +58,9 @@ 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
+    return Integer(i)
+  rescue
+    return 1
   end
 
   # Takes a process struct from Sys::ProcTable.ps() as an argument
@@ -66,7 +68,7 @@ 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)
+    if p.respond_to?(:nlwp) # rubocop:disable Style/GuardClause
       return test_int(p.nlwp)
     elsif p.respond_to?(:thread_count)
       return test_int(p.thread_count)

data/bin/metrics-per-process.py

@@ -94,10 +94,14 @@ def find_pids_from_name(process_name):
   pids = []
   for pid in pids_in_proc:
     path = PROC_ROOT_DIR + pid
-    if 'comm' in os.listdir(path):
-      file_handler = open(path + '/comm', 'r')
-      if file_handler.read().rstrip() == process_name:
-        pids.append(int(pid))
+    try:
+        if 'comm' in os.listdir(path):
+          file_handler = open(path + '/comm', 'r')
+          if file_handler.read().rstrip() == process_name:
+            pids.append(int(pid))
+    except OSError, e:
+        if e.errno == 2:
+            pass
   return pids
 
 def stats_per_pid(pid):

data/bin/metrics-process-status.rb

@@ -109,10 +109,10 @@ class ProcStatus < Sensu::Plugin::Metric::CLI::Graphite
     metric_names = config[:metrics].split(',')
     proc_status_lines = `cat /proc/#{pid}/status`.split("\n")
 
-    out = { "#{cmdline}" => {} }
+    out = { cmdline.to_s => {} }
 
     metric_names.each do |m|
-      line = proc_status_lines.select { |x| /^#{m}/.match(x) }.first # rubocop:disable all
+      line = proc_status_lines.find { |x| /^#{m}/.match(x) }
       val = line ? line.split("\t")[1].to_i : nil
       out[cmdline.to_s][m] = val
     end
@@ -122,7 +122,7 @@ class ProcStatus < Sensu::Plugin::Metric::CLI::Graphite
   # Main functino
   #
   def run
-    fail 'You must supply -u USER or -p PROCESSNAME' unless config[:user] || config[:processname]
+    raise 'You must supply -u USER or -p PROCESSNAME' unless config[:user] || config[:processname]
     metrics = {}
     pgrep_output = `#{pgrep_command}`
     pids = acquire_valid_pids(pgrep_output)

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

@@ -51,7 +51,7 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
          boolean: true,
          default: false
 
-  PROCTABLE_MSG = 'sys-proctable version newer than 0.9.5 is required for counting threads with -t or --threads'
+  PROCTABLE_MSG = 'sys-proctable version newer than 0.9.5 is required for counting threads with -t or --threads'.freeze
 
   # Exit with an unknown if sys-proctable is not high enough to support counting threads.
   def check_proctable_version
@@ -61,7 +61,9 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
   # 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
+    return Integer(i)
+  rescue
+    return 1
   end
 
   # Takes a process struct from Sys::ProcTable.ps() as an argument
@@ -69,7 +71,7 @@ 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)
+    if p.respond_to?(:nlwp) # rubocop:disable Style/GuardClause
       return test_int(p.nlwp)
     elsif p.respond_to?(:thread_count)
       return test_int(p.thread_count)

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

@@ -1,8 +1,8 @@
 module SensuPluginsProcessChecks
   module Version
-    MAJOR = 0
+    MAJOR = 1
     MINOR = 0
-    PATCH = 6
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-process-checks
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-08-27 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -50,16 +28,16 @@ dependencies:
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
@@ -162,16 +140,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -200,15 +178,18 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Sensu plugins for checking running processes
+description: |-
+  This plugin provides native process instrumentation
+                                for monitoring and metrics collection, including:
+                                process status, uptime, thread count, and others
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-processes-threads-count.rb
-- metrics-process-status.rb
-- check-threads-count.rb
-- check-process.rb
-- check-process-restart.rb
 - check-cmd.rb
+- check-process-restart.rb
+- check-process.rb
+- check-threads-count.rb
+- metrics-process-status.rb
+- metrics-processes-threads-count.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -243,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -251,8 +232,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for checking running processes
 test_files: []
+has_rdoc: 

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-N,%H���ڝ��.`����,�� �(z�ʗ��C`C�����^;W$���~�oe��n���H�W�e�PP^Fx�v�2q:�UΎ�2J�ؚ�d��	��Yf�	�`n�jL3,䛬����+.ꙧ 8�/�c����Q�'\W���#�V�ñ߂b�����\͉��ģ(]�@�e�t�ih��ב��-����2�F�Iܠ�Lr	�\�OO�D|

data.tar.gz.sig

@@ -1,2 +0,0 @@
-'�A媛��v�F�&Y1�m"�
-���q��U]#����Y��{D$�H�����

metadata.gz.sig

@@ -1,2 +0,0 @@
-dY#)�+�ɾQ��!G���B��˰
-�hx؄W,ǃ���ͬ�������=��ó�f��Ȟ����i%ՆW���Cy�s�_�fWqU�