![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index bf2102220b06140c61ff5a11f28bfb69b91c2557..9d9194225b4ee8d5f9facffc3e022e7ff198e741 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
/* Longopts only arguments */
#define L_CALCULATE_RATE CHAR_MAX+1
#define L_RATE_MULTIPLIER CHAR_MAX+2
+#define L_INVERT_SEARCH CHAR_MAX+3
/* Gobble to string - stop incrementing c when c[0] match one of the
* characters in s */
char *port;
char *snmpcmd;
char string_value[MAX_INPUT_BUFFER] = "";
+int invert_search=0;
char **labels = NULL;
char **unitv = NULL;
size_t nlabels = 0;
char *outbuff;
char *ptr = NULL;
char *show = NULL;
+ char *endptr = NULL;
char *th_warn=NULL;
char *th_crit=NULL;
char type[8] = "";
}
}
+ /* Allow numeric conversion if whole string is a number. Make concession for strings with " at beginning or end */
+ /* This duplicates the conversion a bit later, but is cleaner to separate out the checking against the conversion */
+ ptr = show;
+ if (*ptr == '"')
+ ptr++;
+ if (*ptr != '\0' ) {
+ strtod( ptr, &endptr );
+ if (*endptr == '"')
+ endptr++;
+ if (*endptr == '\0')
+ is_numeric=1;
+ }
+
}
else if (strstr (response, "Timeticks: "))
show = strstr (response, "Timeticks: ");
duration = current_time-previous_state->time;
if(duration<=0)
die(STATE_UNKNOWN,_("Time duration between plugin calls is invalid"));
- temp_double = (response_value[i]-previous_value[i])/duration;
+ temp_double = response_value[i]-previous_value[i];
/* Simple overflow catcher (same as in rrdtool, rrd_update.c) */
if(is_counter) {
if(temp_double<(double)0.0)
if(temp_double<(double)0.0)
temp_double+=(double)18446744069414584320.0; /* 2^64-2^32 */;
}
+ /* Convert to per second, then use multiplier */
+ temp_double = temp_double/duration*rate_multiplier;
iresult = get_status(temp_double, thlds[i]);
asprintf (&show, conv, temp_double);
}
/* Process this block for string matching */
else if (eval_method[i] & CRIT_STRING) {
if (strcmp (show, string_value))
- iresult = STATE_CRITICAL;
+ iresult = (invert_search==0) ? STATE_CRITICAL : STATE_OK;
else
- iresult = STATE_OK;
+ iresult = (invert_search==0) ? STATE_OK : STATE_CRITICAL;
}
/* Process this block for regex matching */
else if (eval_method[i] & CRIT_REGEX) {
excode = regexec (&preg, response, 10, pmatch, eflags);
if (excode == 0) {
- iresult = STATE_OK;
+ iresult = (invert_search==0) ? STATE_OK : STATE_CRITICAL;
}
else if (excode != REG_NOMATCH) {
regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
exit (STATE_CRITICAL);
}
else {
- iresult = STATE_CRITICAL;
+ iresult = (invert_search==0) ? STATE_CRITICAL : STATE_OK;
}
}
temp_string=labels[i];
else
temp_string=oidname;
- if(calculate_rate)
- asprintf(&temp_string,"%s-rate",temp_string);
strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
len = sizeof(perfstr)-strlen(perfstr)-1;
{"next", no_argument, 0, 'n'},
{"rate", no_argument, 0, L_CALCULATE_RATE},
{"rate-multiplier", required_argument, 0, L_RATE_MULTIPLIER},
+ {"invert-search", no_argument, 0, L_INVERT_SEARCH},
{0, 0, 0, 0}
};
calculate_rate = 1;
break;
case L_RATE_MULTIPLIER:
- if(!is_integer(optarg)||(rate_multiplier=atoi(optarg)<=0))
+ if(!is_integer(optarg)||((rate_multiplier=atoi(optarg))<=0))
usage2(_("Rate multiplier must be a positive integer"),optarg);
break;
+ case L_INVERT_SEARCH:
+ invert_search=1;
+ break;
}
}
printf (" %s\n", _("Critical threshold range(s)"));
printf (" %s\n", "--rate");
printf (" %s\n", _("Enable rate calculation. See 'Rate Calculation' below"));
+ printf (" %s\n", "--rate-multiplier");
+ printf (" %s\n", _("Converts rate per second. For example, set to 60 to convert to per minute"));
/* Tests Against Strings */
printf (" %s\n", "-s, --string=STRING");
printf (" %s\n", _("Return OK state (for that OID) if extended regular expression REGEX matches"));
printf (" %s\n", "-R, --eregi=REGEX");
printf (" %s\n", _("Return OK state (for that OID) if case-insensitive extended REGEX matches"));
- printf (" %s\n", "-l, --label=STRING");
- printf (" %s\n", _("Prefix label for output from plugin (default -l 'SNMP')"));
+ printf (" %s\n", "--invert-search");
+ printf (" %s\n", _("Invert search result (CRITICAL if found)"));
/* Output Formatting */
+ printf (" %s\n", "-l, --label=STRING");
+ printf (" %s\n", _("Prefix label for output from plugin"));
printf (" %s\n", "-u, --units=STRING");
printf (" %s\n", _("Units label(s) for output data (e.g., 'sec.')."));
printf (" %s\n", "-D, --output-delimiter=STRING");
printf ("\n");
printf ("%s\n", _("Notes:"));
- printf (" %s\n", _("- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with"));
- printf (" %s\n", _("internal spaces must be quoted) [max 8 OIDs]"));
+ printf (" %s\n", _("- Multiple OIDs may be indicated by a comma or space-delimited list (lists with"));
+ printf (" %s %i %s\n", _("internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
printf(" -%s", UT_THRESHOLDS_NOTES);
printf("%s\n", _("Rate Calculation:"));
printf(" %s\n", _("In many places, SNMP returns counters that are only meaningful when"));
printf(" %s\n", _("calculating the counter difference since the last check. check_snmp"));
- printf(" %s\n", _("saves the last state information in a file so that the rate can be"));
- printf(" %s\n", _("calculated. Use the --rate option to save state information. On the"));
- printf(" %s\n", _("first run, there will be no prior state - this will return with OK."));
+ printf(" %s\n", _("saves the last state information in a file so that the rate per second"));
+ printf(" %s\n", _("can be calculated. Use the --rate option to save state information."));
+ printf(" %s\n", _("On the first run, there will be no prior state - this will return with OK."));
printf(" %s\n", _("The state is uniquely determined by the arguments to the plugin, so"));
printf(" %s\n", _("changing the arguments will create a new state file."));