Have percent option check strip out the % char, for ease in future comparisons.

diff --git a/check_postgres.pl b/check_postgres.pl
index 12cdecfc1981f28e076a9e271c8b2d63ecb918ad..2f9e204fa2ae741bc84ce7f623482ee55e9c089d 100755 (executable)
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -2383,17 +2383,17 @@ sub validate_range {
     }
     elsif ('percent' eq $type) {
         if (length $critical) {
-            if ($critical !~ /^\d+\%$/) {
+            if ($critical !~ /^(\d+)\%$/) {
                 ndie msg('range-badpercent', 'critical');
             }
+            $critical = $1;
         }
         if (length $warning) {
-            if ($warning !~ /^\d+\%$/) {
+            if ($warning !~ /^(\d+)\%$/) {
                 ndie msg('range-badpercent', 'warning');
             }
+            $warning = $1;
         }
-        $warning = $warning if length $warning;
-        $critical = $critical if length $warning;
     }
     elsif ('size or percent' eq $type) {
         if (length $critical) {

diff --git a/t/01_validate_range.t b/t/01_validate_range.t
index 2507c671f68715ccab2a3095259a0ff0b8daf76c..a41bf34fa8f5b704accafbd52931e98c9b928518 100644 (file)
--- a/t/01_validate_range.t
+++ b/t/01_validate_range.t
@@ -214,8 +214,8 @@ PERCENT: {
         warning  => '5%',
     );
     my ($w, $c) = check_postgres::validate_range({ type => 'percent' });
-    is $w, '5%', 'Should have warning == 5%';
-    is $c, '90%', 'Should have critical == 90%';
+    is $w, '5', 'Should have warning == 5%';
+    is $c, '90', 'Should have critical == 90%';
 }
 
 SIZEORPERCENT: {