Răsfoiți Sursa

check_snmp: Thresholds were being shown twice

Adding thresholds to performance data was done by two separate commits:
ea8b9c7 on February 11, 2014
a5f868e on March 4, 2014

It looks like the two didn't know about each other, so they were added
in two different ways. I removed ea8b9c7 from Feb 11.
John C. Frickson 9 ani în urmă
părinte
comite
6cfe07512a
3 a modificat fișierele cu 2 adăugiri și 11 ștergeri
  1. 1 0
      NEWS
  2. 1 0
      THANKS.in
  3. 0 11
      plugins/check_snmp.c

+ 1 - 0
NEWS

@@ -13,6 +13,7 @@ This file documents the major additions and syntax changes between releases.
 	check_disk: missing -lrt on Solaris
 	check_http: segmentation fault
 	check_http: help text update for virtual hosts
+	check_snmp: Thresholds were being shown twice
 
 
 2.1.4 2016-11-17

+ 1 - 0
THANKS.in

@@ -66,6 +66,7 @@ Craig Orsinger
 Damian Myerscough
 Daniel Austin
 Daniel Bimschas
+Daniel Leib
 Daniël van Eeden
 Dann Frazier
 Darian Rackham

+ 0 - 11
plugins/check_snmp.c

@@ -599,17 +599,6 @@ main (int argc, char **argv)
 				strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
 				}
 
-			if (warning_thresholds) {
-				strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
-				strncat(perfstr, warning_thresholds, sizeof(perfstr)-strlen(perfstr)-1);
-			}
-
-			if (critical_thresholds) {
-				if (!warning_thresholds) strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
-				strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
-				strncat(perfstr, critical_thresholds, sizeof(perfstr)-strlen(perfstr)-1);
-			}
-
 			if (type)
 				strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);