sensu-plugins-memory-checks 0.0.9 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2QxZGQ2Yjc5NjRhMTg5YjAyOTMyMjUxZTdhMTAwMzJjYTk0Yzg4NA==
+    NDVjYTBmZGMwMDMzMDZiNDQwNTM5NTMyYzcwZDQxMjk4MmI1N2RkNg==
   data.tar.gz: !binary |-
-    ZmQ2M2IzMzQ0MWUzMzJlOWJhMDYxNjhjODdjODdlYjYxMjVjMTYxMg==
+    MjVkNjVjMTQ0M2YyNzQwYjcyYTZhYjkyNjEzZWU2NmQxMDkwNmNjNw==
 SHA512:
   metadata.gz: !binary |-
-    ODljMjc0MGI0MTA4Y2IyNGZkNDZmMjE4Zjk0Y2EyODczMTEyODI3YzlkYWI2
-    NmNlN2E4ZWQwZDRkNjI0NGQ5NGM3MWUyM2Y4ZTA3YzYyYmNkODZjMzQ4ZjRi
-    MGMxMTI3ODQxNTgyNjdjNjAwYjcwZmE2OTY1OGE1ZWYxYjUyMzc=
+    MjFmMjU1OGQxYjI0OGYxZDg4NjM3NjgwYWQ0ODQ1MGRlNjU0OGNlMWRlMzVm
+    Y2M1MmY3MTk2NjNhY2RlNDQzN2U1M2ZlNGM1ZjFmZDE2ZDIyZTFkNjdjYTJk
+    NDRmNGI2MzczYzhhOGEzZjkxMGExYjA5ZmFhNDA2YWNlYjI4YWM=
   data.tar.gz: !binary |-
-    YTE4YmMwYzY0MzExZDg2NDJmOWYwNzUzMGE1MTliYjAxNTkwZjk0YTRkODQ4
-    NzAxMmQ2YTA5YzQ5OGMzMjc3ODZkZGIzNzg2ZTVlOTI1OTMwNjUzODU2YTcx
-    ZWZlZWMyODliMjc0ZGQ4MTI4ZTUxZjI0YTRkNjgwMjBkYWU1MTk=
+    MDljNjVhMmNlNTZjMGY2MGVhZDVhZTdjMDc5ZTc5YWRmMjIzNTlkM2ZhNTQ0
+    ZGMzNzFkNzAzNTEyZWM0NjhkYzdiMGMxYjkwM2U3ZWE5YjRjNWViMTBmYzBh
+    NTJhNWY4YmZjNTk4ZGIzNjUzZjZjMGIxN2IzNzcxYmNlYzVkNTI=

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]
+## [Unreleased]
+
+## [1.0.2] - 2016-04-12
+### Fixed
+- `check-memory.sh`: Update for Ubuntu 16.04 `free` output
+
+## [1.0.1] - 2016-03-07
+### Fixed
+- `check-memory-percent.sh` returned "MEM UNKNOWN" when less than 1% of memory was free
+
+## [1.0.0] - 2016-03-06
+### Changed
+- removed `vmstat` from a runtime dependency to remove gcc dependency.
+- added documentation about how you would install the required runtime dependencies if you are using `bin/check-ram.rb`.
+- added some checking to `bin/check-ram.rb` to be handled appropriately if you do not install the required dependencies.
 
 ## [0.0.9] - 2016-02-05
 ### Added
@@ -54,7 +68,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.9...HEAD
+[unreleased]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/1.0.2...HEAD
+[1.0.2]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/1.0.1...1.0.2
+[1.0.1]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/1.0.0...1.0.1
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.9...1.0.0
 [0.0.9]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.8...0.0.9
 [0.0.8]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.7...0.0.8
 [0.0.7]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/0.0.6...0.0.7

data/README.md

@@ -27,4 +27,10 @@
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
+### `bin/check-ram.rb`
+
+Ruby does not have a good native way without the use of C extensions to grab information on memory usage (outside of running shell commands and parsing out). Because of this `check-ram.rb` uses a gem called `vmstat` which has a somewhat annoying dependency on a gcc to compile the C extensions. In order to not force people to install gcc if they are not using `check-ram.rb` we do not install it by default, and is up to the user to make sure that they install it. This requires two steps and can vary based on your distribution and ruby set up:
+- Install `gcc`. If you are on a debian based system it is located in the `build-essential` package.
+- Install `vmstat` gem into the path that sensu gems are expected to run from: this is typically.
+
 ## Notes

