Merge pull request #50 from Yornik/master

Removed the name of the metric if exit status is warn or critical.
inuits · Jan 17, 2018 · 391da25 · 391da25
2 parents 22b87d8 + 5a93171
commit 391da25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.txt b/build.txt
@@ -66,7 +66,7 @@ check_rabbitmq-sync.rb                1.0
 check_zmstatus.pl                     1.0
 check_ssl-cert                        1.0
 check_topology-latency.rb             1.0
-check_graphite-metric                 1.1
+check_graphite-metric                 1.2
 check_oom-killer.rb                   0.1.2
 check_bgp                             1.1
 

diff --git a/check_graphite-metric b/check_graphite-metric
@@ -259,7 +259,7 @@ else
 			fi
 		fi
 		[ $METRIC_STATUS -gt $EXIT_NAGIOS_STATUS ] && EXIT_NAGIOS_STATUS=$METRIC_STATUS
-		[ "${QUIET_OUTPUT}" != 1 ] || [ $METRIC_STATUS -gt 0 ] && CHECK_OUTPUT="${CHECK_OUTPUT}${METRIC}=${RES_VALUES[$METRIC]}; "
+		[ "${QUIET_OUTPUT}" != 1 ] || [ $METRIC_STATUS -gt 0 ] && CHECK_OUTPUT="${CHECK_OUTPUT}=${RES_VALUES[$METRIC]}; "
 	done
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -259,7 +259,7 @@ else @@
     			fi
     		fi
     		[ $METRIC_STATUS -gt $EXIT_NAGIOS_STATUS ] && EXIT_NAGIOS_STATUS=$METRIC_STATUS
-    		[ "${QUIET_OUTPUT}" != 1 ] || [ $METRIC_STATUS -gt 0 ] && CHECK_OUTPUT="${CHECK_OUTPUT}${METRIC}=${RES_VALUES[$METRIC]}; "
+    		[ "${QUIET_OUTPUT}" != 1 ] || [ $METRIC_STATUS -gt 0 ] && CHECK_OUTPUT="${CHECK_OUTPUT}=${RES_VALUES[$METRIC]}; "
     	done
     fi
@@ Expand Down @@