sensu-plugins-memory-checks 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f690ce16be4963eb209c4301139f46697da8709
-  data.tar.gz: e231936896b20a46c5488d0d0536824dd16a4b4a
+  metadata.gz: db85b632d9bdb38bc83d3c7b3083bd49592a1a14
+  data.tar.gz: 7fa43c23d1fa44bbd6c052c917e7824f96a1fd32
 SHA512:
-  metadata.gz: 5290ac02abd1cb7839a107e7b61bfb1693980bff74c4ff313d47bba5aa176c6ef3ff14ecac4bf767cf1e1a0cc51a68ed0764019669fd0f60a768b82e6eae2dac
-  data.tar.gz: b0cd272dd1ba55d148afce41a2ba386c92ad435115c3dfd7e56aab619f1abfed0638340ba5eea70f9f97d819f7575675e79ba2d284d74d71c6491955bf187e0d
+  metadata.gz: 6396c87b11b9137b7929a8eb6e4527566801fec573795f6e61bf21e5ccfefb5cecdb889b8eac56473e385eabbdaf6014152c25fad6d645cc33ef171487fc5a13
+  data.tar.gz: ead6a65b68768c5b0f7740d27eccc43ecedca200af99e56013551510ef762abfd66234cdc3ce7fc6664f15bb0e87aca0e3a4ed9fa5a9d5935422b16e7add1553

data/CHANGELOG.md

@@ -5,6 +5,15 @@ This CHANGELOG follows the located [here](https://github.com/sensu-plugins/commu
 
 ## [Unreleased]
 
+## [3.1.1] - 2017-10-25
+### Fixed
+- check-memory-percent.sh: compare variable `$os` rather than the string 'os' (@lcc207)
+
+## [3.1.0] - 2017-10-20
+### Added
+- check-memory-percent.sh: added osx support (@jjdiazgarcia)
+- check-memory-percent.sh: make if statement syntax consistent with the script (@majormoses)
+
 ## [3.0.3] - 2017-09-23
 ### Fixed
 - metrics-memory-percent.rb, metrics-memory.rb: change 'usedWOBuffersCaches' and 'freeWOBuffersCaches' calculation to use MemAvailable in /proc/meminfo when available. (@jpoizat)
@@ -121,7 +130,9 @@ This CHANGELOG follows the located [here](https://github.com/sensu-plugins/commu
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/3.0.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/3.1.0...HEAD
+[3.1.1]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/3.1.0...3.1.1
+[3.1.0]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/3.0.1...3.1.0
 [3.0.2]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/3.0.1...3.0.2
 [3.0.1]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-memory-checks/compare/2.1.0...3.0.0

data/bin/check-memory-percent.sh

@@ -48,15 +48,23 @@ fi
 WARN=${WARN:=80}
 CRIT=${CRIT:=90}
 
-#Get total memory available on machine
-TotalMem=$(free -m | grep Mem | awk '{ print $2 }')
-#Determine amount of free memory on the machine
-set -o pipefail
-FreeMem=$(free -m | grep buffers/cache | awk '{ print $4 }')
-if [ $? -ne 0 ];
-  then
-  FreeMem=$(free -m | grep Mem | awk '{ print $7 }')
+os=$(uname)
+if [ $os = "Darwin" ]; then
+  #Get total memory available on machine
+  TotalMem=$(sysctl -a | grep '^hw\.m' | cut -d" " -f2)
+  #Determine amount of free memory on the machine
+  FreeMem=$(vm_stat | grep "Pages free" | tr -d '[:space:]' | cut -d: -f2 | cut -d. -f1)
+elif [ $os = "Linux" ]; then
+  #Get total memory available on machine
+  TotalMem=$(free -m | grep Mem | awk '{ print $2 }')
+  #Determine amount of free memory on the machine
+  set -o pipefail
+  FreeMem=$(free -m | grep buffers/cache | awk '{ print $4 }')
+  if [ $? -ne 0 ]; then
+    FreeMem=$(free -m | grep Mem | awk '{ print $7 }')
+  fi
 fi
+
 #Get percentage of free memory
 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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-memory-checks
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-23 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for checking memory