From 381715a2bd1f9163b791dc2a12ef8c60bac2c19a Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Sat, 27 Jan 2007 21:49:21 +0000 Subject: Fix #1643463: Miscalculating thresholds check_disk git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1589 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/t/check_disk.t | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'plugins/t') diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t index 50d2e6d5..7235d70e 100644 --- a/plugins/t/check_disk.t +++ b/plugins/t/check_disk.t @@ -24,7 +24,7 @@ my $mountpoint2_valid = getTestParameter( "NP_MOUNTPOINT2_VALID", "Path to anoth if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") { plan skip_all => "Need 2 mountpoints to test"; } else { - plan tests => 57; + plan tests => 61; } $result = NPTest->testCmd( @@ -76,6 +76,24 @@ if ($free_inode_on_mp1 > $free_inode_on_mp2) { die "Two mountpoints with same inodes free - cannot do rest of test"; } +# Verify performance data +# First check absolute thresholds... +$result = NPTest->testCmd( + "./check_disk -w 20 -c 10 -p $mountpoint_valid" + ); +$_ = $result->perf_output; +my ($warn_absth_data, $crit_absth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;\d+/); +is ($warn_absth_data, 20, "Wrong warning in perf data using absolute thresholds"); +is ($crit_absth_data, 10, "Wrong critical in perf data using absolute thresholds"); + +# Then check percent thresholds. +$result = NPTest->testCmd( + "./check_disk -w 20% -c 10% -p $mountpoint_valid" + ); +$_ = $result->perf_output; +my ($warn_percth_data, $crit_percth_data, $total_percth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;(\d+)/); +is ($warn_percth_data, int($total_percth_data/100*20), "Wrong warning in perf data using percent thresholds"); +is ($crit_percth_data, int($total_percth_data/100*10), "Wrong critical in perf data using percent thresholds"); # Check when order of mount points are reversed, that perf data remains same -- cgit v1.2.3