sensu-plugins-memory-checks 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16fadb9f270e21852cda6c7aa1910cb2c635cf2d
-  data.tar.gz: 5953e5e1e94f2cc8136275f376a11c977408770e
+  metadata.gz: 7a1d5d0e1938f571decbc1ce64c880e8df3c9dd8
+  data.tar.gz: 80aa1e740198b518102d025d3a567fdee778e3d9
 SHA512:
-  metadata.gz: f2d7e865052c131db2d14a84446b8200ade62ad0e211bf3599e25fab1225446acf92c898076966dc2cc28e02f162acf96c6a4c0ac91305fb7797af5e42641759
-  data.tar.gz: 0e475773accf30edaa648dd04c04b69e1998dbfc505fcfd4917d6aa833e31b7d6c84e31943f941e27275f5235bdf20256f18f659735bf83e66e59ac899642b03
+  metadata.gz: b74df367aa33f827d401f82442560ef15788dee873a12a54623f8bdcc5ca90a9a1934196c868997630b98201da7932f0a4ee1a977396ceaa21a0aaf94485f5a4
+  data.tar.gz: 4303b07011fa7bbf82862c02617b4ad13342f37c63383801f464c8f7841a70e17cb88a374d1d986bc4da29f0854f740e0362346a0d319b0529dcd8714d164a43

data/CHANGELOG.md

@@ -3,9 +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][unreleased]
 
-## [0.0.4] - 2015-07-14
+## [0.0.7] - 2015-08-11
+### Fixed
+  - check-memory.sh, system may not have /etc/redhat-version
+
+### Changed
+- bump rubocop
+
+## [0.0.6] - 2015-07-30
+  - replaced `free` with vmstat gem to add more nix compatibility
+  - added option free (default to keep old default behavior)
+  - added option used to change check to checked used instead of memory free
+
+## [0.0.5] - 2015-07-14
 ### Fixed
 - fixed bad script filenames that prevented the checks for executing
 
@@ -33,3 +45,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
+[unreleased]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.7...HEAD
+[0.0.7]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.6...0.0.7
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.5...0.0.6
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.4...0.0.5
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.1...0.0.2

data/bin/check-memory.sh

@@ -41,7 +41,18 @@ fi
 WARN=${WARN:=0}
 CRIT=${CRIT:=0}
 
-if [ -f /etc/redhat-release ] && [ `awk '{print $3}' /etc/redhat-release` = "21" ]; then
+# validate fedora > 20 and rhel > 7.0 and centos > 7.0
+if [[ -f /etc/redhat-version && `awk '{print $3}' /etc/redhat-release` =~ ^2[0-9]{1} ]]; then
+   redhat_version=1
+elif [[ -f /etc/redhat-version && `awk '{print $7}' /etc/redhat-version` =~ ^7\.[0-9]{1} ]]; then
+   redhat_version=1
+elif [[ -f /etc/redhat-release && `awk '{print $4}' /etc/redhat-release` =~ ^7\.[0-9]{1} ]]; then
+   redhat_version=1
+else
+   redhat_version=0
+fi
+
+if [ -f /etc/redhat-release ] && [ $redhat_version = '1' ] ; then
   FREE_MEMORY=`free -m | grep Mem | awk '{ print $7 }'`
 else
   FREE_MEMORY=`free -m | grep buffers/cache | awk '{ print $4 }'`

data/bin/check-ram.rb

@@ -13,10 +13,15 @@
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
+#   gem: vmstat
 #
 # USAGE:
+#   check-ram.rb --help
 #
 # NOTES:
+#   The default behavior is to check % of RAM free. This can easily
+#   be overwritten via args please see `check-ram.rb --help` for details
+#   on each option.
 #
 # LICENSE:
 #   Copyright 2012 Sonian, Inc <chefs@sonian.net>
@@ -24,12 +29,27 @@
 #   for details.
 #
 require 'sensu-plugin/check/cli'
+require 'vmstat'
 
 class CheckRAM < Sensu::Plugin::Check::CLI
   option :megabytes,
          short: '-m',
          long: '--megabytes',