data/bin/check-memory-percent.sh

@@ -3,8 +3,6 @@
 # Evaluate free system memory from Linux based systems based on percentage
 # This was forked from Sensu Community Plugins
 #
-# Requires: bc
-#
 # Date: 2007-11-12
 # Author: Thomas Borger - ESG
 # Date: 2012-04-02
@@ -13,6 +11,8 @@
 # Modified: Mario Harvey - Zumetrics
 # Date: 2015-01-10
 # Modified Ollie Armstrong <ollie@armstrong.io>
+# Date: 2016-02-15
+# Modified: J. Brandt Buckley <brandt.buckley@sendgrid.com>
 
 # get arguments
 
@@ -55,7 +55,7 @@ if [ $? -ne 0 ];
   FreeMem=$(free -m | grep Mem | awk '{ print $7 }')
 fi
 #Get percentage of free memory
-FreePer=$(echo "scale=3; $FreeMem / $TotalMem * 100" | bc -l| cut -d "." -f1)
+FreePer=$(awk -v total="$TotalMem" -v free="$FreeMem" 'BEGIN { printf("%-10f\n", (free / total) * 100) }' | cut -d. -f1)
 #Get actual memory usage percentage by subtracting free memory percentage from 100
 UsedPer=$((100-$FreePer))
 

data/bin/check-memory.sh

@@ -41,21 +41,10 @@ fi
 WARN=${WARN:=0}
 CRIT=${CRIT:=0}
 
-# validate fedora > 20 and rhel > 7.0 and centos > 7.0
-if [[ -f /etc/redhat-version && `egrep "2[0-9]{1}" /etc/redhat-release` ]]; then
-   redhat_version=1
-elif [[ -f /etc/redhat-version && `egrep "7\.[0-9]{1}" /etc/redhat-version` ]]; then
-   redhat_version=1
-elif [[ -f /etc/redhat-release && `egrep "7\.[0-9]{1}" /etc/redhat-release` ]]; 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 }'`
+set -o pipefail
+FREE_MEMORY=$(free -m | grep buffers/cache | awk '{ print $4 }')
+if [ $? -ne 0 ]; then
+  FREE_MEMORY=$(free -m | grep Mem | awk '{ print $7 }')
 fi
 
 if [ "$FREE_MEMORY" = "" ]; then

data/bin/check-ram.rb

@@ -14,10 +14,14 @@
 # DEPENDENCIES:
 #   gem: sensu-plugin
 #   gem: vmstat
+#   compiler: gcc
 #
 # USAGE:
 #   check-ram.rb --help
 #
+# EXTRA INSTALL INSTRUCTIONS:
+#   You must install gcc. This is needed to compile the vmstat gem
+#   which you must put in a path that sensu can reach.
 # 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
@@ -64,6 +68,13 @@ class CheckRAM < Sensu::Plugin::Check::CLI
          default: 5
 
   def run
+    begin
+      require 'vmstat'
+    rescue LoadError => e
+      raise unless e.message =~ /vmstat/
+      unknown "Error unable to load vmstat gem: #{e}"
+    end
+
     # 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

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

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

metadata

