From 3025a9b67fae40edd689e35be37fe4b6596df5a1 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 31 Mar 2023 16:26:11 +0200
Subject: [PATCH] update project

---
 agent_based/dell_powerconnect_psu.py |   2 +-
 dell_powerconnect_psu.mkp            | Bin 3026 -> 3035 bytes
 packages/dell_powerconnect_psu       |   6 +++---
 web/plugins/metrics/psu_wattage.py   |  22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 web/plugins/metrics/psu_wattage.py

diff --git a/agent_based/dell_powerconnect_psu.py b/agent_based/dell_powerconnect_psu.py
index 9e3a714..c75df99 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
GIT binary patch
delta 2976
zcmV;R3t#lo7uy#GABzYGf$fn7D1S39ZEJ7<?Okne+c*-=X9N8YTo(t$2S<@)$8HUH
zfg;KFf^O0vNwGM14MVo*m>XHriBwV}$bY{XQnDq-PTF9b#oo<>#xLY>I2;Zi4sBT#
z(KO!q!EgYbc3VFK)}P&$)8290ZPz{MbUKa;<?!6zVb0DgAd|{Zq062BPk-E7ex_z|
zYW0|<X5rpselzgZFwRsM$2Wr@R>Mg=x0*F(1zb*2kth*ID1E{2QlU7Dr|j_blVkx8
z!%-67@pKYL5ud10A~QCb@yQLF#wiMUw)=Zz)z})WjfHz`D!y{b=0ZvlU9<DcFOrEV
zQ!}1&=EGkgrc-zwDN}bR)PD?X*#>3OpK}($!<Mf6Adqa5rCOUF1k0p<4gE-#@N^pZ
z%4g74`ysxI!q^W+SsJ1vW=bWpx4)me&z{AJitRYP*3wfEatUJK=xb0u8vBw5@P1%z
zbeNqitYNckqNQCZw>MdrzvE*qoP^o6h~)m9t5i(nK8TL)e5Jq+-G9pinuk8YL2TBH
z5=y90iyVOnJJ-I+Wzg?h=9Z^24-3!nT28Cw*td@D*sXH4Jr~g^<^Rb<s$F1twr4vP
ziNv4WfPHzbYdeYORs>*H#vvbNkrL?qvpC`pJA@ZQ0RP*6$T<27`QL51Yy98sv^?Vf
zSK<G<;s1J%)wlD1y?@E-CHhC<m(u_5(aVXw#Nyvf+1m6HW25a`85@N)VS^NSW<}WW
zeo)^=*!3YaGc3JbP747wYl)|+xenCK>Nrj`cC$7R(8P=qn~51ka@ItlHC`^&R%ls^
zA}yB%3RX6ihLy|pWl{#2C<{X(<-Z3?F>WIfzCQnZZG2tfe}C8M9yrARuYqlx_Jii%
z?Y6t-`QTuuIR3fqPCoyx=XN_V{|AoOea-o2Y-gN_FnB`lx%$5;-u|?o$#j1#qJ19S
zvSb0tK-8+eWqbeJgWV*64Z6oNHQjrMCAGIua~LO!R9w##+dXVB&vD-~*u}=&d(S@3
z$Nyq`>{l`2k$>bp_VMfs`^Y1n`mjM|<4{bBI(F-Us;ilh3^!Z`&xxNZolf9RI=^AN
z#Wp=L1vVri4V#@P6qece58UWftTO|})461R6o66)<UnAWf=S6#L_A<3(o(vo!_Vjc
zJ~{i?WOp+$nUy<MXpM}sbi#4yoaOtTT?4Hjbehy-+kcZJ5c+cQE1bZ3Y-@r6GDkjS
zO&|jsvb*QJ+w&Y$kK6N})7on}J!VoX#Uq_KL3`%eUqPk}$bMj4)$|7jF0;AL(3r_A
zQ1ca+3Pg1hwaOF@^F-mG-F}CDgBM<#&0*A`w4v1n5BaSRsxQw@&)MgbBiVye*!x>{
z2Oit-*MI54qx0_lf!%^-3<Z!HxQ^Y$XI<?&@7;F?tj|u)u8uz*U-Vc}_A*tS4XQfd
zrOGQ?b$N9GaR4bzB3;N`gmUXIQ`V^}^IoE?wb5Vh%XCy6^?lB6Z?xluIx2RwF&HnE
zuQI7umkubG^?znjoX-8QiK_tL-uY<+w1e+k_<tTw9ZF1$KpP9>EK``$W5Iz@pw3e+
zVI^QuColRXizc`hK$q@1OOkNGF3tKrtXPmmHxVc-Ebu2q-@&Bllz#<|iTqHn9;2)1
zUPPwqf(Ka?z@owKJ|3SPUwrtLoqjmK?A2=1G@diHNbtZT=1B~Ub0j9J$v*4#3ZnyN
zlz;I4DoaA1%OiDQYG&u>1-qQBm0pkhMA)}(p?Ft+9F+2FP{>pB;m{>dZ-IHun+q<p
zP?^`7Tt~3jVd3YZFh{u{F8-^O=kI`Dln-W@cYd@O#nWc3@giGo@C6?MKg+7sM?y|w
zI9DvnHtHRrTyP2G7F}QAsRIqDZOmduQhx{AXznKvhxfW+-NiGE3Ann^Rrjzc54xhP
zg=IzH6@_gqEP}5nJTMB204$0-d2uNSq3U6)sXCxGnEJ&;X2sSIp^i6&v2<v5fQsEm
zaF7FPU#rsAALmh=9~Vs=SB7$u2Qynn^OJUK7kiO^E#fs#=T7c1Cs$v%7-%goS${eh
zcEh}A>E0e|H48;c=dPNrxmGIxD`DYDe-0~%NgX01g)su91KdCL0~?r6GLKIW*%?=N
zae9M}ylgwL6H3@7C$s$&wsxLcLzEvj%S~O^YBEa;?|nYQb2if@`oY78_It}TL22)i
zw6`YhuB5$Zbssn->1TDf-sdBL2Y>jh;UrEm+mX2PHcaPk*=apZNQ2T+8#dV9&r8A@
zAb$;@Mb25~rG5ZH91e#)JyR-O^p+n_&+bMdz=Wk=nV*3(H2<_9|2pA`Vkc3+zaFP4
zBwfq)DOXt<)%1JG_3UH7J?H{VmI96}2c0za=R{}^k{L7Wt63yWX5^R_R)5TJhpVpM
zveS;|Ir{Ucap*%fXkvrQJaJ69rmb5)6ahYFP!mV6!=N3QZPrhLEbAqO5W+G}ZOD2#
zi}BMgkk^^7Q3XkwFV{A%CL3qUB&P81E{&sWyQJ|FxD$F5*Ra^Q>GW~|q(86co#n>F
zkZ>E<$W?POWzX^EK)Y|qet+s$mZ44<cOQL^Qr8}<;}Fob%gF{4a5A)(+`MJmMz5kK
zpVYzBx?fJ^1G~rO57rRo`f;yvwOy6*9M2BS%i-ge5WTyVIBB4(DkZj%fw&fGx4~fB
z<ORho2UV-BqO}-PzWjn>gWI+QjdYJav%K_LT-z;s%XJ{Y$vV7^Hh=quFXV2?*9*bJ
zphyaKQM!*0joe6+6l^vS<(kMM{#-WMcbQw-$2X9}lS{R~3=QnRLKL6)VvQ!u=uAhu
zT5Vq^HTIXYPiLQh!#?J7KV9^#ldI!X9k0_EHaql~KJVaX$5vw_?L2mhSuSAVH?F2y
zG1zAtmG;%awtk1ktbc7o-ZfH<)tIN2uIRD*Z7LtEJb>53p8d?=cnZAZz#(72DSHBn
zB=C#B%r^3)sL({l{99jyNUb_3Qy%)ra%P6tX3HdzrDU|a(lx>ME7nxkoM|)y)jaK+
z=p0yip+C+m*1jq&8ilBCQzKpRsF6SBVc$AmedS<P1;E6Br+=d<(0D)e=i|U<w><`w
zcKg77Taz{C^brzV-_pYxt*dN2J;V0rPnF5l=Np(^<7GXUwc;#b%V?gA@|9#9Y<k}M
z^)J9A4AXp5>OYY`82KrOZL&XD+Fu+ZsuPNbfxh+Zp%R}Vmtk)!jbjnWQV+|oz8x*f
zk~9voi8{gEM}JH)O2Kg8$|Up`XE5GM!(pTO=a^cYf4|*aBg%Mmdm2Y37dHoFo%=kN
z_qNF&;dgV7<y)KO`D4lU21y-Ak3|n2i{@+JtcYD-LNs#rTVtb}^TiZ!1wqp{hsc$?
zizDXl%H8H8Abp_#+cF7OX$rqjgX48|0VLD8js~75mw)TU5Ry64e(QRXW>?ME^rgwe
z{vq?))&9R+QO~3V<#YP7%@aFxSspfXANXRVxeZ*N%KrV*RgdY>Tu{;6C}FtJNN9nF
zaz|+vLT;!EB3pf*Y2g8#zGov42m}IwKp+qZ1Onl&gt=__hh6%q@!i*dI^FI8{r>A!
zu<;Y5A0;>c8?OHZwDaG8wAyW_3vzC|)#=dnpRa+pEXd~bMgHaakB<eDzzP|YunPx&
z{5iPe;~#tR=gy0+|Ma>pUH|zSc=}GnfBO7yy#BM(DenL6bRiyg9Jd1zK-Yi11~%XS
z^Uby!fI<b<ecKH_bK&RjocZQkZk_q2dhg8qZkf7|H>+FFU1wr>2f93_?M#Vqb(^_2
z=B5@royPhX@guwie)CPOfqK@8Z9hptcogJq?%%9_7>~EF!~dipjIaGvsM%ahtY)d+
z^o<ggn|hQaW_~yw>D!uEI3UM%%C-D!5=T5zSeKVSXd7wEB9pKS7L&gV2a~@G2a~@G
W2a~@G1r7M0#(x2n{-fmppa1}09Omf&

delta 2948
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

diff --git a/packages/dell_powerconnect_psu b/packages/dell_powerconnect_psu
index d670335..5c1d0b8 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 0000000..eeda089
--- /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,
+    }
+)
-- 
GitLab