diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index d38710403f30246545037b934d3e88903518f735..d79da8cf7cbc6bd94d3f4c8c032d0874dfc43b56 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
char *state_string=NULL;
size_t response_length, current_length, string_length;
char *temp_string=NULL;
- int is_numeric=0;
time_t current_time;
double temp_double;
time_t duration;
/* We strip out the datatype indicator for PHBs */
if (strstr (response, "Gauge: ")) {
show = strstr (response, "Gauge: ") + 7;
- is_numeric++;
}
else if (strstr (response, "Gauge32: ")) {
show = strstr (response, "Gauge32: ") + 9;
- is_numeric++;
}
else if (strstr (response, "Counter32: ")) {
show = strstr (response, "Counter32: ") + 11;
- is_numeric++;
is_counter=1;
if(!calculate_rate)
strcpy(type, "c");
}
else if (strstr (response, "Counter64: ")) {
show = strstr (response, "Counter64: ") + 11;
- is_numeric++;
is_counter=1;
if(!calculate_rate)
strcpy(type, "c");
}
else if (strstr (response, "INTEGER: ")) {
show = strstr (response, "INTEGER: ") + 9;
- is_numeric++;
}
else if (strstr (response, "STRING: ")) {
show = strstr (response, "STRING: ") + 8;
}
}
- else if (strstr (response, "Timeticks: "))
+ else if (strstr (response, "Timeticks: ")) {
show = strstr (response, "Timeticks: ");
+ }
else
show = response;
iresult = STATE_DEPENDENT;
/* Process this block for numeric comparisons */
- if (is_numeric) {
+ /* Make some special values,like Timeticks numeric only if a threshold is defined */
+ if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
ptr = strpbrk (show, "0123456789");
if (ptr == NULL)
die (STATE_UNKNOWN,_("No valid data returned"));
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);
}
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;
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:
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 ("\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."));