@@ -1,45 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-memory-checks
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.2
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURuakNDQW9hZ0F3SUJB
-  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJLTVJVd0V3WURWUVFEREF4elpX
-  NXoKZFMxd2JIVm5hVzR4SFRBYkJnb0praWFKay9Jc1pBRVpGZzF6Wlc1emRT
-  MXdiSFZuYVc1ek1SSXdFQVlLQ1pJbQppWlB5TEdRQkdSWUNhVzh3SGhjTk1U
-  WXdNakEwTWpNeU1qRTNXaGNOTVRjd01qQXpNak15TWpFM1dqQktNUlV3CkV3
-  WURWUVFEREF4elpXNXpkUzF3YkhWbmFXNHhIVEFiQmdvSmtpYUprL0lzWkFF
-  WkZnMXpaVzV6ZFMxd2JIVm4KYVc1ek1SSXdFQVlLQ1pJbWlaUHlMR1FCR1JZ
-  Q2FXOHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpnZ0VLQW9J
-  QkFRQy9VUzNmdEkyUmQrOWQzS3JIQUw0bERsOGxhN2s2ZHA3K1RPY210VHd3
-  YzRiMUwzV0NyeEFoClpDWms1Q3k2aUpvWUd4VHVoNittSDJZZ3ExbHZGRE4v
-  NTh5YVRHTVFINzNRYVJjZjVnak9IMkJSQTlkUWRzWUgKYTNZYnMrbGxwVlYv
-  ZC9kMklaYyt2RU9tc21rTFpVeEhzZFdQSTZsWTBuYXJwU2RxNHNML0lXWWZP
-  aW1ocFFTWgpTV0t5WHg5cjM4UFpZZ0Q3djIydjloNTZkcUpQZFFPY29OODhF
-  NkE4YTdQWTcvL1RweWdTREtuSldudkFwS1JxCjNCN0xMaFNkOTRQMHdRcGow
-  MS9sb05Nd0FCMytGQjRRQ0UrdG1QeFYxZ1Q2ZWE4VW1SNjQrcGZKTFN0NGl5
-  N0gKVGc5OTdCZFZqaURJdG5SYzhCSXNjVFl4S2JRai9wTEhBZ01CQUFHamdZ
-  NHdnWXN3Q1FZRFZSMFRCQUl3QURBTApCZ05WSFE4RUJBTUNCTEF3SFFZRFZS
-  ME9CQllFRk5McjBmZ1BmdnlWK0VneEVGRHhVcVFhU2xScE1DZ0dBMVVkCkVR
-  UWhNQitCSFhObGJuTjFMWEJzZFdkcGJrQnpaVzV6ZFMxd2JIVm5hVzV6TG1s
-  dk1DZ0dBMVVkRWdRaE1CK0IKSFhObGJuTjFMWEJzZFdkcGJrQnpaVzV6ZFMx
-  d2JIVm5hVzV6TG1sdk1BMEdDU3FHU0liM0RRRUJCUVVBQTRJQgpBUUNQZTZ0
-  RUJ0NS9uQzk1aFhvS2VLRmhrWVc5bTE2aU5YdWRKeEorZGRYcnpDc2tEMXk2
-  ajZjQXY0a1FlUDFmClBIbDE4aDVrOWtKeElQU1IrcUkrK2JJbDE3ZUVPU096
-  YXNMbXdzdGFNU25NN3U1UWZMcFdFWTJldVZXQkRzdGQKMmhrcG80VSswSzVT
-  d3ptZEphMFdLQXRmS3ZkdENROGk5MllJUCtIODNFdXZDU0xwZ29aaDYzRXJx
-  dVFVY25lbgphZmg1bHVUQkExaTFjcUJHNEFNSjBmTFdHeU9xSmFYOFA5WnN4
-  RERXUEVCbk5TaVd2WGIrSUttSkFWTzF1VzRrClFOODNielZXU1d1bFk4Qlk2
-  a1grSVFNd1lhelpBbEIvMTNkN2E4VTBoN0NyYjM2Sm5TUGF0aHVSemU0cUtY
-  RlEKM2YzVFVaV3d2UmZ0Y1N1K3Z0Y0JSa00wCi0tLS0tRU5EIENFUlRJRklD
-  QVRFLS0tLS0K
-date: 2016-02-06 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -55,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-- !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
@@ -181,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: vmstat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement

checksums.yaml.gz.sig

@@ -1,3 +0,0 @@
-'���,�ǡ_���ٗ�8���>0�6���x��!��{/���?
o_����*3��Ʃ��O$�hv*�od^`��
-/��X;�R�2�Y�E"���<g~��~?-Żb>TC��s�,C�/�Ѐ��/���P���/[�zx^�#4���X�J�bg|�i��E
-n�@�-��xl�
;�xP{rZ��h$��b�ih3�l���\�M�]2�6�p��]�O	dȿx���ÖR�]WZ�

metadata.gz.sig

@@ -1,2 +0,0 @@
-?��n��^�c���
-���a@Q�6�J15GCUa<��1a�L�˛:�iA��j����X�u��3CkM�"ם��Ƴ��W�L�#���>��rr�)1v��4�9��l(Z��H���|�}��g���b�[��H���YI*e��&���tT�¥*Y!���6��W�ׂs�`�ΐD8j�+�0E�c����͛8�nl���՜T����p