From bd782990566eec91b8312cfc2765a7e2bd9e67da Mon Sep 17 00:00:00 2001 From: Andreas Ericsson Date: Fri, 2 Nov 2012 14:44:16 +0100 Subject: Make check_snmp backwards compatible in how it parses thresholds Once upon a time, check_snmp used to accept inverse ranges in the format of '2:1' to mean "alert if value is inside this range". Since commit 7cb3ae09334796f3b54e4e6438e38c2cc679b360, ranges such as those have instead triggered the error "Range format incorrect" and resulted in an UNKNOWN warning state. This patch attempts to fix the situation so that the old-style ranges continues to mean exactly what the once did and people with lots of snmp checks can avoid a bazillion false positives from their environments. Signed-off-by: Andreas Ericsson --- plugins/check_snmp.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'plugins') diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 2d9861bc..0ddfb942 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -144,6 +144,25 @@ double previous_value[MAX_OIDS]; int perf_labels = 1; +static char *fix_snmp_range(char *th) +{ + double left, right; + char *colon, *ret; + if (!(colon = strchr(th, ':'))) + return th; + *colon = 0; + + left = strtod(th, NULL); + right = strtod(colon + 1, NULL); + if (right >= left) { + return th; + } + ret = malloc(strlen(th) + strlen(colon + 1) + 2); + sprintf(ret, "@%s:%s", colon + 1, th); + free(th); + return ret; +} + int main (int argc, char **argv) { @@ -228,6 +247,10 @@ main (int argc, char **argv) for (i=0; i