sensu-plugins-load-checks 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 298dd4b0198829f6f6fd1a5761cbe41104072281
-  data.tar.gz: f1ef98ca9e411273db36bffb5801ee6bc06e2ddb
+  metadata.gz: a74c9211d11a36e37fe0f3dd48985d29c597bef5
+  data.tar.gz: 06f2abfce99cc3d92adfd27821fdf00dc5adf1a1
 SHA512:
-  metadata.gz: 74983811f7e704e45f89c0bba37f1b2c0733e3036a9ba149a335e1949844699c4da5c32c929963fdcfc582d990fca184a2efa3228f4e26ff58fb82ebfcfc380d
-  data.tar.gz: 5fd34a60ee3119d59e5901cf1b220d7301c70163c7e402fa27541aa33e64813cbfbb8664833b14dd379d0a28f2ae3b80ecf130b920f6a6b46daf261b352b6fad
+  metadata.gz: ae29e7df1a2d14a3edab287ebcc4ba29a18ffcaf12c952eca2a8eb8af2120b93b4545d986bfc7b1e948634899a72d87c210a2a85e9f44fafcce1a767506cc45e
+  data.tar.gz: 5d117481dc2a814274fe5b578720230cde4534cbad9e8d4134cc0c50f271f8b24e78c5afdb03ae2c86659705ee9e32300751721a7b4bf980109e624e1cec1d42

data/CHANGELOG.md

@@ -4,10 +4,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [3.0.0]
+### Breaking Change
+- bin/check-load.rb remove option for per_core as its useless and broken (@majormoses)
+- bin/metrics-load.rb remove option for per_core as its useless and broken (@majormoses)
+
+### Changed
+- moved common logic into its own library location (@majormoses)
+### Fixed
+- bin/metrics-load.rb now uses common logic which fixes issues with uptime LOCALE parsing (@majormoses)
+
 ### [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)
@@ -43,7 +52,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/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-load-checks/compare/2.0.0...3.0.0
 [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

data/README.md

@@ -21,11 +21,10 @@ 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.
+This check should work on linux systems and many other unix systems. The check takes 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

data/bin/check-load.rb

@@ -24,47 +24,7 @@
 #
 
 require 'sensu-plugin/check/cli'
-
-class LoadAverage
-  def initialize(per_core = true)
-    @cores = per_core ? cpu_count : 1
-    @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
-    if File.exist?('/proc/cpuinfo')
-      File.read('/proc/cpuinfo').scan(/^processor/).count
-    else
-      `sysctl -n hw.ncpu`.to_i
-    end
-  rescue
-    0
-  end
-
-  def failed?
-    @avg.nil? || @cores.zero?
-  end
-
-  def exceed?(thresholds)
-    @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
+require_relative '../lib/sensu-plugins-load-checks/load-average.rb'
 
 class CheckLoad < Sensu::Plugin::Check::CLI
   option :warn,
@@ -81,25 +41,14 @@ class CheckLoad < Sensu::Plugin::Check::CLI
          proc: proc { |a| a.split(',').map(&:to_f) },
          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: true
-
   def run
-    avg = LoadAverage.new(config[:per_core])
-    unknown 'Could not read load average from /proc' if avg.failed?
+    data = LoadAverage.new
+    unknown 'Could not read load average from /proc or `uptime`' if data.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
+    message "Per core load average (#{data.cpu_count} CPU): #{data.load_avg}"
 
-    critical if avg.exceed?(config[:crit])
-    warning if avg.exceed?(config[:warn])
+    critical if data.exceed?(config[:crit])
+    warning if data.exceed?(config[:warn])
     ok
   end
 end

data/bin/metrics-load.rb

@@ -21,7 +21,7 @@
 #   metric data
 #
 # PLATFORMS:
-#   Linux, Windows, BSD, Solaris, etc
+#   Linux, BSD, Solaris, etc
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
@@ -38,6 +38,7 @@
 #
 
 require 'sensu-plugin/metric/cli'
+require_relative '../lib/sensu-plugins-load-checks/load-average.rb'
 require 'socket'
 
 class LoadStat < Sensu::Plugin::Metric::CLI::Graphite
@@ -46,43 +47,18 @@ class LoadStat < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: Socket.gethostname.to_s
 
-  option :per_core,
-         description: 'Divide load average results by cpu/core count',
-         short: '-p',
-         long: '--per-core',
-         boolean: true,
-         default: false
-
-  def number_of_cores
-    @cores ||= if File.exist?('/proc/cpuinfo')
-                 File.read('/proc/cpuinfo').scan(/^processor/).count
-               else
-                 `sysctl -n hw.ncpu`.to_i
-               end
-  end
-
   def run
-    result = `uptime`.delete(',').split(' ')
-    result = result[-3..-1]
+    data = LoadAverage.new
+    unknown 'Could not read load average from /proc or `uptime`' if data.failed?
 
     timestamp = Time.now.to_i
-    if config[:per_core]
-      metrics = {
-        load_avg: {
-          one: (result[0].to_f / number_of_cores).round(2),
-          five: (result[1].to_f / number_of_cores).round(2),
-          fifteen: (result[2].to_f / number_of_cores).round(2)
-        }
+    metrics = {
+      load_avg: {
+        one: data.load_avg[0].round(2),
+        five: data.load_avg[1].round(2),
+        fifteen: data.load_avg[2].round(2)
       }
-    else
-      metrics = {
-        load_avg: {
-          one: result[0],
-          five: result[1],
-          fifteen: result[2]
-        }
-      }
-    end
+    }
 
     metrics.each do |parent, children|
       children.each do |child, value|

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

@@ -0,0 +1,42 @@
+class LoadAverage
+  def initialize
+    @cores = cpu_count
+    @avg = load_avg
+  end
+
+  def load_avg
+    if File.exist?('/proc/loadavg')
+      # linux
+      File.read('/proc/loadavg').split.take(3).map { |a| (a.to_f / @cores).round(2) } rescue nil # rubocop:disable RescueModifier
+    else
+      # fallback for FreeBSD
+      `uptime`.split(' ')[-3..-1].map(&:to_f).map { |a| (a.to_f / @cores).round(2) } rescue nil # rubocop:disable RescueModifier
+    end
+  end
+
+  def cpu_count
+    if File.exist?('/proc/cpuinfo')
+      File.read('/proc/cpuinfo').scan(/^processor/).count
+    else
+      `sysctl -n hw.ncpu`.to_i
+    end
+  rescue
+    0
+  end
+
+  def failed?
+    @avg.nil? || @cores.zero?
+  end
+
+  def exceed?(thresholds)
+    @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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-load-checks
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -167,6 +167,7 @@ files:
 - bin/check-load.rb
 - bin/metrics-load.rb
 - lib/sensu-plugins-load-checks.rb
+- lib/sensu-plugins-load-checks/load-average.rb
 - lib/sensu-plugins-load-checks/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-load-checks
 licenses: