Module: monitoring-plugins Branch: master Commit: f3078c33f6fd90faba50ebad35acad2df037b450 Author: Thomas Guyot-Sionnest <[email protected]> Date: Fri Jan 31 13:00:53 2014 -0500 URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=f3078c3
Add perfdata in check_proc output tests --- plugins/tests/check_procs.t | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t index d71c83a..06ad9df 100755 --- a/plugins/tests/check_procs.t +++ b/plugins/tests/check_procs.t @@ -18,23 +18,23 @@ my $command = "./check_procs --input-file=tests/var/ps-axwo.darwin"; $result = NPTest->testCmd( "$command" ); is( $result->return_code, 0, "Run with no options" ); -like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS OK: 95 processes | procs=95;;;0;", "Output correct" ); $result = NPTest->testCmd( "$command -w 5" ); is( $result->return_code, 1, "Checking > 5 processes" ); -like( $result->output, '/^PROCS WARNING: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS WARNING: 95 processes | procs=95;5;;0;", "Output correct" ); $result = NPTest->testCmd( "$command -w 4 -c 44" ); is( $result->return_code, 2, "Checking critical" ); -like( $result->output, '/^PROCS CRITICAL: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS CRITICAL: 95 processes | procs=95;4;44;0;", "Output correct" ); $result = NPTest->testCmd( "$command -w 100 -c 200" ); is( $result->return_code, 0, "Checking no threshold breeched" ); -like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" ); +is( $result->output, "PROCS OK: 95 processes | procs=95;100;200;0;", "Output correct" ); $result = NPTest->testCmd( "$command -C launchd -c 5" ); is( $result->return_code, 2, "Checking processes filtered by command name" ); -like( $result->output, '/^PROCS CRITICAL: 6 processes with command name \'launchd\'$/', "Output correct" ); +is( $result->output, "PROCS CRITICAL: 6 processes with command name 'launchd' | procs=6;;5;0;", "Output correct" ); $result = NPTest->testCmd( "$command -u 501 -w 39 -c 41" ); is( $result->return_code, 1, "Checking processes filtered by userid" ); @@ -62,15 +62,15 @@ like( $result->output, '/^PROCS OK: 0 processes with UID = -2 \(nobody\), args \ $result = NPTest->testCmd( "$command --ereg-argument-array='mdworker.*501'" ); is( $result->return_code, 0, "Checking regexp search of arguments" ); -is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501'", "Output correct" ); +is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501' | procs=1;;;0;", "Output correct" ); $result = NPTest->testCmd( "$command --vsz 1000000" ); is( $result->return_code, 0, "Checking filter by VSZ" ); -like( $result->output, '/^PROCS OK: 24 processes with VSZ >= 1000000$/', "Output correct" ); +is( $result->output, 'PROCS OK: 24 processes with VSZ >= 1000000 | procs=24;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --rss 100000" ); is( $result->return_code, 0, "Checking filter by RSS" ); -like( $result->output, '/^PROCS OK: 3 processes with RSS >= 100000$/', "Output correct" ); +is( $result->output, 'PROCS OK: 3 processes with RSS >= 100000 | procs=3;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command -s S" ); is( $result->return_code, 0, "Checking filter for sleeping processes" ); @@ -86,15 +86,15 @@ like( $result->output, '/^PROCS CRITICAL: 39 processes with PPID = 1/', "Output $result = NPTest->testCmd( "$command -P 0.71" ); is( $result->return_code, 0, "Checking filter for percentage cpu > 0.71" ); -is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71', "Output correct" ); +is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71 | procs=7;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command -P 0.70" ); is( $result->return_code, 0, "Checking filter for percentage cpu > 0.70" ); -is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70', "Output correct" ); +is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70 | procs=8;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --metric=CPU -w 8" ); is( $result->return_code, 1, "Checking against metric of CPU > 8" ); -is( $result->output, 'CPU WARNING: 1 warn out of 95 processes', "Output correct" ); +is( $result->output, 'CPU WARNING: 1 warn out of 95 processes | procs=95;;;0; procs_warn=1;;;0; procs_crit=0;;;0;', "Output correct" ); # TODO: Because of a conversion to int, if CPU is 1.45%, will not alert, but 2.01% will. $result = NPTest->testCmd( "$command --metric=CPU -w 1 -u 501 -v" ); @@ -103,17 +103,17 @@ is( $result->output, 'CPU WARNING: 2 warn out of 40 processes with UID = 501 (to $result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" ); is( $result->return_code, 1, "Checking against VSZ > 1.2GB" ); -is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" ); +is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" ); is( $result->return_code, 1, "Checking against VSZ > 1.2GB" ); -is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" ); +is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --metric=RSS -c 70000 -v" ); is( $result->return_code, 2, "Checking against RSS > 70MB" ); -is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari]', "Output correct" ); +is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari] | procs=95;;;0; procs_warn=0;;;0; procs_crit=5;;;0;', "Output correct" ); $result = NPTest->testCmd( "$command --ereg-argument-array='(nosuchname|nosuch2name)'" ); is( $result->return_code, 0, "Checking no pipe symbol in output" ); -is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)'", "Output correct" ); +is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)' | procs=0;;;0;", "Output correct" );
