From 9a4aafb827d46c030d3f89c6f7c4b00e0f2f5d6d Mon Sep 17 00:00:00 2001 From: indigoparadox Date: Mon, 27 Jan 2025 14:45:46 -0500 Subject: [PATCH 1/2] Change liebert fans check metric to "fan_perc". --- cmk/plugins/liebert/agent_based/liebert_fans.py | 2 +- cmk/plugins/liebert/agent_based/liebert_fans_condenser.py | 2 +- cmk/plugins/liebert/agent_based/liebert_reheating.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk/plugins/liebert/agent_based/liebert_fans.py b/cmk/plugins/liebert/agent_based/liebert_fans.py index b5e9184b2bf..864c4657f10 100644 --- a/cmk/plugins/liebert/agent_based/liebert_fans.py +++ b/cmk/plugins/liebert/agent_based/liebert_fans.py @@ -40,7 +40,7 @@ def check_liebert_fans( yield from check_levels_v1( value, - metric_name="filehandler_perc", + metric_name="fan_perc", levels_lower=params.get("levels_lower"), levels_upper=params["levels"], render_func=lambda x: f"{x:.2f} {unit}", diff --git a/cmk/plugins/liebert/agent_based/liebert_fans_condenser.py b/cmk/plugins/liebert/agent_based/liebert_fans_condenser.py index ac9f516615a..54eb8a03ea6 100644 --- a/cmk/plugins/liebert/agent_based/liebert_fans_condenser.py +++ b/cmk/plugins/liebert/agent_based/liebert_fans_condenser.py @@ -30,7 +30,7 @@ def check_liebert_fans_condenser( return yield from check_levels_v1( value, - metric_name="filehandler_perc", + metric_name="fan_perc", levels_lower=params.get("levels_lower"), levels_upper=params["levels"], render_func=lambda x: f"{x:.2f} {unit}", diff --git a/cmk/plugins/liebert/agent_based/liebert_reheating.py b/cmk/plugins/liebert/agent_based/liebert_reheating.py index e4cb30bfb8f..64cbfed6a70 100644 --- a/cmk/plugins/liebert/agent_based/liebert_reheating.py +++ b/cmk/plugins/liebert/agent_based/liebert_reheating.py @@ -37,7 +37,7 @@ def check_liebert_reheating(params: Mapping[str, Any], section: Section[float]) value, unit = data yield from check_levels_v1( value, - metric_name="filehandler_perc", + metric_name="fan_perc", levels_upper=params["levels"], render_func=lambda x: f"{x:.2f} {unit}", ) From 526fef34af94d55ca23ac57f5f59e5fafdaafe4e Mon Sep 17 00:00:00 2001 From: indigoparadox Date: Mon, 3 Feb 2025 14:36:21 -0500 Subject: [PATCH 2/2] Fixed liebert fans unit tests to also use fan_perc. --- tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans.py | 2 +- .../plugins/liebert/agent_based/test_liebert_fans_condenser.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans.py b/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans.py index a4c38a85eed..a9069b0fb13 100644 --- a/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans.py +++ b/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans.py @@ -34,5 +34,5 @@ def test_check() -> None: state=State.WARN, summary="1.30 % (warn/crit below 2.00 %/1.00 %)", ), - Metric("filehandler_perc", 1.3, levels=(80, 90)), + Metric("fan_perc", 1.3, levels=(80, 90)), ] diff --git a/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans_condenser.py b/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans_condenser.py index fde67415e84..ed564b70783 100644 --- a/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans_condenser.py +++ b/tests/unit/cmk/plugins/liebert/agent_based/test_liebert_fans_condenser.py @@ -36,5 +36,5 @@ def test_check() -> None: state=State.CRIT, summary="4.20 out of 10 clowns (warn/crit below 8.00 out of 10 clowns/9.00 out of 10 clowns)", ), - Metric("filehandler_perc", 4.2, levels=(80, 90)), + Metric("fan_perc", 4.2, levels=(80, 90)), ]