Tests for --rate-multiplier option

[nagiosplug.git] / plugins / check_snmp.c

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index bf2102220b06140c61ff5a11f28bfb69b91c2557..f8cae9b6297606136fe2ccf00d182eb6339c3977 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -62,6 +62,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 /* 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 */
@@ -115,6 +116,7 @@ char *units;
 char *port;
 char *snmpcmd;
 char string_value[MAX_INPUT_BUFFER] = "";
+int  invert_search=0;
 char **labels = NULL;
 char **unitv = NULL;
 size_t nlabels = 0;
@@ -413,7 +415,7 @@ main (int argc, char **argv)
                                        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)
@@ -421,6 +423,8 @@ main (int argc, char **argv)
                                                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);
                                }
@@ -433,16 +437,16 @@ main (int argc, char **argv)
                /* 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);
@@ -450,7 +454,7 @@ main (int argc, char **argv)
                                exit (STATE_CRITICAL);
                        }
                        else {
-                               iresult = STATE_CRITICAL;
+                               iresult = (invert_search==0) ? STATE_CRITICAL : STATE_OK;
                        }
                }
 
@@ -584,6 +588,7 @@ process_arguments (int argc, char **argv)
                {"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}
        };
 
@@ -793,9 +798,12 @@ process_arguments (int argc, char **argv)
                        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;
                }
        }
 
@@ -1036,6 +1044,8 @@ print_help (void)
        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");
@@ -1044,10 +1054,12 @@ print_help (void)
        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");
@@ -1080,9 +1092,9 @@ print_help (void)
        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."));