byteConvert: require 'B' suffix

this will avoid matching '500' as '50' to $number and '0' to $type

diff --git a/check_elvis_status.php b/check_elvis_status.php
index e5b0f26de190e939964da2e8d655a73c33d6f94d..b8422384126e321860dcdd19699d0b9f78a42d8e 100755 (executable)
--- a/check_elvis_status.php
+++ b/check_elvis_status.php
@@ -50,7 +50,7 @@ Plugin action specific options:
  * http://stackoverflow.com/questions/11807115/php-convert-kb-mb-gb-tb-etc-to-bytes
  */
 function byteConvert($input) {
-       if (!preg_match('/^(?P<number>[\d.,]+)\s*(?P<type>\w+)$/', $input, $m)) {
+       if (!preg_match('/^(?P<number>[\d.,]+)\s*(?P<type>\w+B)$/i', $input, $m)) {
                return $input;
        }
 

diff --git a/nagios-plugin-check_elvis_status.spec b/nagios-plugin-check_elvis_status.spec
index 2ef70b0cf8d7675f6986d1b94a47ce7e17cf45d9..2f29471ca86310286a14ee51a340d84f3da30ac4 100644 (file)
--- a/nagios-plugin-check_elvis_status.spec
+++ b/nagios-plugin-check_elvis_status.spec
@@ -4,7 +4,7 @@
 Summary:       Nagios plugin to check Elvis DAM status
 Name:          nagios-plugin-%{plugin}
 Version:       0.1
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Networking
 Source0:       %{plugin}.php