sensu-plugins-load-checks 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35df38a27bdf124cb968fcdd3598586d6b8a1553
-  data.tar.gz: 2347a19c760f0d45cc110ac075deeb6fb94fffec
+  metadata.gz: 298dd4b0198829f6f6fd1a5761cbe41104072281
+  data.tar.gz: f1ef98ca9e411273db36bffb5801ee6bc06e2ddb
 SHA512:
-  metadata.gz: 10b4639ff765690494188ca381cc37591329a766fe87d761ee7a944b85c9490f2fee0f744b99fbbb76c00e7e65a1e0fdd9bb3686449edfa233d156823f476786
-  data.tar.gz: 59e6ea16f9bc1efbcbfed9206aa498fb1e3a4941035be4737992c9bdce638895913f33c319711065eaf9d740573bc492fc1a072dbd8c0aa4b556475b16bc5f29
+  metadata.gz: 74983811f7e704e45f89c0bba37f1b2c0733e3036a9ba149a335e1949844699c4da5c32c929963fdcfc582d990fca184a2efa3228f4e26ff58fb82ebfcfc380d
+  data.tar.gz: 5fd34a60ee3119d59e5901cf1b220d7301c70163c7e402fa27541aa33e64813cbfbb8664833b14dd379d0a28f2ae3b80ecf130b920f6a6b46daf261b352b6fad

data/CHANGELOG.md

@@ -4,6 +4,17 @@ 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]
+### Breaking Change
+- bin/check-load.rb change the default of per_core to true (@majormoses)
+
+### Changed
+- Use the `uptime` command in bin/check-load.rb as well (@smuth4)
+- Correctly detect the number of cores on BSD (@smuth4)
+- bin/check-load.rb better output message (@woltage)
+- bin/check-load.rb change the default thresholds to better align with per_core values (@majormoses)
+- bin/check-load.rb changes to use >= rather than > for thresholds (@majormoses)
+- bin/check-load.rb switch to using 'unknown' rather than 'warning' when unable to determine the load average (@majormoses)
 
 ## [1.0.0] - 2016-06-16
 ### Changed
@@ -32,7 +43,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/1.0.0...2.0.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/0.0.4...1.0.0
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/0.0.3...0.0.4
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/0.0.2...0.0.3

data/README.md

@@ -14,6 +14,20 @@
 
 ## Usage
 
+### check-load.rb
+
+To see the list of full options you can run:
+```
+$ ./bin/check-load.rb --help
+Usage: ./bin/check-load.rb (options)
+    -c, --crit L1,L5,L15             Load CRITICAL threshold, 1/5/15 min average
+    -p, --per-core                   Divide load average results by cpu/core count
+    -w, --warn L1,L5,L15             Load WARNING threshold, 1/5/15 min average
+```
+
+This check will only work on linux systems as it relies on `cat /proc/loadavg` and `cat /proc/cpuinfo`. The check now defaults to using the `per_core` option which will take the loadavg and divide by the number of cores. You can use `-w/-c` with a comma separated value for 1/5/15 minute thresholds.
+
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

data/bin/check-load.rb

@@ -8,13 +8,13 @@
 #   plain text
 #
 # PLATFORMS:
-#   Linux
+#   Linux, BSD, Solaris, etc
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
 #
 # USAGE:
-#
+#   ./bin/check-load.rb --help
 # NOTES:
 #
 # LICENSE:
@@ -26,13 +26,25 @@
 require 'sensu-plugin/check/cli'
 
 class LoadAverage
-  def initialize(per_core = false)
+  def initialize(per_core = true)
     @cores = per_core ? cpu_count : 1
-    @avg = File.read('/proc/loadavg').split.take(3).map { |a| (a.to_f / @cores).round(2) } rescue nil # rubocop:disable RescueModifier
+    @avg = load_avg.map { |a| (a.to_f / @cores).round(2) } rescue nil # rubocop:disable RescueModifier
+  end
+
+  def load_avg
+    if File.exist?('/proc/loadavg')
+      File.read('/proc/loadavg').split.take(3)
+    else
+      `uptime`.delete(',').split(' ')[-3..-1]
+    end
   end
 
   def cpu_count
-    File.read('/proc/cpuinfo').scan(/^processor/).count
+    if File.exist?('/proc/cpuinfo')
+      File.read('/proc/cpuinfo').scan(/^processor/).count
+    else
+      `sysctl -n hw.ncpu`.to_i
+    end
   rescue
     0
   end
@@ -42,12 +54,16 @@ class LoadAverage
   end
 
   def exceed?(thresholds)
-    @avg.zip(thresholds).any? { |a, t| a > t }
+    @avg.zip(thresholds).any? { |a, t| a >= t }
   end
 
   def to_s
     @avg.join(', ')
   end
+
+  def total
+    @avg.map { |a| (a * @cores) }.join(', ')
+  end
 end
 
 class CheckLoad < Sensu::Plugin::Check::CLI
@@ -56,26 +72,32 @@ class CheckLoad < Sensu::Plugin::Check::CLI
          long: '--warn L1,L5,L15',
          description: 'Load WARNING threshold, 1/5/15 min average',
          proc: proc { |a| a.split(',').map(&:to_f) },
-         default: [10, 20, 30]
+         default: [2.75, 2.5, 2.0]
 
   option :crit,
          short: '-c L1,L5,L15',
          long: '--crit L1,L5,L15',
          description: 'Load CRITICAL threshold, 1/5/15 min average',
          proc: proc { |a| a.split(',').map(&:to_f) },
-         default: [25, 50, 75]
+         default: [3.5, 3.25, 3.0]
 
   option :per_core,
          short: '-p',
          long: '--per-core',
          description: 'Divide load average results by cpu/core count',
          boolean: 'true',
-         default: false
+         default: true
 
   def run
     avg = LoadAverage.new(config[:per_core])
-    warning 'Could not read load average from /proc' if avg.failed?
-    message "Load average: #{avg}"
+    unknown 'Could not read load average from /proc' if avg.failed?
+
+    if config[:per_core] && avg.cpu_count > 1
+      message "Per core load average (#{avg.cpu_count} CPU): #{avg} - Total: #{avg.total}"
+    else
+      message "Total load average (#{avg.cpu_count} CPU): #{avg}"
+    end
+
     critical if avg.exceed?(config[:crit])
     warning if avg.exceed?(config[:warn])
     ok

data/bin/metrics-load.rb

@@ -54,7 +54,11 @@ class LoadStat < Sensu::Plugin::Metric::CLI::Graphite
          default: false
 
   def number_of_cores
-    @cores ||= File.readlines('/proc/cpuinfo').count { |l| l =~ /^processor\s+:/ }
+    @cores ||= if File.exist?('/proc/cpuinfo')
+                 File.read('/proc/cpuinfo').scan(/^processor/).count
+               else
+                 `sysctl -n hw.ncpu`.to_i
+               end
   end
 
   def run

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-load-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-16 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -194,9 +194,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 load checks
 test_files: []
-has_rdoc: