From 177c3f833136d3b64639be2c6da7ba738a70784e Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Sat, 1 Apr 2023 09:53:46 +0200
Subject: [PATCH] update project

---
 dell_powerconnect_psu.mkp      | Bin 3036 -> 3029 bytes
 gui/metrics/psu_wattage.py     |  22 ++++++++++++++++++++++
 packages/dell_powerconnect_psu |   6 +++---
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 gui/metrics/psu_wattage.py

diff --git a/dell_powerconnect_psu.mkp b/dell_powerconnect_psu.mkp
index caa4c70552e332d1a5750f35f2d602d8c2ca48ad..14b262abe0ab700837304b2279b74b64eed47631 100644
GIT binary patch
delta 2956
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
Cj`ElQ

delta 2965
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
L<ObMq0H6Q>MiTip

diff --git a/gui/metrics/psu_wattage.py b/gui/metrics/psu_wattage.py
new file mode 100644
index 0000000..eeda089
--- /dev/null
+++ b/gui/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,
+    }
+)
diff --git a/packages/dell_powerconnect_psu b/packages/dell_powerconnect_psu
index b21a1fc..885cba6 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'],
-           'web': ['plugins/metrics/psu_wattage.py']},
+           'gui': ['metrics/psu_wattage.py']},
  'name': 'dell_powerconnect_psu',
  'title': 'Dell Power connect PSU',
- 'version': '20230330.v0.0.3',
- 'version.min_required': '2.0.0',
+ 'version': '20230330.v0.0.4',
+ 'version.min_required': '2.1.0',
  'version.packaged': '2.1.0p21',
  'version.usable_until': None}
\ No newline at end of file
-- 
GitLab