sensu-plugins-memory-checks 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec6d4660a7f927b54cd274e22ceef287f513d13a
-  data.tar.gz: 9d0007c7913e819aa355062fd7fada718e972cf1
+  metadata.gz: 5f690ce16be4963eb209c4301139f46697da8709
+  data.tar.gz: e231936896b20a46c5488d0d0536824dd16a4b4a
 SHA512:
-  metadata.gz: d150f834df549dbe372c56734e4c29e3795b67e4e04b4888bc2f8f3e7d929941ce8fefcc1efd3aaa770de60ff394cd4c3c55fb8eb1fdd0df1bdbcf14593795f0
-  data.tar.gz: 06c7b2cb773efe88af5b9782e686788b10019e8fc2883ff42ae8a684d54f3c3250ba50b65cb6bc6d8122ff03e2f101c189235111692a5031412d7f206d77b36b
+  metadata.gz: 5290ac02abd1cb7839a107e7b61bfb1693980bff74c4ff313d47bba5aa176c6ef3ff14ecac4bf767cf1e1a0cc51a68ed0764019669fd0f60a768b82e6eae2dac
+  data.tar.gz: b0cd272dd1ba55d148afce41a2ba386c92ad435115c3dfd7e56aab619f1abfed0638340ba5eea70f9f97d819f7575675e79ba2d284d74d71c6491955bf187e0d

data/CHANGELOG.md

@@ -1,10 +1,17 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the located [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [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)
+
+### Added
+- update CHANGELOG guidelines location (@majormoses)
+
 ## [3.0.2] - 2017-07-31
 ### Fixed
 - check-memory-percent.rb, check-memory.rb: fix shell call response when running on non en_US locale systems (@stefan-walluhn)

data/bin/metrics-memory-percent.rb

@@ -59,13 +59,20 @@ class MemoryGraphite < Sensu::Plugin::Metric::CLI::Graphite
       mem['swapTotal'] = line.split(/\s+/)[1].to_i * 1024 if line =~ /^SwapTotal/
       mem['swapFree']  = line.split(/\s+/)[1].to_i * 1024 if line =~ /^SwapFree/
       mem['dirty']     = line.split(/\s+/)[1].to_i * 1024 if line =~ /^Dirty/
+      mem['available'] = line.split(/\s+/)[1].to_i * 1024 if line =~ /^MemAvailable/
     end
 
     mem['swapUsed'] = mem['swapTotal'] - mem['swapFree']
     mem['used'] = mem['total'] - mem['free']
-    mem['usedWOBuffersCaches'] = mem['used'] - (mem['buffers'] + mem['cached'])
-    mem['freeWOBuffersCaches'] = mem['free'] + (mem['buffers'] + mem['cached'])
 
+    # if MemAvailable exist, use it to calculate "available memory"
+    if mem.key?('available')
+      mem['usedWOBuffersCaches'] = mem['total'] - mem['available']
+      mem['freeWOBuffersCaches'] = mem['available']
+    else
+      mem['usedWOBuffersCaches'] = mem['used'] - (mem['buffers'] + mem['cached'])
+      mem['freeWOBuffersCaches'] = mem['free'] + (mem['buffers'] + mem['cached'])
+    end
     # to prevent division by zero
     swptot = if mem['swapTotal'].zero?
                1

data/bin/metrics-memory.rb

@@ -55,12 +55,19 @@ class MemoryGraphite < Sensu::Plugin::Metric::CLI::Graphite
       mem['swapTotal'] = line.split(/\s+/)[1].to_i * 1024 if line =~ /^SwapTotal/
       mem['swapFree']  = line.split(/\s+/)[1].to_i * 1024 if line =~ /^SwapFree/
       mem['dirty']     = line.split(/\s+/)[1].to_i * 1024 if line =~ /^Dirty/
+      mem['available'] = line.split(/\s+/)[1].to_i * 1024 if line =~ /^MemAvailable/
     end
 
     mem['swapUsed'] = mem['swapTotal'] - mem['swapFree']
     mem['used'] = mem['total'] - mem['free']
-    mem['usedWOBuffersCaches'] = mem['used'] - (mem['buffers'] + mem['cached'])
-    mem['freeWOBuffersCaches'] = mem['free'] + (mem['buffers'] + mem['cached'])
+    # if MemAvailable exist, use it to calculate "available memory"
+    if mem.key?('available')
+      mem['usedWOBuffersCaches'] = mem['total'] - mem['available']
+      mem['freeWOBuffersCaches'] = mem['available']
+    else
+      mem['usedWOBuffersCaches'] = mem['used'] - (mem['buffers'] + mem['cached'])
+      mem['freeWOBuffersCaches'] = mem['free'] + (mem['buffers'] + mem['cached'])
+    end
     mem['swapUsedPercentage'] = 100 * mem['swapUsed'] / mem['swapTotal'] if mem['swapTotal'] > 0
 
     mem

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

@@ -2,7 +2,7 @@ module SensuPluginsMemoryChecks
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
 
     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.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-09-23 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.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for checking memory