sensu-plugins-cpu-checks 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1cb13bff39fee1b707508ac08fddfd3724e6893
-  data.tar.gz: b9dbf16aed23205077bd3888d9c7d4671c563d28
+  metadata.gz: a074d040a240dead20971944d166b6e3b7505284
+  data.tar.gz: e671bc4985a80ebb41d2c9b53be24d1ddcf34244
 SHA512:
-  metadata.gz: 676e5fe84e82f170c01ae9801c5ee4b3b117eb078888ca96e520933ade0a1acb64c2007a77fdd1773c783704a737a140207a9ec938620b95f1361c55bd33dc11
-  data.tar.gz: c70ff013c9f503304f562c6b12e1c27fcc6e8d17afa4f20203c10a0608b305c1d88ca65484ebda354839adfb0945d7880effdfe8408c91dbfc7ca4d0f1d3da79
+  metadata.gz: 9d4ad55878708411784d6450da44a9bfadde539bffb07f71d9963e33882e1a7362a272e01846be521e06650228cdff64d4e0d74d3317d5a1e128a77190fd4433
+  data.tar.gz: 1937bbd262e78d1b56670c083fdbf113a82400fa113ceea3800bfba5d0d192153844358159ffc05f06d27415d846b71b72b7a8a9891eeeb45947e56fd03fd013

data/CHANGELOG.md

@@ -3,7 +3,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased][unreleased]
+## Unreleased
+
+## [0.0.4] - 2015-09-29
+### Changed
+- Fix getopts syntax in check-cpu.sh
+- Improvements to system/metrics-user-pct-usage.rb (option to use uid instead of username)
 
 ## [0.0.3] - 2015-07-14
 ### Changed
@@ -20,4 +25,4 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - added binstubs
 
 ### Changed
-- removed cruft from /lib
+- removed cruft from /lib

data/README.md

@@ -20,6 +20,6 @@
 
 ## Installation
 
-[Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md)
+[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes

data/bin/check-cpu.rb

@@ -62,7 +62,7 @@ class CheckCPU < Sensu::Plugin::Check::CLI
     end
   end
 
-  def run # rubocop:disable all
+  def run
     metrics = [:user, :nice, :system, :idle, :iowait, :irq, :softirq, :steal, :guest]
 
     cpu_stats_before = acquire_cpu_stats

data/bin/check-cpu.sh

@@ -15,7 +15,7 @@
 # for details.
 
 # get arguments
-while getopts 'w:c:h' OPT; do
+while getopts ':w:c:h' OPT; do
   case $OPT in
     w)  WARN=$OPTARG;;
     c)  CRIT=$OPTARG;;

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

@@ -57,7 +57,7 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
     metrics.values.reduce { |sum, metric| sum + metric } # rubocop:disable SingleLineBlockParams
   end
 
-  def run # rubocop:disable all
+  def run
     cpu_sample1 = acquire_proc_stats
     sleep(1)
     cpu_sample2 = acquire_proc_stats
@@ -72,7 +72,7 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
     cpu_sample_diff = Hash[cpu_sample2.map { |k, v| [k, v - cpu_sample1[k]] }]
 
     cpu_metrics.each do |metric|
-      metric_val = sprintf('%.02f', (cpu_sample_diff[metric] / cpu_total_diff.to_f) * 100) # rubocop:disable all
+      metric_val = sprintf('%.02f', (cpu_sample_diff[metric] / cpu_total_diff.to_f) * 100)
       output "#{config[:scheme]}.#{metric}", metric_val
     end
     ok

data/bin/metrics-cpu.rb

@@ -36,7 +36,7 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.cpu"
 
-  def run # rubocop:disable all
+  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

data/bin/metrics-user-pct-usage.rb

@@ -47,23 +47,32 @@ class UserPercent < Sensu::Plugin::Metric::CLI::Graphite
          long: '--ignore_inactive',
          default: true
 
-  def run # rubocop:disable all
+  option :uid,
+         description: 'Boolean. If true, uses uid instead of username',
+         long: '--uid',
+         default: false
+
+  def run
     timestamp = Time.now.to_i
-    pslist = `ps -A -o user= -o %cpu=`
+    usertype = config[:uid] ? 'uid' : 'user'
+    pslist = `ps -A -o #{usertype}= -o %cpu= -o %mem=`
 
     users = {}
     pslist.lines.each do |line|
-      user, value = line.split
-      h = { user => value.to_f }
-      users = users.merge(h) { |_key, oldval, newval| newval + oldval }
+      user, cpu, mem = line.split
+      users[user] = {} unless users[user]
+      h = { 'cpu' => cpu.to_f, 'mem' => mem.to_f }
+      users[user] = users[user].merge(h) { |_key, oldval, newval| newval + oldval }
     end
 
     if config[:ignore_inactive]
-      users.delete_if { |_key, value| value == 0 }
+      users.delete_if { |_key, value| value['cpu'] == 0 }
     end
 
-    users.each do |key, value|
-      output [config[:scheme], key].join('.'), value, timestamp
+    users.each do |user, h|
+      h.each do |key, value|
+        output [config[:scheme], user].join(".#{key}."), value, timestamp
+      end
     end
     ok
   end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-cpu-checks
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sensu Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: Sensu plugins for cpu checks and metrics
+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
@@ -235,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for cpu checks and metrics