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 <[email protected]>
cybozu-go · Jun 10, 2024 · e28c416 · e28c416
1 parent 360a703
commit e28c416
Show file tree

Hide file tree

Showing 6 changed files with 250 additions and 144 deletions.
diff --git 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
@@ -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