[monitoring-plugins] check_disk: restore pre 3.0.0 compatibility of ...

[GitHub]

    Module: monitoring-plugins
    Branch: master
    Commit: 3ef80b298ccd3b200b72517a253d311fa1c7f0f5
    Author: Lorenz Kästle <12514511+RincewindsHat at users.noreply.github.com>
 Committer: GitHub <noreply at github.com>
      Date: Fri Aug 21 12:40:56 2026 +0200
       URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=3ef80b29

check_disk: restore pre 3.0.0 compatibility of thresholds in perfdata (#2311)

* check_disk: restore pre 3.0.0 compatibility of thresholds in perfdata

This should invert (in the sense of total - free threshold) the warning
and critical threshold values in displayed perfdata for check_disk.
Therefor they should behave like the check_disk pre 3.0.0

---------

Co-authored-by: Lorenz Kästle <lorenz.kaestle at netways.de>

---

 plugins/check_disk.c   | 4 ++++
 plugins/t/check_disk.t | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 65169105..f1bdf9ca 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -1255,10 +1255,14 @@ mp_subcheck evaluate_filesystem(measurement_unit measurement_unit, bool display_
 
 	mp_thresholds thr_used_space = measurement_unit.freespace_bytes_thresholds;
 	if (thr_used_space.critical_is_set) {
+		thr_used_space.critical.end = mp_create_pd_value(
+			measurement_unit.total_bytes - mp_get_pd_value(thr_used_space.critical.end));
 		thr_used_space.critical.alert_on_inside_range =
 			!thr_used_space.critical.alert_on_inside_range;
 	}
 	if (thr_used_space.warning_is_set) {
+		thr_used_space.warning.end = mp_create_pd_value(
+			measurement_unit.total_bytes - mp_get_pd_value(thr_used_space.warning.end));
 		thr_used_space.warning.alert_on_inside_range =
 			!thr_used_space.warning.alert_on_inside_range;
 	}
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index ba149842..92f1f3d9 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -146,8 +146,8 @@ my $total_absth_data= $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0
 # print("crit: " .$crit_absth_data . "\n");
 # print("total: " .$total_absth_data . "\n");
 
-is ($warn_absth_data <=>  (20 * (2 ** 20)), 0, "Wrong warning in perf data using absolute thresholds");
-is ($crit_absth_data <=>  (10 * (2 ** 20)), 0, "Wrong critical in perf data using absolute thresholds");
+is ($warn_absth_data/1000 <=>  ($total_absth_data - (20 * (2 ** 20)))/1000, 0, "Wrong warning in perf data using absolute thresholds");
+is ($crit_absth_data/1000 <=>  ($total_absth_data - (10 * (2 ** 20)))/1000, 0, "Wrong critical in perf data using absolute thresholds");
 
 # Then check percent thresholds.
 $result = NPTest->testCmd(
@@ -163,8 +163,8 @@ my $total_percth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}
 # print("warn_percth_data: " . $warn_percth_data . "\n");
 # print("crit_percth_data: " . $crit_percth_data . "\n");
 
-is (int($warn_percth_data), int((20/100)*$total_percth_data), "Wrong warning in perf data using percent thresholds. Got " . $warn_percth_data . " with total " . $total_percth_data);
-is (int($crit_percth_data), int((10/100)*$total_percth_data), "Wrong critical in perf data using percent thresholds. Got " . $crit_percth_data . " with total " . $total_percth_data);
+is (int($warn_percth_data/1000), int(($total_absth_data - ((20/100)*$total_percth_data))/1000), "Wrong warning in perf data using percent thresholds. Got " . $warn_percth_data . " with total " . $total_percth_data);
+is (int($crit_percth_data/1000), int(($total_absth_data - ((10/100)*$total_percth_data))/1000), "Wrong critical in perf data using percent thresholds. Got " . $crit_percth_data . " with total " . $total_percth_data);
 
 
 # Check when order of mount points are reversed, that perf data remains same