-         description: 'Unless --megabytes is specified the thresholds are in percents',
+         description: 'Unless --megabytes is specified the thresholds are in percentage of memory used as opposed to MB of ram left',
+         boolean: true,
+         default: false
+
+  option :free,
+         short: '-f',
+         long: '--free',
+         description: 'checks free threshold, defaults to true',
+         boolean: true,
+         default: true
+
+  option :used,
+         short: '-u',
+         long: '--used',
+         description: 'checks used threshold, defaults to false',
          boolean: true,
          default: false
 
@@ -44,29 +64,52 @@ class CheckRAM < Sensu::Plugin::Check::CLI
          default: 5
 
   def run
-    total_ram = 0
-    free_ram = 0
+    # calculating free and used ram based on: https://github.com/threez/ruby-vmstat/issues/4 to emulate free -m
+    mem = Vmstat.snapshot.memory
+    free_ram = mem.inactive_bytes + mem.free_bytes
+    used_ram = mem.wired_bytes + mem.active_bytes
+    total_ram = mem.total_bytes
 
-    `free -m`.split("\n").drop(1).each do |line|
-      # #YELLOW
-      free_ram = line.split[3].to_i if line =~ /^-\/\+ buffers\/cache:/ # rubocop:disable RegexpLiteral
-      total_ram = line.split[1].to_i if line =~ /^Mem:/
+    # only free or used should be defined, change defaults to mirror free
+    if config[:used]
+      config[:free] = false
+      config[:warn] = 90
+      config[:crit] = 95
     end
 
     if config[:megabytes]
-      message "#{free_ram} megabytes free RAM left"
-
-      critical if free_ram < config[:crit]
-      warning if free_ram < config[:warn]
-      ok
+      # free_ram is returned in Bytes. see: https://github.com/threez/ruby-vmstat/blob/master/lib/vmstat/memory.rb
+      free_ram /= 1024 / 1024
+      used_ram /= 1024 / 1024
+      total_ram /= 1024 / 1024
+      if config[:free]
+        ram = free_ram
+        message "#{ram} megabytes of RAM left"
+      # return used ram
+      elsif config[:used]
+        ram = used_ram
+        message "#{ram} megabytes of RAM used"
+      end
+    # use percentages
     else
       unknown 'invalid percentage' if config[:crit] > 100 || config[:warn] > 100
 
-      percents_left = free_ram * 100 / total_ram
-      message "#{percents_left}% free RAM left"
-
-      critical if percents_left < config[:crit]
-      warning if percents_left < config[:warn]
+      if config[:free]
+        ram = (free_ram / total_ram.to_f * 100).round(2)
+        message "#{ram}% RAM free"
+      elsif config[:used]
+        ram = (used_ram / total_ram.to_f * 100).round(2)
+        message "#{ram}% RAM used"
+      end
+    end
+    # determine state
+    if config[:free]
+      critical if ram <= config[:crit]
+      warning if ram <= config[:warn]
+      ok
+    elsif config[:used]
+      critical if ram >= config[:crit]
+      warning if ram >= config[:warn]
       ok
     end
   end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-memory-checks
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 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-15 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -46,6 +46,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: vmstat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,14 +164,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: yard
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +186,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Sensu plugins for checking memory
+description: |-
+  This plugin provides native memory instrumentation
+                                for monitoring and metrics collection, including:
+                                memory usage via `free` and `vmstat`, including metrics.
+                                Note that this plugin may have cross-platform issues.
 email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-memory.rb
@@ -227,7 +245,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 checking memory

metadata.gz.sig

@@ -1,2 +1,3 @@
-F^���4B�C])���8f���
-`7
+���jF�@�iW!��5�v�t��b��w-5*P�M'��ێ��6��ȣ�m��`�@��ʐ6׍U���.����հ��;�8BNDݨ�D�
+����4sU��mL^.�0C�՚�c�	���]�i���*��f��E�������bL����Zj���������
���gk��1��~h�X��~����n�Jy���I�ݫ�nGrSʽ��Ek��
+�zr9��%�l�"N2��D��