From 253fe8a3b9b0fdc6fa5a82edff789b02de9a0f2a Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Sun, 16 Jun 2024 11:05:32 +0200
Subject: [PATCH] update project

---
 README.md                                    |   2 +-
 mkp/dell_powerconnect_psu-0.0.5-20240616.mkp | Bin 0 -> 3074 bytes
 source/agent_based/dell_powerconnect_psu.py  |   7 ++++++-
 source/packages/dell_powerconnect_psu        |   4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 mkp/dell_powerconnect_psu-0.0.5-20240616.mkp

diff --git a/README.md b/README.md
index f6f73c2..f3bda06 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/mkp/dell_powerconnect_psu-0.0.4-20230330.mkp "dell_powerconnect_psu-0.0.4-20230330.mkp"
+[PACKAGE]: ../../raw/master/mkp/dell_powerconnect_psu-0.0.5-20240616.mkp "dell_powerconnect_psu-0.0.5-20240616.mkp"
 # Dell Power connect PSU
 
 Monitors the status of Dell Power connect power supplys.
diff --git a/mkp/dell_powerconnect_psu-0.0.5-20240616.mkp b/mkp/dell_powerconnect_psu-0.0.5-20240616.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..dade5971d5b20b23dfe75476642023dd4346c903
GIT binary patch
literal 3074
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
DqOI^>

literal 0
HcmV?d00001

diff --git a/source/agent_based/dell_powerconnect_psu.py b/source/agent_based/dell_powerconnect_psu.py
index c75df99..4699f50 100644
--- a/source/agent_based/dell_powerconnect_psu.py
+++ b/source/agent_based/dell_powerconnect_psu.py
@@ -11,6 +11,7 @@
 
 # 2023-03-30: Rewritten for cmk 2.x
 #             added current power consumption metric
+# 2024-06-16: fix crash in parse function ValueError (not enough values to unpack (expected 5, got 4))
 
 # Tested with Dell PowerConnect 5448 and 5424 models.
 # Relevant SNMP OIDs:
@@ -107,7 +108,11 @@ def parse_dell_powerconnect_psu(string_table: List[StringTable]) -> Optional[Dic
         return
 
     section = {}
-    for device_id, name, state, supply, current_power in string_table[1]:
+    for entry in string_table[1]:
+        try:
+            device_id, name, state, supply, current_power = entry
+        except ValueError:
+            continue
         # M6220 are blade switches which report valid values only for the "Main"
         # sensor. The other one is reported as notFunctioning, but this is wrong.
         # Simply ignore the "System" sensor for those devices.
diff --git a/source/packages/dell_powerconnect_psu b/source/packages/dell_powerconnect_psu
index 3737f57..fade8e8 100644
--- a/source/packages/dell_powerconnect_psu
+++ b/source/packages/dell_powerconnect_psu
@@ -10,7 +10,7 @@
            'gui': ['metrics/psu_wattage.py']},
  'name': 'dell_powerconnect_psu',
  'title': 'Dell Power connect PSU',
- 'version': '0.0.4-20230330',
+ 'version': '0.0.5-20240616',
  'version.min_required': '2.1.0b1',
- 'version.packaged': '2.2.0p24',
+ 'version.packaged': 'cmk-mkp-tool 0.2.0',
  'version.usable_until': None}
-- 
GitLab