sensu-plugins-process-checks 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aab223267b895dbbbce38685a4928b1801d03a8
-  data.tar.gz: 7a45deb3970294cc3f8acaff0c74d8ccda4f9743
+  metadata.gz: e4c1e16b051ae71d9479b95387e22c504ab7a7f0
+  data.tar.gz: 43d7d36c527666e51220a43a05c26793ea420397
 SHA512:
-  metadata.gz: c9aeaa218f5a55fd0d6aaee1560af7b68d444dbbc0af440f00a55f77afd2a0beed3d0f87368196b71119d98c6ed1be76aadc4f81a730ac50240dfc2ca65278dc
-  data.tar.gz: 9ae11bfe35a884d635ed38973469b4e3d7a22f7b0277be5fa0c436a5622b0cb6627fc96d02bc9e90a737845698f1dbf04b0ea5d040fdef22dbe0b6fe5609a821
+  metadata.gz: 4d4cca0b109f96d84089aa5855841a9bc50e8214949c883092850c16d43ada5af4912ec5da7f7cac1915ee81fe2c9e34e46e9731f0b379d5f61c6836ed621829
+  data.tar.gz: 512a08cd43764730059955e144f7dd3772ae9944b517a7bc5ac969ad5b07be2d6b7a8e136a73ff8693436b6e442638a34a17c758209cff2c1dd62be80164b791

data/CHANGELOG.md

@@ -1,9 +1,23 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
+
 ## [Unreleased]
+
+## [2.4.0] - 2017-07-18
+### Added
+- ruby 2.4 testing (@majormoses)
+- metric-processes-threads-count.rb: count processes by status (for Linux machines only) (@alcasim)
+
+### Changed
+- PR template fixes (@majormoses)
+
+### Fixed
+- misc changelog fixup (@majormoses)
+- fixed `rake check_binstubs` by requiging `English`
+
 ## [2.3.0] - 2017-05-29
 ### Changed
 - metrics-per-process.py: Use memory_info() in psutil versions greater than 4.0.0, as memory_info_ex() was deprecated.
@@ -40,6 +54,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - Updated Rubocop to 0.40, applied auto-correct
 - Remove Ruby 1.9.3 support; add Ruby 2.3.0 support to test matrix
 
+## [0.1.0] - 2015-08-11
+### Added
+- Add metrics-per-process.py plugin (require python psutil module)
 
 ## [0.0.6] - 2015-08-24
 ### Fixed
@@ -52,15 +69,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - rename process-uptime metrics.sh -> metrics-process-uptime.sh
 
-## [0.1.0] - 2015-08-11
-### Added
-- Add metrics-per-process.py plugin (require python psutil module)
-
 ## [0.0.4] - 2015-07-14
 ### Changed
 - updated sensu-plugin gem to 1.2.0
 
-## [0.0.3] - [2015-07-13]
+## [0.0.3] - 2015-07-13
 ### Fixed
 - issue #9: variable type conversion to_i in check-process-restart
 
@@ -77,7 +90,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - removed cruft from /lib
 
-## 0.0.1 - [2015-05-01]
+## [0.0.1] - 2015-05-01
 ### Added
 - initial stable release
 
@@ -126,7 +139,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/2.3.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.3.0...HEAD
+[2.4.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.3.0...
 [2.3.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/2.0.0...2.1.0
@@ -137,3 +151,4 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 [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
 [0.0.2]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/0.0.1...0.0.2
+[0.0.1]: https://github.com/sensu-plugins/sensu-plugins-process-checks/compare/4fd88a85f31d52c0f7145807365c911ea7f935c1...0.0.1

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

@@ -51,6 +51,13 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
          boolean: true,
          default: false
 
+  option :statuses,
+         description: 'If specified, count each process number by status in addition to processes. Note: Requires sys-proctables > 0.9.5',
+         short: '-S',
+         long: '--statuses',
+         boolean: true,
+         default: false
+
   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.
@@ -86,9 +93,26 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
     end
   end
 
+  # Takes a process struct from Sys::ProcTable.ps() as an argument
+  # Initialises a list of different Linux process statuses
+  # Tries to use the Linux proccess status :state field, returns the initializedl list if it fails
+  # 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|
+      list_proc[v] = 0
+    end
+    if ps_table.first.respond_to?(:state)
+      ps_table.each do |pr|
+        list_proc[pr[:state]] += 1
+      end
+    end
+    list_proc
+  end
+
   # Main function
   def run
-    if config[:threads]
+    if config[:threads] || config[:statuses]
       unknown PROCTABLE_MSG unless check_proctable_version
     end
     ps_table = Sys::ProcTable.ps
@@ -100,6 +124,26 @@ class ProcessesThreadsCount < Sensu::Plugin::Metric::CLI::Graphite
     if config[:threads]
       output "#{[config[:scheme], 'thread_count'].join('.')} #{threads} #{timestamp}"
     end
+    if config[:statuses]
+      count_processes_by_status(ps_table).each do |type, proc_count|
+        case type
+        when 'S'
+          output "#{[config[:scheme], 'sleeping'].join('.')} #{proc_count} #{timestamp}"
+        when 'R'
+          output "#{[config[:scheme], 'running'].join('.')} #{proc_count} #{timestamp}"
+        when 'D'
+          output "#{[config[:scheme], 'ininterruptible_sleep'].join('.')} #{proc_count} #{timestamp}"
+        when 'T'
+          output "#{[config[:scheme], 'stopped'].join('.')} #{proc_count} #{timestamp}"
+        when 't'
+          output "#{[config[:scheme], 'stopped_by_debugger'].join('.')} #{proc_count} #{timestamp}"
+        when 'X'
+          output "#{[config[:scheme], 'dead'].join('.')} #{proc_count} #{timestamp}"
+        when 'Z'
+          output "#{[config[:scheme], 'zombie'].join('.')} #{proc_count} #{timestamp}"
+        end
+      end
+    end
     ok
   end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsProcessChecks
   module Version
     MAJOR = 2
-    MINOR = 3
+    MINOR = 4
     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.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english