From e28c416f65c722c3ee115ae7a416832d4ae6f2e4 Mon Sep 17 00:00:00 2001 From: Masayuki Ishii Date: Mon, 10 Jun 2024 17:49:49 +0900 Subject: [PATCH] Unified writing style of existing rule files - Changed the fields' order same as old files. - Sorted metrics settings. - Added blank lines to metrics settings. Signed-off-by: Masayuki Ishii --- redfish/rules/dell_redfish_1.0.2.yml | 24 ++--- redfish/rules/dell_redfish_1.11.0.yml | 77 ++++++++++------ redfish/rules/dell_redfish_1.17.0.yml | 121 +++++++++++++++++--------- redfish/rules/dell_redfish_1.2.0.yml | 28 +++--- redfish/rules/dell_redfish_1.4.0.yml | 69 ++++++++++----- redfish/rules/dell_redfish_1.6.0.yml | 75 ++++++++++------ 6 files changed, 250 insertions(+), 144 deletions(-) diff --git a/redfish/rules/dell_redfish_1.0.2.yml b/redfish/rules/dell_redfish_1.0.2.yml index bef324f..0bf4783 100644 --- a/redfish/rules/dell_redfish_1.0.2.yml +++ b/redfish/rules/dell_redfish_1.0.2.yml @@ -59,6 +59,18 @@ Metrics: Name: chassis_temperature_reading Type: number + - Path: /redfish/v1/Managers/{manager} + Properties: + - Pointer: /Status/Health + Name: manager_status_health + Type: health + + - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} + Properties: + - Pointer: /Status/Health + Name: manager_network_status_health + Type: health + - Path: /redfish/v1/Systems/{system} Properties: - Pointer: /Status/Health @@ -94,15 +106,3 @@ Metrics: - Pointer: /Devices/{device}/Status/Health Name: storage_device_status_health Type: health - - - Path: /redfish/v1/Managers/{manager} - Properties: - - Pointer: /Status/Health - Name: manager_status_health - Type: health - - - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} - Properties: - - Pointer: /Status/Health - Name: manager_network_status_health - Type: health diff --git a/redfish/rules/dell_redfish_1.11.0.yml b/redfish/rules/dell_redfish_1.11.0.yml index d0466e4..9895e04 100644 --- a/redfish/rules/dell_redfish_1.11.0.yml +++ b/redfish/rules/dell_redfish_1.11.0.yml @@ -1,3 +1,30 @@ +Traverse: + Root: /redfish/v1 + Excludes: + - /JsonSchemas + - /Accounts + - /Certificates + - /Jobs + - /Logs + - /Registries + - /Roles + - /Sessions + - /Settings + - /AccountService + - /CertificateService + - /EventService + - /JobService + - /LogServices + - /SessionService + - /TaskService + - /TelemetryService + - /UpdateService + - /Power/ + - /Power#/ + - /Thermal#/ + - /Assembly#/ + - /redfish/v1/Chassis/$ + Metrics: - Path: /redfish/v1/Chassis/{chassis} Properties: @@ -7,6 +34,7 @@ Metrics: - Name: chassis_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{nic} Properties: - Name: chassis_networkadapters_status_health @@ -15,6 +43,7 @@ Metrics: - Name: chassis_networkadapters_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{nic}/NetworkDeviceFunctions/{function} Properties: - Name: chassis_networkadapters_networkdevicefunctions_status_health @@ -23,6 +52,7 @@ Metrics: - Name: chassis_networkadapters_networkdevicefunctions_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{nic}/NetworkPorts/{port} Properties: - Name: chassis_networkadapters_networkports_status_health @@ -31,11 +61,13 @@ Metrics: - Name: chassis_networkadapters_networkports_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/PCIeSlots Properties: - Name: chassis_pcieslots_slots_status_state Pointer: /Slots/{slot}/Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Power Properties: - Name: chassis_power_powercontrol_powerconsumedwatts @@ -65,6 +97,7 @@ Metrics: - Name: chassis_power_voltages_status_state Pointer: /Voltages/{voltage}/Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Sensors/{sensor} Properties: - Name: chassis_sensors_status_health @@ -73,6 +106,7 @@ Metrics: - Name: chassis_sensors_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Thermal Properties: - Name: chassis_thermal_fans_status_health @@ -96,6 +130,7 @@ Metrics: - Name: chassis_thermal_temperatures_status_state Pointer: /Temperatures/{temperature}/Status/State Type: state + - Path: /redfish/v1/Fabrics/{fabric} Properties: - Name: fabrics_status_health @@ -104,6 +139,7 @@ Metrics: - Name: fabrics_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager} Properties: - Name: managers_status_health @@ -112,6 +148,7 @@ Metrics: - Name: managers_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} Properties: - Name: managers_ethernetinterfaces_status_health @@ -120,6 +157,7 @@ Metrics: - Name: managers_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/NetworkProtocol Properties: - Name: managers_networkprotocol_status_health @@ -128,6 +166,7 @@ Metrics: - Name: managers_networkprotocol_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system} Properties: - Name: systems_hostwatchdogtimer_status_state @@ -154,6 +193,7 @@ Metrics: - Name: systems_trustedmodules_status_state Pointer: /TrustedModules/{trustedmodule}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/EthernetInterfaces/{interface} Properties: - Name: systems_ethernetinterfaces_status_health @@ -162,6 +202,7 @@ Metrics: - Name: systems_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory} Properties: - Name: systems_memory_status_health @@ -170,6 +211,7 @@ Metrics: - Name: systems_memory_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory}/MemoryMetrics Properties: - Name: systems_memory_memorymetrics_healthdata_alarmtrips_addressparityerror @@ -193,6 +235,7 @@ Metrics: - Name: systems_memory_memorymetrics_healthdata_predictedmedialifeleftpercent Pointer: /HealthData/PredictedMediaLifeLeftPercent Type: number + - Path: /redfish/v1/Systems/{system}/NetworkInterfaces/{nic} Properties: - Name: systems_networkinterfaces_status_health @@ -201,6 +244,7 @@ Metrics: - Name: systems_networkinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/PCIeDevices/{device} Properties: - Name: systems_pciedevices_status_health @@ -209,6 +253,7 @@ Metrics: - Name: systems_pciedevices_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/PCIeDevices/{device}/PCIeFunctions/{function} Properties: - Name: systems_pciedevices_pciefunctions_status_health @@ -217,6 +262,7 @@ Metrics: - Name: systems_pciedevices_pciefunctions_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Processors/{processor} Properties: - Name: systems_processors_status_health @@ -225,6 +271,7 @@ Metrics: - Name: systems_processors_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/SimpleStorage/{controller} Properties: - Name: systems_simplestorage_status_health @@ -233,6 +280,7 @@ Metrics: - Name: systems_simplestorage_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage} Properties: - Name: systems_storage_status_health @@ -247,6 +295,7 @@ Metrics: - Name: systems_storage_storagecontrollers_status_state Pointer: /StorageControllers/{storagecontroller}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/Drives/{device} Properties: - Name: systems_storage_drives_failurepredicted @@ -261,6 +310,7 @@ Metrics: - Name: systems_storage_drives_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/StorageControllers/{controller} Properties: - Name: systems_storage_storagecontrollers_status_health @@ -275,6 +325,7 @@ Metrics: - Name: systems_storage_storagecontrollers_storagecontrollers_status_state Pointer: /StorageControllers/{storagecontroller}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/Volumes/{volume} Properties: - Name: systems_storage_volumes_status_health @@ -283,29 +334,3 @@ Metrics: - Name: systems_storage_volumes_status_state Pointer: /Status/State Type: state -Traverse: - Excludes: - - /JsonSchemas - - /Accounts - - /Certificates - - /Jobs - - /Logs - - /Registries - - /Roles - - /Sessions - - /Settings - - /AccountService - - /CertificateService - - /EventService - - /JobService - - /LogServices - - /SessionService - - /TaskService - - /TelemetryService - - /UpdateService - - /Power/ - - /Power#/ - - /Thermal#/ - - /Assembly#/ - - /redfish/v1/Chassis/$ - Root: /redfish/v1 diff --git a/redfish/rules/dell_redfish_1.17.0.yml b/redfish/rules/dell_redfish_1.17.0.yml index 2388835..e486b07 100644 --- a/redfish/rules/dell_redfish_1.17.0.yml +++ b/redfish/rules/dell_redfish_1.17.0.yml @@ -1,3 +1,31 @@ +Traverse: + Root: /redfish/v1 + Excludes: + - /JsonSchemas + - /Accounts + - /Certificates + - /Jobs + - /Logs + - /Registries + - /Roles + - /Sessions + - /Settings + - /AccountService + - /CertificateService + - /EventService + - /JobService + - /LogServices + - /SessionService + - /TaskService + - /TelemetryService + - /UpdateService + - /LicenseService + - /Power/ + - /Power#/ + - /Thermal#/ + - /Assembly#/ + - /redfish/v1/Chassis/$ + Metrics: - Path: /redfish/v1/Chassis/{chassis} Properties: @@ -7,6 +35,7 @@ Metrics: - Name: chassis_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{function} Properties: - Name: chassis_networkadapters_status_health @@ -15,6 +44,7 @@ Metrics: - Name: chassis_networkadapters_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{function}/NetworkDeviceFunctions/{nic} Properties: - Name: chassis_networkadapters_networkdevicefunctions_status_health @@ -23,6 +53,7 @@ Metrics: - Name: chassis_networkadapters_networkdevicefunctions_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{function}/NetworkPorts/{port} Properties: - Name: chassis_networkadapters_networkports_status_health @@ -31,6 +62,7 @@ Metrics: - Name: chassis_networkadapters_networkports_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{nic}/Ports/{port} Properties: - Name: chassis_networkadapters_ports_status_health @@ -39,6 +71,7 @@ Metrics: - Name: chassis_networkadapters_ports_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/PCIeDevices/{device} Properties: - Name: chassis_pciedevices_status_health @@ -47,6 +80,7 @@ Metrics: - Name: chassis_pciedevices_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/PCIeDevices/{device}/PCIeFunctions/{function} Properties: - Name: chassis_pciedevices_pciefunctions_status_health @@ -55,11 +89,13 @@ Metrics: - Name: chassis_pciedevices_pciefunctions_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/PCIeSlots Properties: - Name: chassis_pcieslots_slots_status_state Pointer: /Slots/{slot}/Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Power Properties: - Name: chassis_power_powercontrol_powerconsumedwatts @@ -89,6 +125,7 @@ Metrics: - Name: chassis_power_voltages_status_state Pointer: /Voltages/{voltage}/Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/PowerSubsystem Properties: - Name: chassis_powersubsystem_powersupplyredundancy_status_health @@ -103,6 +140,7 @@ Metrics: - Name: chassis_powersubsystem_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/PowerSubsystem/PowerSupplies/{unit} Properties: - Name: chassis_powersubsystem_powersupplies_status_health @@ -111,6 +149,7 @@ Metrics: - Name: chassis_powersubsystem_powersupplies_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/PowerSubsystem/PowerSupplies/{unit}/Metrics Properties: - Name: chassis_powersubsystem_powersupplies_metrics_frequencyhz_reading @@ -134,6 +173,7 @@ Metrics: - Name: chassis_powersubsystem_powersupplies_metrics_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Sensors/{sensor} Properties: - Name: chassis_sensors_reading @@ -157,6 +197,7 @@ Metrics: - Name: chassis_sensors_thresholds_uppercritical_reading Pointer: /Thresholds/UpperCritical/Reading Type: number + - Path: /redfish/v1/Chassis/{chassis}/Thermal Properties: - Name: chassis_thermal_fans_reading @@ -183,6 +224,7 @@ Metrics: - Name: chassis_thermal_temperatures_status_state Pointer: /Temperatures/{temperature}/Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/ThermalSubsystem Properties: - Name: chassis_thermalsubsystem_fanredundancy_status_health @@ -197,6 +239,7 @@ Metrics: - Name: chassis_thermalsubsystem_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/ThermalSubsystem/Fans/{unit} Properties: - Name: chassis_thermalsubsystem_fans_status_health @@ -205,6 +248,7 @@ Metrics: - Name: chassis_thermalsubsystem_fans_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/ThermalSubsystem/ThermalMetrics Properties: - Name: chassis_thermalsubsystem_thermalmetrics_temperaturereadingscelsius_reading @@ -219,6 +263,7 @@ Metrics: - Name: chassis_thermalsubsystem_thermalmetrics_temperaturesummarycelsius_internal_reading Pointer: /TemperatureSummaryCelsius/Internal/Reading Type: number + - Path: /redfish/v1/Fabrics/{fabric} Properties: - Name: fabrics_status_health @@ -227,6 +272,7 @@ Metrics: - Name: fabrics_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager} Properties: - Name: managers_status_health @@ -235,6 +281,7 @@ Metrics: - Name: managers_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} Properties: - Name: managers_ethernetinterfaces_status_health @@ -243,6 +290,7 @@ Metrics: - Name: managers_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/NetworkProtocol Properties: - Name: managers_networkprotocol_status_health @@ -251,6 +299,7 @@ Metrics: - Name: managers_networkprotocol_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system} Properties: - Name: systems_hostwatchdogtimer_status_state @@ -277,6 +326,7 @@ Metrics: - Name: systems_trustedmodules_status_state Pointer: /TrustedModules/{trustedmodule}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/EthernetInterfaces/{interface} Properties: - Name: systems_ethernetinterfaces_status_health @@ -285,6 +335,7 @@ Metrics: - Name: systems_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory} Properties: - Name: systems_memory_status_health @@ -293,6 +344,7 @@ Metrics: - Name: systems_memory_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory}/MemoryMetrics Properties: - Name: systems_memory_memorymetrics_healthdata_alarmtrips_addressparityerror @@ -316,6 +368,7 @@ Metrics: - Name: systems_memory_memorymetrics_healthdata_predictedmedialifeleftpercent Pointer: /HealthData/PredictedMediaLifeLeftPercent Type: number + - Path: /redfish/v1/Systems/{system}/NetworkInterfaces/{nic} Properties: - Name: systems_networkinterfaces_status_health @@ -324,6 +377,25 @@ Metrics: - Name: systems_networkinterfaces_status_state Pointer: /Status/State Type: state + +- Path: /redfish/v1/Systems/{system}/PCIeDevices/{device} + Properties: + - Name: systems_pciedevices_status_health + Pointer: /Status/Health + Type: health + - Name: systems_pciedevices_status_state + Pointer: /Status/State + Type: state + +- Path: /redfish/v1/Systems/{system}/PCIeDevices/{device}/PCIeFunctions/{function} + Properties: + - Name: systems_pciedevices_pciefunctions_status_health + Pointer: /Status/Health + Type: health + - Name: systems_pciedevices_pciefunctions_status_state + Pointer: /Status/State + Type: state + - Path: /redfish/v1/Systems/{system}/Processors/{processor} Properties: - Name: systems_processors_status_health @@ -332,6 +404,7 @@ Metrics: - Name: systems_processors_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/SimpleStorage/{controller} Properties: - Name: systems_simplestorage_devices_status_health @@ -346,6 +419,7 @@ Metrics: - Name: systems_simplestorage_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage} Properties: - Name: systems_storage_status_health @@ -360,6 +434,7 @@ Metrics: - Name: systems_storage_storagecontrollers_status_state Pointer: /StorageControllers/{storagecontroller}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/Controllers/{controller} Properties: - Name: systems_storage_controllers_status_health @@ -368,6 +443,7 @@ Metrics: - Name: systems_storage_controllers_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/Drives/{device} Properties: - Name: systems_storage_drives_failurepredicted @@ -382,6 +458,7 @@ Metrics: - Name: systems_storage_drives_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/StorageControllers/{controller} Properties: - Name: systems_storage_storagecontrollers_status_health @@ -396,6 +473,7 @@ Metrics: - Name: systems_storage_storagecontrollers_storagecontrollers_status_state Pointer: /StorageControllers/{storagecontroller}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/Volumes/{volume} Properties: - Name: systems_storage_volumes_status_health @@ -404,46 +482,3 @@ Metrics: - Name: systems_storage_volumes_status_state Pointer: /Status/State Type: state -- Path: /redfish/v1/Systems/{system}/PCIeDevices/{device} - Properties: - - Name: systems_pciedevices_status_health - Pointer: /Status/Health - Type: health - - Name: systems_pciedevices_status_state - Pointer: /Status/State - Type: state -- Path: /redfish/v1/Systems/{system}/PCIeDevices/{device}/PCIeFunctions/{function} - Properties: - - Name: systems_pciedevices_pciefunctions_status_health - Pointer: /Status/Health - Type: health - - Name: systems_pciedevices_pciefunctions_status_state - Pointer: /Status/State - Type: state -Traverse: - Excludes: - - /JsonSchemas - - /Accounts - - /Certificates - - /Jobs - - /Logs - - /Registries - - /Roles - - /Sessions - - /Settings - - /AccountService - - /CertificateService - - /EventService - - /JobService - - /LogServices - - /SessionService - - /TaskService - - /TelemetryService - - /UpdateService - - /LicenseService - - /Power/ - - /Power#/ - - /Thermal#/ - - /Assembly#/ - - /redfish/v1/Chassis/$ - Root: /redfish/v1 diff --git a/redfish/rules/dell_redfish_1.2.0.yml b/redfish/rules/dell_redfish_1.2.0.yml index 9e3cdbd..d29234c 100644 --- a/redfish/rules/dell_redfish_1.2.0.yml +++ b/redfish/rules/dell_redfish_1.2.0.yml @@ -59,6 +59,18 @@ Metrics: Name: chassis_temperature_reading Type: number + - Path: /redfish/v1/Managers/{manager} + Properties: + - Pointer: /Status/Health + Name: manager_status_health + Type: health + + - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} + Properties: + - Pointer: /Status/Health + Name: manager_network_status_health + Type: health + - Path: /redfish/v1/Systems/{system} Properties: - Pointer: /Status/Health @@ -86,26 +98,14 @@ Metrics: Name: processor_status_health Type: health - - Path: /redfish/v1/Systems/{system}/Storage/{controller} - Properties: - - Pointer: /Status/Health - Name: storage_controller_status_health - Type: health - - Path: /redfish/v1/Systems/{system}/Storage/Drives/{device} Properties: - Pointer: /Status/Health Name: storage_device_status_health Type: health - - Path: /redfish/v1/Managers/{manager} - Properties: - - Pointer: /Status/Health - Name: manager_status_health - Type: health - - - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} + - Path: /redfish/v1/Systems/{system}/Storage/{controller} Properties: - Pointer: /Status/Health - Name: manager_network_status_health + Name: storage_controller_status_health Type: health diff --git a/redfish/rules/dell_redfish_1.4.0.yml b/redfish/rules/dell_redfish_1.4.0.yml index f782e3d..b20f550 100644 --- a/redfish/rules/dell_redfish_1.4.0.yml +++ b/redfish/rules/dell_redfish_1.4.0.yml @@ -1,3 +1,27 @@ +Traverse: + Root: /redfish/v1 + Excludes: + - /JSONSchemas + - /Accounts + - /Certificates + - /Jobs + - /Logs + - /Registries + - /Roles + - /Sessions + - /Settings + - /AccountService + - /EventService + - /LogServices + - /SessionService + - /TaskService + - /UpdateService + - /Power/ + - /Sensors/ + - /Thermal/ + - /redfish/v1/Chassis/$ + - /StorageControllers/PCIeSSD + Metrics: - Path: /redfish/v1/Chassis/{chassis} Properties: @@ -7,6 +31,7 @@ Metrics: - Name: chassis_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Power Properties: - Name: chassis_power_powercontrol_powerconsumedwatts @@ -36,6 +61,7 @@ Metrics: - Name: chassis_power_voltages_status_state Pointer: /Voltages/{voltage}/Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Thermal Properties: - Name: chassis_thermal_fans_status_health @@ -59,6 +85,7 @@ Metrics: - Name: chassis_thermal_temperatures_status_state Pointer: /Temperatures/{temperature}/Status/State Type: state + - Path: /redfish/v1/Fabrics/{fabric} Properties: - Name: fabrics_status_health @@ -67,6 +94,7 @@ Metrics: - Name: fabrics_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager} Properties: - Name: managers_status_health @@ -75,6 +103,7 @@ Metrics: - Name: managers_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} Properties: - Name: managers_ethernetinterfaces_status_health @@ -83,6 +112,7 @@ Metrics: - Name: managers_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/NetworkProtocol Properties: - Name: managers_networkprotocol_status_health @@ -91,6 +121,7 @@ Metrics: - Name: managers_networkprotocol_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system} Properties: - Name: systems_hostwatchdogtimer_status_state @@ -117,6 +148,7 @@ Metrics: - Name: systems_trustedmodules_status_state Pointer: /TrustedModules/{trustedmodule}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/EthernetInterfaces/{interface} Properties: - Name: systems_ethernetinterfaces_status_health @@ -125,6 +157,7 @@ Metrics: - Name: systems_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory} Properties: - Name: systems_memory_status_health @@ -133,6 +166,7 @@ Metrics: - Name: systems_memory_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory}/Metrics Properties: - Name: systems_memory_metrics_healthdata_alarmtrips_addressparityerror @@ -156,6 +190,7 @@ Metrics: - Name: systems_memory_metrics_healthdata_predictedmedialifeleftpercent Pointer: /HealthData/PredictedMediaLifeLeftPercent Type: number + - Path: /redfish/v1/Systems/{system}/NetworkAdapters/{nic} Properties: - Name: systems_networkadapters_status_health @@ -164,6 +199,7 @@ Metrics: - Name: systems_networkadapters_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/NetworkAdapters/{nic}/NetworkDeviceFunctions/{function} Properties: - Name: systems_networkadapters_networkdevicefunctions_status_health @@ -172,6 +208,7 @@ Metrics: - Name: systems_networkadapters_networkdevicefunctions_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/NetworkAdapters/{nic}/NetworkPorts/{port} Properties: - Name: systems_networkadapters_networkports_status_health @@ -180,6 +217,7 @@ Metrics: - Name: systems_networkadapters_networkports_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/NetworkInterfaces/{nic} Properties: - Name: systems_networkinterfaces_status_health @@ -188,6 +226,7 @@ Metrics: - Name: systems_networkinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/PCIeDevice/{device} Properties: - Name: systems_pciedevice_status_health @@ -196,6 +235,7 @@ Metrics: - Name: systems_pciedevice_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/PCIeFunction/{function} Properties: - Name: systems_pciefunction_status_health @@ -204,6 +244,7 @@ Metrics: - Name: systems_pciefunction_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Processors/{processor} Properties: - Name: systems_processors_status_health @@ -212,6 +253,7 @@ Metrics: - Name: systems_processors_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/SimpleStorage/Controllers/{controller} Properties: - Name: systems_simplestorage_controllers_devices_status_health @@ -226,6 +268,7 @@ Metrics: - Name: systems_simplestorage_controllers_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/Drives/{device} Properties: - Name: systems_storage_drives_failurepredicted @@ -240,6 +283,7 @@ Metrics: - Name: systems_storage_drives_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/Volumes/{volume} Properties: - Name: systems_storage_volumes_status_health @@ -248,6 +292,7 @@ Metrics: - Name: systems_storage_volumes_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage} Properties: - Name: systems_storage_status_health @@ -262,6 +307,7 @@ Metrics: - Name: systems_storage_storagecontrollers_status_state Pointer: /StorageControllers/{storagecontroller}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/StorageControllers/{controller} Properties: - Name: systems_storagecontrollers_status_health @@ -270,26 +316,3 @@ Metrics: - Name: systems_storagecontrollers_status_state Pointer: /Status/State Type: state -Traverse: - Excludes: - - /JSONSchemas - - /Accounts - - /Certificates - - /Jobs - - /Logs - - /Registries - - /Roles - - /Sessions - - /Settings - - /AccountService - - /EventService - - /LogServices - - /SessionService - - /TaskService - - /UpdateService - - /Power/ - - /Sensors/ - - /Thermal/ - - /redfish/v1/Chassis/$ - - /StorageControllers/PCIeSSD - Root: /redfish/v1 diff --git a/redfish/rules/dell_redfish_1.6.0.yml b/redfish/rules/dell_redfish_1.6.0.yml index 92fdf6a..f6f812d 100644 --- a/redfish/rules/dell_redfish_1.6.0.yml +++ b/redfish/rules/dell_redfish_1.6.0.yml @@ -1,3 +1,30 @@ +Traverse: + Root: /redfish/v1 + Excludes: + - /JsonSchemas + - /Accounts + - /Certificates + - /Jobs + - /Logs + - /Registries + - /Roles + - /Sessions + - /Settings + - /AccountService + - /CertificateService + - /EventService + - /JobService + - /LogServices + - /SessionService + - /TaskService + - /TelemetryService + - /UpdateService + - /Power/ + - /Power#/ + - /Thermal#/ + - /Assembly#/ + - /redfish/v1/Chassis/$ + Metrics: - Path: /redfish/v1/Chassis/{chassis} Properties: @@ -7,6 +34,7 @@ Metrics: - Name: chassis_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{nic} Properties: - Name: chassis_networkadapters_status_health @@ -15,6 +43,7 @@ Metrics: - Name: chassis_networkadapters_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{nic}/NetworkDeviceFunctions/{function} Properties: - Name: chassis_networkadapters_networkdevicefunctions_status_health @@ -23,6 +52,7 @@ Metrics: - Name: chassis_networkadapters_networkdevicefunctions_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/NetworkAdapters/{nic}/NetworkPorts/{port} Properties: - Name: chassis_networkadapters_networkports_status_health @@ -31,6 +61,7 @@ Metrics: - Name: chassis_networkadapters_networkports_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Power Properties: - Name: chassis_power_powercontrol_powerconsumedwatts @@ -60,6 +91,7 @@ Metrics: - Name: chassis_power_voltages_status_state Pointer: /Voltages/{voltage}/Status/State Type: state + - Path: /redfish/v1/Chassis/{chassis}/Thermal Properties: - Name: chassis_thermal_fans_status_health @@ -83,6 +115,7 @@ Metrics: - Name: chassis_thermal_temperatures_status_state Pointer: /Temperatures/{temperature}/Status/State Type: state + - Path: /redfish/v1/Fabrics/{fabric} Properties: - Name: fabrics_status_health @@ -91,6 +124,7 @@ Metrics: - Name: fabrics_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager} Properties: - Name: managers_status_health @@ -99,6 +133,7 @@ Metrics: - Name: managers_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/EthernetInterfaces/{interface} Properties: - Name: managers_ethernetinterfaces_status_health @@ -107,6 +142,7 @@ Metrics: - Name: managers_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Managers/{manager}/NetworkProtocol Properties: - Name: managers_networkprotocol_status_health @@ -115,6 +151,7 @@ Metrics: - Name: managers_networkprotocol_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system} Properties: - Name: systems_hostwatchdogtimer_status_state @@ -141,6 +178,7 @@ Metrics: - Name: systems_trustedmodules_status_state Pointer: /TrustedModules/{trustedmodule}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/EthernetInterfaces/{interface} Properties: - Name: systems_ethernetinterfaces_status_health @@ -149,6 +187,7 @@ Metrics: - Name: systems_ethernetinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory} Properties: - Name: systems_memory_status_health @@ -157,6 +196,7 @@ Metrics: - Name: systems_memory_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Memory/{memory}/MemoryMetrics Properties: - Name: systems_memory_memorymetrics_healthdata_alarmtrips_addressparityerror @@ -180,6 +220,7 @@ Metrics: - Name: systems_memory_memorymetrics_healthdata_predictedmedialifeleftpercent Pointer: /HealthData/PredictedMediaLifeLeftPercent Type: number + - Path: /redfish/v1/Systems/{system}/NetworkInterfaces/{nic} Properties: - Name: systems_networkinterfaces_status_health @@ -188,6 +229,7 @@ Metrics: - Name: systems_networkinterfaces_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/PCIeDevices/{device} Properties: - Name: systems_pciedevices_status_health @@ -196,6 +238,7 @@ Metrics: - Name: systems_pciedevices_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/PCIeDevices/{device}/PCIeFunctions/{function} Properties: - Name: systems_pciedevices_pciefunctions_status_health @@ -204,6 +247,7 @@ Metrics: - Name: systems_pciedevices_pciefunctions_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Processors/{processor} Properties: - Name: systems_processors_status_health @@ -212,6 +256,7 @@ Metrics: - Name: systems_processors_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/SimpleStorage/{controller} Properties: - Name: systems_simplestorage_status_health @@ -220,6 +265,7 @@ Metrics: - Name: systems_simplestorage_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage} Properties: - Name: systems_storage_status_health @@ -234,6 +280,7 @@ Metrics: - Name: systems_storage_storagecontrollers_status_state Pointer: /StorageControllers/{storagecontroller}/Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/Drives/{device} Properties: - Name: systems_storage_drives_failurepredicted @@ -248,6 +295,7 @@ Metrics: - Name: systems_storage_drives_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/Storage/{storage}/Volumes/{volume} Properties: - Name: systems_storage_volumes_status_health @@ -256,6 +304,7 @@ Metrics: - Name: systems_storage_volumes_status_state Pointer: /Status/State Type: state + - Path: /redfish/v1/Systems/{system}/StorageControllers/{controller} Properties: - Name: systems_storagecontrollers_status_health @@ -264,29 +313,3 @@ Metrics: - Name: systems_storagecontrollers_status_state Pointer: /Status/State Type: state -Traverse: - Excludes: - - /JsonSchemas - - /Accounts - - /Certificates - - /Jobs - - /Logs - - /Registries - - /Roles - - /Sessions - - /Settings - - /AccountService - - /CertificateService - - /EventService - - /JobService - - /LogServices - - /SessionService - - /TaskService - - /TelemetryService - - /UpdateService - - /Power/ - - /Power#/ - - /Thermal#/ - - /Assembly#/ - - /redfish/v1/Chassis/$ - Root: /redfish/v1