sensu-plugins-cpu-checks 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a074d040a240dead20971944d166b6e3b7505284
-  data.tar.gz: e671bc4985a80ebb41d2c9b53be24d1ddcf34244
+  metadata.gz: 62dd909eef356c0f7609fbd23605277d6a834c81
+  data.tar.gz: 7e015eefbd51ce934b4362e6ea7a1bebd0b4c4e3
 SHA512:
-  metadata.gz: 9d4ad55878708411784d6450da44a9bfadde539bffb07f71d9963e33882e1a7362a272e01846be521e06650228cdff64d4e0d74d3317d5a1e128a77190fd4433
-  data.tar.gz: 1937bbd262e78d1b56670c083fdbf113a82400fa113ceea3800bfba5d0d192153844358159ffc05f06d27415d846b71b72b7a8a9891eeeb45947e56fd03fd013
+  metadata.gz: 0639f2733b45647230f0048554655b50d7dd6b32f1a8e807ce8c7f8c29f90314a25da3e889df7ea46f2caab7a2c6232bcd54996e29f0684c086a657fc2b4d81f
+  data.tar.gz: e64ccaadf5d2e4491d215411954baa0f36c400a53f333df5dab2489b69adb23eaec3b5d46dc53b86d07fbe22df06e6207c2dda89481e6d5eb13b7ac488cd1236

data/CHANGELOG.md

@@ -3,7 +3,21 @@ 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-15
+### Changed
+- Modified check-cpu.rb to change state if >= threshold
+- Updated Rubocop to 0.40, applied auto-correct
+- Loosened sensu-plugin dependency to ~> 1.2
+- Specify the /proc location for use within a container
+
+### Added
+- Added metrics-numastat.rb
+- check-cpu.rb: Added --idle-metrics flag for indicating counters which should be considered idle
+
+### Removed
+- Remove Ruby 1.9.3 support; add Ruby 2.3.0 support in test matrix
 
 ## [0.0.4] - 2015-09-29
 ### Changed
@@ -14,15 +28,20 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - updated sensu-plugin gem to 1.2.0
 
-## 0.0.1 - 2015-05-21
-
-### Added
-- initial release
-
 ## [0.0.2] - 2015-06-02
-
 ### Fixed
 - added binstubs
 
 ### Changed
 - removed cruft from /lib
