Merge branch 'next-release'

Author: bb-Ricardo

README.md

@@ -57,6 +57,7 @@ usage: check_redfish.py [-H HOST] [-u USERNAME] [-p PASSWORD] [-f AUTHFILE]
                         [-d] [-m MAX] [-r RETRIES] [-t TIMEOUT]
                         [--log_exclude LOG_EXCLUDE] [--ignore_missing_ps]
                         [--ignore_unavailable_resources]
+                        [--ignore_unknown_on_critical_or_warning]
                         [--enable_bmc_security_warning] [--storage] [--proc]
                         [--memory] [--power] [--temp] [--fan] [--nic] [--bmc]
                         [--info] [--firmware] [--sel] [--mel] [--all] [-i]
@@ -70,7 +71,7 @@ It will also create a inventory of all components of a system.
 
 R.I.P. IPMI
 
-Version: 1.12.1 (2025-08-07)
+Version: 2.0.0 (2025-10-15)
 
 mandatory arguments:
   -H HOST, --host HOST  define the host to request. To change the port just
@@ -116,6 +117,9 @@ optional arguments:
   --ignore_unavailable_resources
                         ignore all 'UNKNOWN' errors which indicate missing
                         resources and report as OK
+  --ignore_unknown_on_critical_or_warning
+                        suppress all 'UNKNOWN' errors if other checks returned
+                        CRITICAL or WARNING
   --enable_bmc_security_warning
                         return status WARNING if BMC security issues are
                         detected (HPE iLO only)
@@ -231,6 +235,11 @@ WARNING and CRITICAL values can only be used properly if used with **ONE** query
 If for example **--all** or **--mel** and **--storage** are used in the same command then you will
 get inconsistent results/alarms.
 
+Sometimes it is helpful to prioritize CRITICAL and WARNING status over UNKNOWN status results.
+In this case it is possible to use the `--ignore_unknown_on_critical_or_warning` cli option
+which returns for example `CRITICAL` if the plugin encountered an `UNKNONW` and a `CRITICAL` issue.
+see: https://github.com/bb-Ricardo/check_redfish/issues/174
+
 #### Event Logs
 **--mel** and **--sel** (values are passed as "days")<br>
 define after how many days' event log entries which have a != OK severity shouldn't
