sensu-plugins-cpu-checks 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62dd909eef356c0f7609fbd23605277d6a834c81
-  data.tar.gz: 7e015eefbd51ce934b4362e6ea7a1bebd0b4c4e3
+  metadata.gz: 4a6b98e98d618673b465206bfeb594ed0e24fb5b
+  data.tar.gz: f6eb4d2c4e4b11dcd38736b52d5b764ee0da133e
 SHA512:
-  metadata.gz: 0639f2733b45647230f0048554655b50d7dd6b32f1a8e807ce8c7f8c29f90314a25da3e889df7ea46f2caab7a2c6232bcd54996e29f0684c086a657fc2b4d81f
-  data.tar.gz: e64ccaadf5d2e4491d215411954baa0f36c400a53f333df5dab2489b69adb23eaec3b5d46dc53b86d07fbe22df06e6207c2dda89481e6d5eb13b7ac488cd1236
+  metadata.gz: a88af95700227ee0ed627a1d472ea357a408139a4e51e854649a200f6bae397524ecf4cc7ce2b7b5d8ccfb4d5316a884695afb02cbf07f7279a3994798dac6c4
+  data.tar.gz: 19baa85d8e554a4b36ea5b335d2c9dd185ad6c897935d0ba1c3cd9159f6c00a54b8de06ee2aa39392710f6efc62439da009347141459716ad9b4e32026e30a2e

data/CHANGELOG.md

@@ -4,6 +4,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.1.0] - 2017-05-02
+### Changed
+- no real change just bumping due to deployment issue.
+
+## [1.1.0] - 2017-05-02
+### Added
+- check-cpu.rb: added option to check less than (@santhosh-tekuri)
+- check-cpu.rb: added option to use a cache file rather than sleeping to look at previous times (@axos88)
+
+### Fixed
+- Set the correct type for --proc-path (@envintus)
+- metrics-cpu.rb was missing a column (@michau)
 
 ## [1.0.0] - 2016-06-15
 ### Changed
@@ -40,7 +52,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/1.1.0...1.1.0
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/0.0.4...1.0.0
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/0.0.3...0.0.4
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/0.0.2...0.0.3

data/bin/check-cpu.rb

@@ -26,6 +26,7 @@
 #
 
 require 'sensu-plugin/check/cli'
+require 'json'
 
 #
 # Check CPU
@@ -33,6 +34,13 @@ require 'sensu-plugin/check/cli'
 class CheckCPU < Sensu::Plugin::Check::CLI
   CPU_METRICS = [:user, :nice, :system, :idle, :iowait, :irq, :softirq, :steal, :guest, :guest_nice].freeze
 
+  option :less_than,
+         description: 'Change whether value is less than check',
+         short: '-l',
+         long: '--less_than',
+         default: false,
+         boolean: true
+
   option :warn,
          short: '-w WARN',
          proc: proc(&:to_f),
@@ -48,9 +56,13 @@ class CheckCPU < Sensu::Plugin::Check::CLI
          proc: proc(&:to_f),
          default: 1
 
+  option :cache_file,
+         long: '--cache-file CACHEFILE',
+         default: nil
+
   option :proc_path,
          long: '--proc-path /proc',
-         proc: proc(&:to_f),
+         proc: proc(&:to_s),
          default: '/proc'
 
   option :idle_metrics,
@@ -75,18 +87,47 @@ class CheckCPU < Sensu::Plugin::Check::CLI
     end
   end
 
+  def acquire_stats_with_sleeping(sec)
+    before = acquire_cpu_stats
+    sleep sec
+    after = acquire_cpu_stats
+
+    [before, after]
+  end
+
+  def acquire_stats_with_cache_file
+    before = JSON.parse(File.read(config[:cache_file]))
+    now = acquire_cpu_stats
+
+    [before, now]
+  end
+
+  def write_stats_to_cache_file(data)
+    File.write(config[:cache_file], data)
+  end
+
+  def acquire_stats(sec)
+    if config[:cache_file] && File.exist?(config[:cache_file])
+      (before, now) = acquire_stats_with_cache_file
+    else
+      (before, now) = acquire_stats_with_sleeping(sec)
+    end
+
+    write_stats_to_cache_file(now) if config[:cache_file]
+
+    [before, now]
+  end
+
   def run
-    cpu_stats_before = acquire_cpu_stats
-    sleep config[:sleep]
-    cpu_stats_after = acquire_cpu_stats
+    (cpu_stats_before, cpu_stats_now) = acquire_stats(config[:sleep])
 
     # Some kernels don't have 'guest' and 'guest_nice' values
-    metrics = CPU_METRICS.slice(0, cpu_stats_after.length)
+    metrics = CPU_METRICS.slice(0, cpu_stats_now.length)
 
     cpu_total_diff = 0.to_f
     cpu_stats_diff = []
     metrics.each_index do |i|
-      cpu_stats_diff[i] = cpu_stats_after[i] - cpu_stats_before[i]
+      cpu_stats_diff[i] = cpu_stats_now[i] - cpu_stats_before[i]
       cpu_total_diff += cpu_stats_diff[i]
     end
 
@@ -113,8 +154,13 @@ class CheckCPU < Sensu::Plugin::Check::CLI
 
     message msg
 
-    critical if checked_usage >= config[:crit]
-    warning if checked_usage >= config[:warn]
+    if config[:less_than]
+      critical if checked_usage <= config[:crit]
+      warning if checked_usage <= config[:warn]
+    else
+      critical if checked_usage >= config[:crit]
+      warning if checked_usage >= config[:warn]
+    end
     ok
   end
 end

data/bin/metrics-cpu.rb

@@ -42,7 +42,7 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
          default: '/proc'
 
   def run
-    cpu_metrics = %w(user nice system idle iowait irq softirq steal guest)
+    cpu_metrics = %w(user nice system idle iowait irq softirq steal guest guest_nice)
     other_metrics = %w(ctxt processes procs_running procs_blocked btime intr)
     cpu_count = 0
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-cpu-checks
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -217,9 +217,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 cpu checks and metrics
 test_files: []
-has_rdoc: