X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_mrtgtraf.c;h=94e6e0808102906b48cbbfccb82c5dd0674c91e1;hb=07a08052081b59d26add4adf0ae4519fbacb8a36;hp=05830026a760d716800505d538876b8b06b8478b;hpb=0c3386274ef5002dffc20337ef02407f24d7400c;p=nagiosplug.git diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index 0583002..94e6e08 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c @@ -197,27 +197,26 @@ main (int argc, char **argv) if (incoming_rate > incoming_critical_threshold || outgoing_rate > outgoing_critical_threshold) { result = STATE_CRITICAL; - asprintf (&error_message, "%s. In = %0.1f %s, %s. Out = %0.1f %s", - (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate, - incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max", + asprintf (&error_message, "Traffic CRITICAL %s. In = %0.1f %s, %s. Out = %0.1f %s", + (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate, + incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max", adjusted_outgoing_rate, outgoing_speed_rating); } else if (incoming_rate > incoming_warning_threshold || outgoing_rate > outgoing_warning_threshold) { result = STATE_WARNING; - asprintf (&error_message, "%s. In = %0.1f %s, %s. Out = %0.1f %s", - (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate, - incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max", + asprintf (&error_message, "Traffic WARNING %s. In = %0.1f %s, %s. Out = %0.1f %s", + (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate, + incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max", adjusted_outgoing_rate, outgoing_speed_rating); } - - if (result == STATE_OK) - printf ("Traffic ok - %s. In = %0.1f %s, %s. Out = %0.1f %s\n", - (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate, - incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max", + else if (result == STATE_OK) + printf ("Traffic OK - %s. In = %0.1f %s, %s. Out = %0.1f %s\n", + (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate, + incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max", adjusted_outgoing_rate, outgoing_speed_rating); else - printf ("%s\n", error_message); + printf ("UNKNOWN %s\n", error_message); return result; }