+
+## 0.0.1 - 2015-05-21
+### Added
+- initial release
+
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/1.0.0...HEAD
+[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
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-cpu-checks/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-cpu-checks)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-cpu-checks/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-cpu-checks)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-cpu-checks.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-cpu-checks)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-cpu-checks](https://codeship.com/projects/594a6450-d4f8-0132-20c9-0e210ac4c62f/status?branch=master)](https://codeship.com/projects/77924)
 
 ## Functionality
 
@@ -14,6 +13,7 @@
  * bin/check-cpu.sh
  * bin/metrics-cpu-mpstat.rb
  * bin/metrics-cpu-pcnt-usage.rb
+ * bin/metrics-numastat.rb
  * bin/metrics-user-pct-usage.rb
 
 ## Usage

data/bin/check-cpu.rb

@@ -31,6 +31,8 @@ require 'sensu-plugin/check/cli'
 # Check CPU
 #
 class CheckCPU < Sensu::Plugin::Check::CLI
+  CPU_METRICS = [:user, :nice, :system, :idle, :iowait, :irq, :softirq, :steal, :guest, :guest_nice].freeze
+
   option :warn,
          short: '-w WARN',
          proc: proc(&:to_f),
@@ -46,7 +48,18 @@ class CheckCPU < Sensu::Plugin::Check::CLI
          proc: proc(&:to_f),
          default: 1
 
-  [:user, :nice, :system, :idle, :iowait, :irq, :softirq, :steal, :guest].each do |metric|
+  option :proc_path,
+         long: '--proc-path /proc',
+         proc: proc(&:to_f),
+         default: '/proc'
+
+  option :idle_metrics,
+         long: '--idle-metrics METRICS',
+         description: 'Treat the specified metrics as idle. Defaults to idle,iowait,steal,guest,guest_nice',
+         proc: proc { |x| x.split(/,/).map { |y| y.strip.to_sym } },
+         default: [:idle, :iowait, :steal, :guest, :guest_nice]
+
+  CPU_METRICS.each do |metric|
     option metric,
            long: "--#{metric}",
            description: "Check cpu #{metric} instead of total cpu usage",
@@ -55,22 +68,20 @@ class CheckCPU < Sensu::Plugin::Check::CLI
   end
 
   def acquire_cpu_stats
-    File.open('/proc/stat', 'r').each_line do |line|
+    File.open("#{config[:proc_path]}/stat", 'r').each_line do |line|
       info = line.split(/\s+/)
       name = info.shift
-      return info.map(&:to_f) if name.match(/^cpu$/)
+      return info.map(&:to_f) if name =~ /^cpu$/
     end
   end
 
   def run
-    metrics = [:user, :nice, :system, :idle, :iowait, :irq, :softirq, :steal, :guest]
-
     cpu_stats_before = acquire_cpu_stats
     sleep config[:sleep]
     cpu_stats_after = acquire_cpu_stats
 
-    # Some kernels don't have a 'guest' value (RHEL5).
-    metrics = metrics.slice(0, cpu_stats_after.length)
+    # Some kernels don't have 'guest' and 'guest_nice' values
+    metrics = CPU_METRICS.slice(0, cpu_stats_after.length)
 
     cpu_total_diff = 0.to_f
     cpu_stats_diff = []
@@ -84,7 +95,9 @@ class CheckCPU < Sensu::Plugin::Check::CLI
       cpu_stats[i] = 100 * (cpu_stats_diff[i] / cpu_total_diff)
     end
 
-    cpu_usage = 100 * (cpu_total_diff - cpu_stats_diff[3]) / cpu_total_diff
+    idle_diff = metrics.each_with_index.map { |metric, i| config[:idle_metrics].include?(metric) ? cpu_stats_diff[i] : 0.0 }.reduce(0.0, :+)
+
+    cpu_usage = 100 * (cpu_total_diff - idle_diff) / cpu_total_diff
     checked_usage = cpu_usage
 
     self.class.check_name 'CheckCPU TOTAL'
@@ -100,8 +113,8 @@ class CheckCPU < Sensu::Plugin::Check::CLI
 
     message msg
 
-    critical if checked_usage > config[:crit]
-    warning if checked_usage > config[:warn]
+    critical if checked_usage >= config[:crit]
+    warning if checked_usage >= config[:warn]
     ok
   end
 end

data/bin/check-cpu.sh

@@ -24,6 +24,8 @@ while getopts ':w:c:h' OPT; do
   esac
 done
 
+PROC_PATH=${PROC_PATH:-'/proc'}
+
 # usage
 HELP="
     usage: $0 [ -w value -c value -p -h ]
@@ -44,7 +46,7 @@ if [ ${#cpuusage1} -eq 0 ]; then
   exit 2
 fi
 sleep 1
-cpuusage2=(`cat /proc/stat | head -1`)
+cpuusage2=(`cat $PROC_PATH/stat | head -1`)
 if [ ${#cpuusage2} -eq 0 ]; then
   echo "CRITICAL - CPU UNKNOWN"
   exit 2

data/bin/metrics-cpu-mpstat.rb

@@ -78,7 +78,7 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
       # assumes architecture's jiffie is 1/100th of a second
       columns.each_pair do |task, time|
         # #YELLOW
-        time = time / cpu_count if "#{cpu}" == 'cpu' # rubocop:disable Style/SelfAssignment
+        time = time / cpu_count if cpu.to_s == 'cpu' # rubocop:disable Style/SelfAssignment
         output "#{config[:scheme]}.#{cpu}.#{task}", time
       end
     end

data/bin/metrics-cpu-pcnt-usage.rb

@@ -36,15 +36,20 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.cpu"
 
+  option :proc_path,
+         long: '--proc-path /proc',
+         proc: proc(&:to_f),
+         default: '/proc'
+
   def acquire_proc_stats
     cpu_metrics = %w(user nice system idle iowait irq softirq steal guest)
-    File.open('/proc/stat', 'r').each_line do |line|
+    File.open("#{config[:proc_path]}/stat", 'r').each_line do |line|
       info = line.split(/\s+/)
       next if info.empty?
       name = info.shift
 
       # we are matching TOTAL stats and returning a hash of values
-      if name.match(/^cpu$/)
+      if name =~ /^cpu$/
         # return the CPU metrics sample as a hash
         # filter out nil values, as some kernels don't have a 'guest' value
         return Hash[cpu_metrics.zip(info.map(&:to_i))].reject { |_key, value| value.nil? }

data/bin/metrics-cpu.rb

@@ -36,17 +36,22 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.cpu"
 
+  option :proc_path,
+         long: '--proc-path /proc',
+         proc: proc(&:to_f),
+         default: '/proc'
+
   def run
     cpu_metrics = %w(user nice system idle iowait irq softirq steal guest)
     other_metrics = %w(ctxt processes procs_running procs_blocked btime intr)
     cpu_count = 0
 
-    File.open('/proc/stat', 'r').each_line do |line|
+    File.open("#{config[:proc_path]}/stat", 'r').each_line do |line|
       info = line.split(/\s+/)
       next if info.empty?
       name = info.shift
 
-      if name.match(/cpu([0-9]+|)/)
+      if name =~ /cpu([0-9]+|)/
         # #YELLOW
         cpu_count = cpu_count + 1 # rubocop:disable Style/SelfAssignment
         name = 'total' if name == 'cpu'

data/bin/metrics-numastat.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+#
+#   metrics-numastat
+#
+# DESCRIPTION:
+#   Simple wrapper around `numastat` for getting per-NUMA-node memory stats.
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2016 Mitsutoshi Aoe
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'socket'
+require 'sensu-plugin/metric/cli'
+
+class NumastatMetrics < Sensu::Plugin::Metric::CLI::Graphite
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: "#{Socket.gethostname}.numastat"
+
+  def run
+    begin
+      output = `/usr/bin/numastat`
+    rescue Errno::ENOENT => err
+      unknown err
+    end
+
+    nodes = []
+    output.each_line do |line|
+      nodes = line.split(' ') if nodes.empty?
+      next unless /^([^\s]+)\s+(.+)$/ =~ line
+      key = Regexp.last_match[1]
+      vals = Regexp.last_match[2]
+      next if key.nil? || vals.nil?
+      nodes.zip(vals.split(' ')).each do |node, val|
+        output "#{config[:scheme]}.#{node}.#{key}", val
+      end
+    end
+
+    ok
+  end
+end

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

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

metadata

@@ -1,203 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-cpu-checks
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  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-09-29 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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: linux-kstat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
 description: |-
   This plugin provides native CPU instrumentation
                                 for monitoring and metrics collection, including:
                                 CPU usage and metrics
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-user-pct-usage.rb
-- metrics-cpu.rb
-- metrics-cpu-pcnt-usage.rb
-- metrics-cpu-mpstat.rb
-- check-cpu.sh
 - check-cpu.rb
+- metrics-cpu-mpstat.rb
+- metrics-cpu-pcnt-usage.rb
+- metrics-cpu.rb
+- metrics-numastat.rb
+- metrics-user-pct-usage.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -209,6 +187,7 @@ files:
 - bin/metrics-cpu-mpstat.rb
 - bin/metrics-cpu-pcnt-usage.rb
 - bin/metrics-cpu.rb
+- bin/metrics-numastat.rb
 - bin/metrics-user-pct-usage.rb
 - lib/sensu-plugins-cpu-checks.rb
 - lib/sensu-plugins-cpu-checks/version.rb
@@ -230,7 +209,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:
   - - ">="
@@ -238,8 +217,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 cpu checks and metrics
 test_files: []
+has_rdoc: 

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-�����B���U�
� �:�E)!�F�*0W�y��A��2��7�ܺ��N�}g����a�ZM���\�r�y��
-|]�N�~�)��f�Q_������
 ʎd��/���/�vK�{��/4(��j�J�;��;f���I��{��iU�j�s�C΍�B\���
x`VY�ۮ}