From 89f49125800c7ac7eea37b97be27f9b82ebf0537 Mon Sep 17 00:00:00 2001 From: Ben Abrams Date: Fri, 14 Oct 2016 10:27:28 -0700 Subject: [PATCH] closes #46 (#47) - breaking change: remove hardcoded values when using `--used`. (major vertsion bump) - appease rubocop --- CHANGELOG.md | 3 +++ bin/check-ram.rb | 2 -- bin/metrics-memory-percent.rb | 2 +- lib/sensu-plugins-memory-checks/version.rb | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f072e8..5ccce3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/). This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/) ## [Unreleased] + +## [2.0.0] - 2016-10-14 ### Fixed - `check-memory-percent.sh`: Corrected units (from MB to %) in performance data output +- `check-ram.rb`: fixed overwriting of cli args for warning and critical when using `--used` ## [1.0.2] - 2016-04-12 ### Fixed diff --git a/bin/check-ram.rb b/bin/check-ram.rb index e2d14f6..849c700 100755 --- a/bin/check-ram.rb +++ b/bin/check-ram.rb @@ -85,8 +85,6 @@ def run # 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] diff --git a/bin/metrics-memory-percent.rb b/bin/metrics-memory-percent.rb index fe43e84..9cac953 100755 --- a/bin/metrics-memory-percent.rb +++ b/bin/metrics-memory-percent.rb @@ -67,7 +67,7 @@ def metrics_hash mem['freeWOBuffersCaches'] = mem['free'] + (mem['buffers'] + mem['cached']) # to prevent division by zero - swptot = if mem['swapTotal'] == 0 + swptot = if mem['swapTotal'].zero? 1 else mem['swapTotal'] diff --git a/lib/sensu-plugins-memory-checks/version.rb b/lib/sensu-plugins-memory-checks/version.rb index 0555ba4..78bd6bf 100644 --- a/lib/sensu-plugins-memory-checks/version.rb +++ b/lib/sensu-plugins-memory-checks/version.rb @@ -1,8 +1,8 @@ module SensuPluginsMemoryChecks module Version - MAJOR = 1 + MAJOR = 2 MINOR = 0 - PATCH = 2 + PATCH = 0 VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.') end