diff options
| -rw-r--r-- | plugins/check_disk.c | 8 | ||||
| -rw-r--r-- | plugins/t/check_disk.t | 20 |
2 files changed, 23 insertions, 5 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 99a7201e..476c8922 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -306,16 +306,16 @@ main (int argc, char **argv) critical_high_tide = UINT_MAX; if (path->freespace_units->warning != NULL) { - warning_high_tide = dtotal_units - path->freespace_units->warning->end; + warning_high_tide = path->freespace_units->warning->end; } if (path->freespace_percent->warning != NULL) { - warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*dtotal_units )); + warning_high_tide = abs( min( (double) warning_high_tide, (double) path->freespace_percent->warning->end/100*dtotal_units )); } if (path->freespace_units->critical != NULL) { - critical_high_tide = dtotal_units - path->freespace_units->critical->end; + critical_high_tide = path->freespace_units->critical->end; } if (path->freespace_percent->critical != NULL) { - critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_units )); + critical_high_tide = abs( min( (double) critical_high_tide, (double) path->freespace_percent->critical->end/100*dtotal_units )); } asprintf (&perf, "%s %s", perf, 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 |