summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/check_disk.c8
-rw-r--r--plugins/t/check_disk.t20
2 files changed, 23 insertions, 5 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 99a7201..476c892 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -306,16 +306,16 @@ main (int argc, char **argv)
306 critical_high_tide = UINT_MAX; 306 critical_high_tide = UINT_MAX;
307 307
308 if (path->freespace_units->warning != NULL) { 308 if (path->freespace_units->warning != NULL) {
309 warning_high_tide = dtotal_units - path->freespace_units->warning->end; 309 warning_high_tide = path->freespace_units->warning->end;
310 } 310 }
311 if (path->freespace_percent->warning != NULL) { 311 if (path->freespace_percent->warning != NULL) {
312 warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*dtotal_units )); 312 warning_high_tide = abs( min( (double) warning_high_tide, (double) path->freespace_percent->warning->end/100*dtotal_units ));
313 } 313 }
314 if (path->freespace_units->critical != NULL) { 314 if (path->freespace_units->critical != NULL) {
315 critical_high_tide = dtotal_units - path->freespace_units->critical->end; 315 critical_high_tide = path->freespace_units->critical->end;
316 } 316 }
317 if (path->freespace_percent->critical != NULL) { 317 if (path->freespace_percent->critical != NULL) {
318 critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_units )); 318 critical_high_tide = abs( min( (double) critical_high_tide, (double) path->freespace_percent->critical->end/100*dtotal_units ));
319 } 319 }
320 320
321 asprintf (&perf, "%s %s", perf, 321 asprintf (&perf, "%s %s", perf,
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 50d2e6d..7235d70 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
24if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") { 24if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") {
25 plan skip_all => "Need 2 mountpoints to test"; 25 plan skip_all => "Need 2 mountpoints to test";
26} else { 26} else {
27 plan tests => 57; 27 plan tests => 61;
28} 28}
29 29
30$result = NPTest->testCmd( 30$result = NPTest->testCmd(
@@ -76,6 +76,24 @@ if ($free_inode_on_mp1 > $free_inode_on_mp2) {
76 die "Two mountpoints with same inodes free - cannot do rest of test"; 76 die "Two mountpoints with same inodes free - cannot do rest of test";
77} 77}
78 78
79# Verify performance data
80# First check absolute thresholds...
81$result = NPTest->testCmd(
82 "./check_disk -w 20 -c 10 -p $mountpoint_valid"
83 );
84$_ = $result->perf_output;
85my ($warn_absth_data, $crit_absth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;\d+/);
86is ($warn_absth_data, 20, "Wrong warning in perf data using absolute thresholds");
87is ($crit_absth_data, 10, "Wrong critical in perf data using absolute thresholds");
88
89# Then check percent thresholds.
90$result = NPTest->testCmd(
91 "./check_disk -w 20% -c 10% -p $mountpoint_valid"
92 );
93$_ = $result->perf_output;
94my ($warn_percth_data, $crit_percth_data, $total_percth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;(\d+)/);
95is ($warn_percth_data, int($total_percth_data/100*20), "Wrong warning in perf data using percent thresholds");
96is ($crit_percth_data, int($total_percth_data/100*10), "Wrong critical in perf data using percent thresholds");
79 97
80 98
81# Check when order of mount points are reversed, that perf data remains same 99# Check when order of mount points are reversed, that perf data remains same