diff --git a/README.md b/README.md index f6f73c299aba1aa0cb7a9ee70b798f219d70d82c..f3bda0666a976c7adcbeb2460e6e344320d277c4 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 Binary files /dev/null and b/mkp/dell_powerconnect_psu-0.0.5-20240616.mkp differ diff --git a/source/agent_based/dell_powerconnect_psu.py b/source/agent_based/dell_powerconnect_psu.py index c75df99345fce9f093ad93fd2f22dea926cff5c1..4699f50117ddafe1b25c8ea9c64f09738b63ce96 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 3737f576a11d1c58a2d0b1d019b352d3ab146e56..fade8e855890cf432e75614c7ebd3c0ac438051d 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}