diff options
| -rw-r--r-- | plugins/check_mrtg.c | 6 | ||||
| -rw-r--r-- | plugins/check_nt.c | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index 5924f179..e1382644 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c @@ -140,9 +140,9 @@ main (int argc, char **argv) asprintf (&message, "%s. %s = %lu %s|%s", (use_average == TRUE) ? _("Avg") : _("Max"), label, rate, units, - perfdata(label, rate, units, - value_warning_threshold, value_warning_threshold, - value_critical_threshold, value_critical_threshold, + perfdata(label, (long) rate, units, + (int) value_warning_threshold, (long) value_warning_threshold, + (int) value_critical_threshold, (long) value_critical_threshold, 0, 0, 0, 0)); } diff --git a/plugins/check_nt.c b/plugins/check_nt.c index 91442a5a..50bf9f03 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c @@ -118,7 +118,7 @@ int main(int argc, char **argv){ asprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list); return_code = STATE_WARNING; } else { - asprintf (&output_message, recv_buffer); + asprintf (&output_message, "%s", recv_buffer); return_code = STATE_OK; } break; @@ -238,12 +238,11 @@ int main(int argc, char **argv){ mem_commitLimit / 1048576, mem_commitByte / 1048567, percent_used_space, (mem_commitLimit - mem_commitByte) / 1048576, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100); + return_code=STATE_OK; if(check_critical_value==TRUE && percent_used_space >= critical_value) return_code=STATE_CRITICAL; else if (check_warning_value==TRUE && percent_used_space >= warning_value) return_code=STATE_WARNING; - else - return_code=STATE_OK; break; @@ -273,13 +272,12 @@ int main(int argc, char **argv){ return_code=STATE_OK; } else { /* inverse thresholds */ + return_code=STATE_OK; if(check_critical_value==TRUE && counter_value <= critical_value) return_code=STATE_CRITICAL; else if (check_warning_value==TRUE && counter_value <= warning_value) return_code=STATE_WARNING; - else - return_code=STATE_OK; - } + } } break; |