diff --git a/agent_based/dell_powerconnect_psu.py b/agent_based/dell_powerconnect_psu.py index 9e3a7141a210190f41b47a4d2bf8e594300b71b7..c75df99345fce9f093ad93fd2f22dea926cff5c1 100644 --- a/agent_based/dell_powerconnect_psu.py +++ b/agent_based/dell_powerconnect_psu.py @@ -145,7 +145,7 @@ def check_dell_powerconnect_psu(item, params, section: Dict[str, Tuple[str, str, value=current_power, levels_upper=params['levels_abs_upper'], levels_lower=params['levels_abs_lower'], - label='Power consumption', + label='Power usage', render_func=lambda v: f'{v} W', metric_name='power_usage', ) diff --git a/dell_powerconnect_psu.mkp b/dell_powerconnect_psu.mkp index 8a58a3bd0030a796501a823d76529ea34d93cba1..67ea4075fb45054d337ac0d4ca2eea8368f9269c 100644 Binary files a/dell_powerconnect_psu.mkp and b/dell_powerconnect_psu.mkp differ diff --git a/packages/dell_powerconnect_psu b/packages/dell_powerconnect_psu index d670335b0b094f10dc515c0360161f6b96f579ac..5c1d0b84f00891e8565d349ab8fa133d32fdc8eb 100644 --- a/packages/dell_powerconnect_psu +++ b/packages/dell_powerconnect_psu @@ -7,10 +7,10 @@ 'download_url': 'https://thl-cmk.hopto.org', 'files': {'agent_based': ['dell_powerconnect_psu.py'], 'checks': ['dell_powerconnect_psu'], - 'gui': ['metrics/psu_wattage.py']}, + 'web': ['plugins/metrics/psu_wattage.py']}, 'name': 'dell_powerconnect_psu', 'title': 'Dell Power connect PSU', - 'version': '20230330.v0.0.2', - 'version.min_required': '2.1.0', + 'version': '20230330.v0.0.3', + 'version.min_required': '2.2.0', 'version.packaged': '2.1.0p21', 'version.usable_until': None} \ No newline at end of file diff --git a/web/plugins/metrics/psu_wattage.py b/web/plugins/metrics/psu_wattage.py new file mode 100644 index 0000000000000000000000000000000000000000..eeda089b1a5bcee79262ea8e5f6965e090b8ca28 --- /dev/null +++ b/web/plugins/metrics/psu_wattage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# License: GNU General Public License v2 +# +# Author: thl-cmk[at]outlook[dot]com +# URL : https://thl-cmk.hopto.org +# Date : 2023-03-30 +# + +from cmk.gui.plugins.metrics.utils import ( + perfometer_info, +) + +perfometer_info.append( + { + 'type': 'logarithmic', + 'metric': 'power_usage', + 'half_value': 200.0, + 'exponent': 2, + } +)