@@ -328,7 +337,7 @@ suggestions for changes/improvements then please create a GitHub issue.
 ```json
 {
     "inventory": {
-        "chassi": [],
+        "chassis": [],
         "fan": [],
         "firmware": [],
         "logical_drive": [],
@@ -339,7 +348,7 @@ suggestions for changes/improvements then please create a GitHub issue.
         "physical_drive": [],
         "power_control": [
             {
-                "chassi_ids": [
+                "chassis_ids": [
                     "1"
                 ],
                 "health_state": null,
@@ -357,7 +366,7 @@ suggestions for changes/improvements then please create a GitHub issue.
             {
                 "bay": 1,
                 "capacity_in_watt": 500,
-                "chassi_ids": [
+                "chassis_ids": [
                     1
                 ],
                 "efficiency_percent": null,
@@ -377,7 +386,7 @@ suggestions for changes/improvements then please create a GitHub issue.
             {
                 "bay": 2,
                 "capacity_in_watt": 500,
-                "chassi_ids": [
+                "chassis_ids": [
                     1
                 ],
                 "firmware": "1.03",
@@ -406,8 +415,8 @@ suggestions for changes/improvements then please create a GitHub issue.
         "host_that_collected_inventory": "inventory-collector.example.com",
         "inventory_id": null,
         "inventory_name": null,
-        "inventory_layout_version": "1.12.0",
-        "script_version": "1.12.0",
+        "inventory_layout_version": "2.0.0",
+        "script_version": "2.0.0",
         "start_of_data_collection": "2024-02-13T19:09:07+02:00"
     }
 }
@@ -460,6 +469,9 @@ Models:
 * ProLiant RL300 Gen11
 * ProLiant XL450 Gen10
 
+* Compute Scale-up Server 3200
+* Superdome Flex
+
 ### Lenovo
 * ThinkSystem SR650 (BMC Version 2.12)
 * ThinkSystem SR650 V2 (BMC Version 12I-1.15)
@@ -510,6 +522,9 @@ Models:
 ### GIGABYTE (limited support)
 * H262-Z61
 
+### Bull
+* BullSequana SH120
+
 ## License
 >You can check out the full license [here](LICENSE.txt)
 

check_redfish.py

@@ -16,16 +16,16 @@
 R.I.P. IPMI
 """
 
-__version__ = "1.12.1"
-__version_date__ = "2025-08-07"
+__version__ = "2.0.0"
+__version_date__ = "2025-10-15"
 __author__ = "Ricardo Bartels <ricardo@bitchbrothers.com>"
 __description__ = "Check Redfish Plugin"
 __license__ = "MIT"
 
 import logging
 
 from cr_module.classes.plugin import PluginData
-from cr_module.system_chassi import get_system_info, get_chassi_data, get_system_data
+from cr_module.system_chassis import get_system_info, get_chassis_data, get_system_data
 from cr_module.nic import get_network_interfaces
 from cr_module.storage import get_storage
 from cr_module.bmc import get_bmc_info
@@ -55,9 +55,9 @@ def main(self):
         # get basic information
         plugin.rf.determine_vendor()
 
-        if any(x in self.args.requested_query for x in ['power', 'all']):    get_chassi_data(PowerSupply)
-        if any(x in self.args.requested_query for x in ['temp', 'all']):     get_chassi_data(Temperature)
-        if any(x in self.args.requested_query for x in ['fan', 'all']):      get_chassi_data(Fan)
+        if any(x in self.args.requested_query for x in ['power', 'all']):    get_chassis_data(PowerSupply)
+        if any(x in self.args.requested_query for x in ['temp', 'all']):     get_chassis_data(Temperature)
+        if any(x in self.args.requested_query for x in ['fan', 'all']):      get_chassis_data(Fan)
         if any(x in self.args.requested_query for x in ['proc', 'all']):     get_system_data(Processor)
         if any(x in self.args.requested_query for x in ['memory', 'all']):   get_system_data(Memory)
         if any(x in self.args.requested_query for x in ['nic', 'all']):      get_network_interfaces()

contrib/icinga2_check_redfish_command.conf

@@ -144,6 +144,10 @@ object CheckCommand "redfish" {
             set_if = "$redfish_ignore_unavailable_resources$"
             description = "ignore all 'UNKNOWN' errors which indicate missing resources and report as OK"
         }
+        "--ignore_unknown_on_critical_or_warning" = {
+            set_if = "$redfish_ignore_unknown_on_critical_and_warning$"
+            description = "suppress all 'UNKNOWN' errors if other checks returned CRITICAL or WARNING"
+        }
     }
 
     env = {

contrib/icinga2_check_redfish_director_basket.json

@@ -138,6 +138,10 @@
                 "--ignore_unavailable_resources": {
                     "description": "ignore all 'UNKNOWN' errors which indicate missing resources and report as OK",
                     "set_if": "$redfish_ignore_unavailable_resources$"
+                },
+                "--ignore_unknown_on_critical_or_warning": {
+                    "description": "suppress all 'UNKNOWN' errors if other checks returned CRITICAL or WARNING",
+                    "set_if": "$redfish_ignore_unknown_on_critical_and_warning$"
                 }
             },
             "command": "check_redfish.py",

cr_module/args.py

@@ -61,6 +61,8 @@ def parse_command_line(description: str, version: str, version_date: str):
                             "of the power subsystem")
     group.add_argument("--ignore_unavailable_resources", action='store_true',
                        help="ignore all 'UNKNOWN' errors which indicate missing resources and report as OK")
+    group.add_argument("--ignore_unknown_on_critical_or_warning", action='store_true',
+                       help="suppress all 'UNKNOWN' errors if other checks returned CRITICAL or WARNING")
     group.add_argument("--enable_bmc_security_warning", action='store_true',
                        help="return status WARNING if BMC security issues are detected (HPE iLO only)")
 

cr_module/bmc.py

@@ -56,17 +56,12 @@ def get_bmc_info_generic(redfish_url):
         manager_response = view_response
 
     # get model
-    bmc_model = manager_response.get("Model")
-    bmc_fw_version = manager_response.get("FirmwareVersion")
-
-    if plugin_object.rf.vendor == "HPE":
-        bmc_model = " ".join(bmc_fw_version.split(" ")[0:2])
-
-    if plugin_object.rf.vendor == "Dell":
-        if bmc_model == "13G Monolithic":
-            bmc_model = "iDRAC 8"
-        if bmc_model in ["14G Monolithic", "15G Monolithic"]:
-            bmc_model = "iDRAC 9"
+    if len(plugin_object.rf.get_system_properties("managers")) == 1:
+        bmc_model = plugin_object.rf.vendor_data.get_bmc_model()
+        bmc_fw_version = plugin_object.rf.vendor_data.get_bmc_firmware_version()
+    else:
+        bmc_model = manager_response.get("Model")
+        bmc_fw_version = manager_response.get("FirmwareVersion")
 
     # some Cisco Systems have a second manager with no attributes which needs to be skipped
     if plugin_object.rf.vendor == "Cisco":
@@ -172,7 +167,7 @@ def get_bmc_info_generic(redfish_url):
                     addresses=format_interface_addresses(mac_address),
                     manager_ids=manager_inventory.id,
                     system_ids=manager_inventory.system_ids,
-                    chassi_ids=manager_inventory.chassi_ids,
+                    chassis_ids=manager_inventory.chassis_ids,
                     ipv4_addresses=get_interface_ip_addresses(manager_nic, "IPv4Addresses"),
                     ipv6_addresses=get_interface_ip_addresses(manager_nic, "IPv6Addresses"),
                     link_type="Ethernet",
@@ -251,7 +246,8 @@ def get_bmc_info_generic(redfish_url):
         ilo_license_string = grab(vendor_data, "License.LicenseString")
         ilo_license_key = grab(vendor_data, "License.LicenseKey")
 
-        bmc_licenses.append(f"{ilo_license_string} ({ilo_license_key})")
+        if ilo_license_string and ilo_license_key:
+            bmc_licenses.append(f"{ilo_license_string} ({ilo_license_key})")
 
     elif plugin_object.rf.vendor == "Lenovo":
 
@@ -307,15 +303,15 @@ def get_bmc_info_generic(redfish_url):
 
     elif plugin_object.rf.vendor == "Huawei":
 
-        ibmc_license_link = vendor_data.get("LicenseService")
+        bmc_license_link = vendor_data.get("LicenseService")
 
-        if ibmc_license_link is not None and len(ibmc_license_link) > 0:
-            ibmc_lic = plugin_object.rf.get(ibmc_license_link.get("@odata.id"))
+        if bmc_license_link is not None and len(bmc_license_link) > 0:
+            bmc_lic = plugin_object.rf.get(bmc_license_link.get("@odata.id"))
 
-            if ibmc_lic.get("error"):
-                plugin_object.add_data_retrieval_error(Manager, ibmc_lic, ibmc_license_link.get("@odata.id"))
+            if bmc_lic.get("error"):
+                plugin_object.add_data_retrieval_error(Manager, bmc_lic, bmc_license_link.get("@odata.id"))
 
-            bmc_licenses.append("%s (%s)" % (ibmc_lic.get("InstalledStatus"), ibmc_lic.get("LicenseClass")))
+            bmc_licenses.append("%s (%s)" % (bmc_lic.get("InstalledStatus"), bmc_lic.get("LicenseClass")))
 
     manager_inventory.licenses = bmc_licenses
 
@@ -326,7 +322,7 @@ def get_bmc_info_generic(redfish_url):
     if plugin_object.rf.vendor == "HPE":
 
         # iLO Self Test
-        for self_test in vendor_data.get("iLOSelfTestResults"):
+        for self_test in vendor_data.get("iLOSelfTestResults", []):
 
             self_test_status = self_test.get("Status")
 
@@ -403,16 +399,16 @@ def get_bmc_info_generic(redfish_url):
 
     # Lenovo specific stuff
     if plugin_object.rf.vendor == "Lenovo":
-        redfish_chassi_url = grab(manager_response, "Links/ManagerForChassis/0/@odata.id", separator="/")
+        redfish_chassis_url = grab(manager_response, "Links/ManagerForChassis/0/@odata.id", separator="/")
 
-        chassi_response = None
-        if redfish_chassi_url is not None:
-            chassi_response = plugin_object.rf.get(redfish_chassi_url)
+        chassis_response = None
+        if redfish_chassis_url is not None:
+            chassis_response = plugin_object.rf.get(redfish_chassis_url)
 
-            if chassi_response.get("error"):
-                plugin_object.add_data_retrieval_error(Manager, chassi_response, redfish_chassi_url)
+            if chassis_response.get("error"):
+                plugin_object.add_data_retrieval_error(Manager, chassis_response, redfish_chassis_url)
 
-        located_data = grab(chassi_response, f"Oem.{plugin_object.rf.vendor_dict_key}.LocatedIn")
+        located_data = grab(chassis_response, f"Oem.{plugin_object.rf.vendor_dict_key}.LocatedIn")
 
         if located_data is not None:
             descriptive_name = located_data.get("DescriptiveName")
@@ -436,10 +432,10 @@ def get_bmc_info_generic(redfish_url):
     # get Huawei Server location data
     if plugin_object.rf.vendor == "Huawei":
 
-        ibmc_location = vendor_data.get("DeviceLocation")
-        if ibmc_location is not None and len(ibmc_location) > 0:
+        bmc_location = vendor_data.get("DeviceLocation")
+        if bmc_location is not None and len(bmc_location) > 0:
 
-            location_string = f"Location: {ibmc_location}"
+            location_string = f"Location: {bmc_location}"
             if plugin_object.cli_args.detailed:
                 plugin_object.add_output_data("OK", f"BMC {location_string}",
                                               location=f"Manager {manager_inventory.id}")

cr_module/classes/inventory.py

@@ -17,7 +17,7 @@
 
 
 # inventory definition
-inventory_layout_version_string = "1.12.0"
+inventory_layout_version_string = "2.0.0"
 
 
 # noinspection PyBroadException
@@ -64,7 +64,7 @@ def add_relation(self, system_properties, relations_data):
 
         # set inventory attributes for system properties
         relations = {
-            "chassis": "chassi_ids",
+            "chassis": "chassis_ids",
             "systems": "system_ids",
             "managers": "manager_ids"
         }
@@ -314,7 +314,7 @@ class PowerSupply(InventoryItem):
         "bay": str,
         "capacity_in_watt": int,
         "efficiency_percent": int,
-        "chassi_ids": list,
+        "chassis_ids": list,
         "firmware": str,
         "health_status": str,
         "id": str,
@@ -337,7 +337,7 @@ class PowerControl(InventoryItem):
         "name": str,
         "health_status": str,
         "health_state": str,
-        "chassi_ids": list,
+        "chassis_ids": list,
         "power_capacity_watts": int,
         "power_allocated_watts": int,
         "power_available_watts": int,
@@ -349,7 +349,7 @@ class PowerControl(InventoryItem):
 class Temperature(InventoryItem):
     inventory_item_name = "temperature"
     valid_attributes = {
-        "chassi_ids": list,
+        "chassis_ids": list,
         "health_status": str,
         "id": str,
         "location": str,
@@ -377,7 +377,7 @@ class Fan(InventoryItem):
 class NetworkAdapter(InventoryItem):
     inventory_item_name = "network_adapter"
     valid_attributes = {
-        "chassi_ids": list,
+        "chassis_ids": list,
         "firmware": str,
         "health_status": str,
         "id": str,
@@ -401,7 +401,7 @@ class NetworkPort(InventoryItem):
         "addresses": list,
         "autoneg": bool,
         "capable_speed": int,
-        "chassi_ids": list,
+        "chassis_ids": list,
         "current_speed": int,
         "full_duplex": bool,
         "health_status": str,
@@ -426,7 +426,7 @@ class System(InventoryItem):
     inventory_item_name = "system"
     valid_attributes = {
         "bios_version": str,
-        "chassi_ids": list,
+        "chassis_ids": list,
         "cpu_num": int,
         "health_status": str,
         "host_name": str,
@@ -461,7 +461,7 @@ class Firmware(InventoryItem):
 class Manager(InventoryItem):
     inventory_item_name = "manager"
     valid_attributes = {
-        "chassi_ids": list,
+        "chassis_ids": list,
         "firmware": str,
         "health_status": str,
         "id": str,
@@ -474,8 +474,8 @@ class Manager(InventoryItem):
     }
 
 
-class Chassi(InventoryItem):
-    inventory_item_name = "chassi"
+class Chassis(InventoryItem):
+    inventory_item_name = "chassis"
     valid_attributes = {
         "health_status": str,
         "id": str,