From 8b056314f21bbea72888fea0b9ad316371f970ff Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Thu, 14 Jan 2021 09:53:04 +0100
Subject: [PATCH] [lyon] Update pyxis metrics

---
 .../sites/lyon/clusters/pyxis/pyxis.json      | 511 +++++++++---------
 .../lyon/clusters/pyxis/pyxis_metrics.yaml    | 509 ++++++++---------
 2 files changed, 518 insertions(+), 502 deletions(-)

diff --git a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
index c96ad70a1b..ae49898ea1 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
@@ -17,839 +17,848 @@
       "name": "bmc_temp_ambient_celsius",
       "period": 5000,
       "source": {
-        "id": 68,
+        "id": 41,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Power consumption of node reported by BMC, in watt",
+      "name": "bmc_node_power_watt",
+      "period": 5000,
+      "source": {
+        "id": 59,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of CPU 1 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_1A reported by BMC, in rpm",
       "labels": {
-        "cpu": "1"
+        "fan": "bpb_fan_1a"
       },
-      "name": "bmc_cpu_temp_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 3,
+        "id": 11,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of CPU 1 DTS reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_1B reported by BMC, in rpm",
       "labels": {
-        "cpu": "1"
+        "fan": "bpb_fan_1b"
       },
-      "name": "bmc_cpudts_temp_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 4,
+        "id": 12,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of CPU 2 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_2A reported by BMC, in rpm",
       "labels": {
-        "cpu": "2"
+        "fan": "bpb_fan_2a"
       },
-      "name": "bmc_cpu_temp_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 5,
+        "id": 13,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of CPU 2 DTS reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_2B reported by BMC, in rpm",
       "labels": {
-        "cpu": "2"
+        "fan": "bpb_fan_2b"
       },
-      "name": "bmc_cpudts_temp_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 6,
+        "id": 14,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of DIMMG0 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_3A reported by BMC, in rpm",
       "labels": {
-        "dimm": "g0"
+        "fan": "bpb_fan_3a"
       },
-      "name": "bmc_temp_dimm_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 7,
+        "id": 15,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of DIMMG1 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_3B reported by BMC, in rpm",
       "labels": {
-        "dimm": "g1"
+        "fan": "bpb_fan_3b"
       },
-      "name": "bmc_temp_dimm_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 8,
+        "id": 16,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of DIMMG2 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_4A reported by BMC, in rpm",
       "labels": {
-        "dimm": "g2"
+        "fan": "bpb_fan_4a"
       },
-      "name": "bmc_temp_dimm_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 9,
+        "id": 17,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of DIMMG3 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_4B reported by BMC, in rpm",
       "labels": {
-        "dimm": "g3"
+        "fan": "bpb_fan_4b"
       },
-      "name": "bmc_temp_dimm_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 10,
+        "id": 18,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of MB_TEMP1 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_5A reported by BMC, in rpm",
       "labels": {
-        "temp": "1"
+        "fan": "bpb_fan_5a"
       },
-      "name": "bmc_temp_mb_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 12,
+        "id": 19,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of MB_TEMP2 reported by BMC, in celsius",
+      "description": "Speed of BPB_FAN_5B reported by BMC, in rpm",
       "labels": {
-        "temp": "2"
+        "fan": "bpb_fan_5b"
       },
-      "name": "bmc_temp_mb_celsius",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 13,
+        "id": 20,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_3V3 reported by BMC, in volt",
+      "description": "Speed of BPB_FAN_6A reported by BMC, in rpm",
       "labels": {
-        "voltage": "p_3v3"
+        "fan": "bpb_fan_6a"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 15,
+        "id": 21,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_5V reported by BMC, in volt",
+      "description": "Speed of BPB_FAN_6B reported by BMC, in rpm",
       "labels": {
-        "voltage": "p_5v"
+        "fan": "bpb_fan_6b"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 16,
+        "id": 22,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_12V reported by BMC, in volt",
+      "description": "Speed of BPB_FAN_7A reported by BMC, in rpm",
       "labels": {
-        "voltage": "p_12v"
+        "fan": "bpb_fan_7a"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 17,
+        "id": 23,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_1V15 reported by BMC, in volt",
+      "description": "Speed of BPB_FAN_7B reported by BMC, in rpm",
       "labels": {
-        "voltage": "p_1v15"
+        "fan": "bpb_fan_7b"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 18,
+        "id": 24,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_2V5_BMC_VPP reported by BMC, in volt",
+      "description": "Speed of BPB_FAN_8A reported by BMC, in rpm",
       "labels": {
-        "voltage": "p_2v5_bmc_vpp"
+        "fan": "bpb_fan_8a"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 19,
+        "id": 25,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_3V3_C reported by BMC, in volt",
+      "description": "Speed of BPB_FAN_8B reported by BMC, in rpm",
       "labels": {
-        "voltage": "p_3v3_c"
+        "fan": "bpb_fan_8b"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 20,
+        "id": 26,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_1V8_VDD reported by BMC, in volt",
+      "description": "Power consumption of CPU 1 reported by BMC, in watt",
       "labels": {
-        "voltage": "p_1v8_vdd"
+        "cpu": "1"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_cpu_power_watt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 21,
+        "id": 27,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_0V8_VDD reported by BMC, in volt",
+      "description": "Power consumption of CPU 2 reported by BMC, in watt",
       "labels": {
-        "voltage": "p_0v8_vdd"
+        "cpu": "2"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_cpu_power_watt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 22,
+        "id": 28,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_VBAT reported by BMC, in volt",
+      "description": "Temperature of CPU reported by BMC, in celsius",
       "labels": {
-        "voltage": "p_vbat"
+        "cpu": "1"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_cpu_temp_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 23,
+        "id": 31,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_1V2_BMC reported by BMC, in volt",
+      "description": "Temperature of CPU 2 reported by BMC, in celsius",
       "labels": {
-        "voltage": "p_1v2_bmc"
+        "cpu": "2"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_cpu_temp_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 24,
+        "id": 32,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of P_12V_STBY reported by BMC, in volt",
+      "description": "Temperature of DIMMG0 reported by BMC, in celsius",
       "labels": {
-        "voltage": "p_12v_stby"
+        "dimm": "g0"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_temp_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 25,
+        "id": 33,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of VR_P0_TEMP reported by BMC, in celsius",
+      "description": "Temperature of DIMMG1 reported by BMC, in celsius",
       "labels": {
-        "vr": "p0"
+        "dimm": "g1"
       },
-      "name": "bmc_temp_vr_celsius",
+      "name": "bmc_temp_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 41,
+        "id": 34,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_P0_VOUT reported by BMC, in volt",
+      "description": "Temperature of DIMMG2 reported by BMC, in celsius",
       "labels": {
-        "voltage": "vr_p0_vout"
+        "dimm": "g2"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_temp_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 43,
+        "id": 35,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Current of VR_P0_IOUT reported by BMC, in amp",
+      "description": "Temperature of DIMMG3 reported by BMC, in celsius",
       "labels": {
-        "vr": "p0_iout"
+        "dimm": "g3"
       },
-      "name": "bmc_current_vr_amp",
+      "name": "bmc_temp_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 44,
+        "id": 36,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of VR_P1_TEMP reported by BMC, in celsius",
+      "description": "Temperature of CPU 1 DTS reported by BMC, in celsius",
       "labels": {
-        "vr": "p1"
+        "cpu": "1"
       },
-      "name": "bmc_temp_vr_celsius",
+      "name": "bmc_cpudts_temp_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 45,
+        "id": 37,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_P1_VOUT reported by BMC, in volt",
+      "description": "Temperature of CPU 2 DTS reported by BMC, in celsius",
       "labels": {
-        "voltage": "vr_p1_vout"
+        "cpu": "2"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_cpudts_temp_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 47,
+        "id": 38,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Current of VR_P1_IOUT reported by BMC, in amp",
+      "description": "Temperature of HDD_TEMP_0 reported by BMC, in celsius",
       "labels": {
-        "vr": "p1_iout"
+        "hdd": "temp_0"
       },
-      "name": "bmc_current_vr_amp",
+      "name": "bmc_temp_hdd_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 48,
+        "id": 39,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of VR_DIMMG0_TEMP reported by BMC, in celsius",
+      "description": "Temperature of HDD_TEMP_1 reported by BMC, in celsius",
       "labels": {
-        "dimm": "g0"
+        "hdd": "temp_1"
       },
-      "name": "bmc_temp_vr_dimm_celsius",
+      "name": "bmc_temp_hdd_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 49,
+        "id": 40,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG0_VIN reported by BMC, in volt",
+      "description": "Temperature of MB_TEMP1 reported by BMC, in celsius",
       "labels": {
-        "voltage": "vr_dimmg0_vin"
+        "temp": "1"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_temp_mb_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 50,
+        "id": 42,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG0_VOUT reported by BMC, in volt",
+      "description": "Temperature of MB_TEMP2 reported by BMC, in celsius",
       "labels": {
-        "voltage": "vr_dimmg0_vout"
+        "temp": "2"
       },
-      "name": "bmc_voltage_volt",
+      "name": "bmc_temp_mb_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 51,
+        "id": 43,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Current of VR_DIMMG0_IOUT reported by BMC, in amp",
+      "description": "Temperature of PSU1_HOTSPOT reported by BMC, in celsius",
       "labels": {
-        "current": "vr_dimmg0_iout"
+        "psu": "1"
       },
-      "name": "bmc_current_amp",
+      "name": "bmc_temp_psuhotspot_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 52,
+        "id": 46,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of VR_DIMMG1_TEMP reported by BMC, in celsius",
+      "description": "Voltage of P_0V8_VDD reported by BMC, in volt",
       "labels": {
-        "dimm": "g1"
+        "voltage": "p_0v8_vdd"
       },
-      "name": "bmc_temp_vr_dimm_celsius",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 53,
+        "id": 48,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG1_VIN reported by BMC, in volt",
+      "description": "Voltage of P_12V reported by BMC, in volt",
       "labels": {
-        "voltage": "vr_dimmg1_vin"
+        "voltage": "p_12v"
       },
       "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 54,
+        "id": 49,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG1_VOUT reported by BMC, in volt",
+      "description": "Voltage of P_12V_STBY reported by BMC, in volt",
       "labels": {
-        "voltage": "vr_dimmg1_vout"
+        "voltage": "p_12v_stby"
       },
       "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 55,
+        "id": 50,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Current of VR_DIMMG1_IOUT reported by BMC, in amp",
+      "description": "Voltage of P_1V15 reported by BMC, in volt",
       "labels": {
-        "current": "vr_dimmg1_iout"
+        "voltage": "p_1v15"
       },
-      "name": "bmc_current_amp",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 56,
+        "id": 51,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of VR_DIMMG2_TEMP reported by BMC, in celsius",
+      "description": "Voltage of P_1V2_BMC reported by BMC, in volt",
       "labels": {
-        "dimm": "g2"
+        "voltage": "p_1v2_bmc"
       },
-      "name": "bmc_temp_vr_dimm_celsius",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 57,
+        "id": 52,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG2_VIN reported by BMC, in volt",
+      "description": "Voltage of P_1V8_VDD reported by BMC, in volt",
       "labels": {
-        "voltage": "vr_dimmg2_vin"
+        "voltage": "p_1v8_vdd"
       },
       "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 58,
+        "id": 53,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG2_VOUT reported by BMC, in volt",
+      "description": "Voltage of P_2V5_BMC_VPP reported by BMC, in volt",
       "labels": {
-        "voltage": "vr_dimmg2_vout"
+        "voltage": "p_2v5_bmc_vpp"
       },
       "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 59,
+        "id": 54,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Current of VR_DIMMG2_IOUT reported by BMC, in amp",
+      "description": "Voltage of P_3V3 reported by BMC, in volt",
       "labels": {
-        "current": "vr_dimmg2_iout"
+        "voltage": "p_3v3"
       },
-      "name": "bmc_current_amp",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 60,
+        "id": 55,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of VR_DIMMG3_TEMP reported by BMC, in celsius",
+      "description": "Voltage of P_3V3_C reported by BMC, in volt",
       "labels": {
-        "dimm": "g3"
+        "voltage": "p_3v3_c"
       },
-      "name": "bmc_temp_vr_dimm_celsius",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 61,
+        "id": 56,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG3_VIN reported by BMC, in volt",
+      "description": "Voltage of P_5V reported by BMC, in volt",
       "labels": {
-        "voltage": "vr_dimmg3_vin"
+        "voltage": "p_5v"
       },
       "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 62,
+        "id": 57,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Voltage of VR_DIMMG3_VOUT reported by BMC, in volt",
+      "description": "Voltage of P_VBAT reported by BMC, in volt",
       "labels": {
-        "voltage": "vr_dimmg3_vout"
+        "voltage": "p_vbat"
       },
       "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 63,
+        "id": 58,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Current of VR_DIMMG3_IOUT reported by BMC, in amp",
+      "description": "Current of VR_P0_IOUT reported by BMC, in amp",
       "labels": {
-        "current": "vr_dimmg3_iout"
+        "vr": "p0_iout"
       },
-      "name": "bmc_current_amp",
+      "name": "bmc_current_vr_amp",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 64,
+        "id": 60,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of HDD_TEMP_0 reported by BMC, in celsius",
+      "description": "Current of VR_P1_IOUT reported by BMC, in amp",
       "labels": {
-        "hdd": "temp_0"
+        "vr": "p1_iout"
       },
-      "name": "bmc_temp_hdd_celsius",
+      "name": "bmc_current_vr_amp",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 83,
+        "id": 61,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of HDD_TEMP_1 reported by BMC, in celsius",
+      "description": "Current of VR_DIMMG0_IOUT reported by BMC, in amp",
       "labels": {
-        "hdd": "temp_1"
+        "current": "vr_dimmg0_iout"
       },
-      "name": "bmc_temp_hdd_celsius",
+      "name": "bmc_current_amp",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 84,
+        "id": 62,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_1A reported by BMC, in rpm",
+      "description": "Current of VR_DIMMG1_IOUT reported by BMC, in amp",
       "labels": {
-        "fan": "bpb_fan_1a"
+        "current": "vr_dimmg1_iout"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_current_amp",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 123,
+        "id": 63,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_1B reported by BMC, in rpm",
+      "description": "Current of VR_DIMMG2_IOUT reported by BMC, in amp",
       "labels": {
-        "fan": "bpb_fan_1b"
+        "current": "vr_dimmg2_iout"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_current_amp",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 124,
+        "id": 64,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_2A reported by BMC, in rpm",
+      "description": "Current of VR_DIMMG3_IOUT reported by BMC, in amp",
       "labels": {
-        "fan": "bpb_fan_2a"
+        "current": "vr_dimmg3_iout"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_current_amp",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 125,
+        "id": 65,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_2B reported by BMC, in rpm",
+      "description": "Temperature of VR_P0_TEMP reported by BMC, in celsius",
       "labels": {
-        "fan": "bpb_fan_2b"
+        "vr": "p0"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_temp_vr_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 126,
+        "id": 66,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_3A reported by BMC, in rpm",
+      "description": "Temperature of VR_P1_TEMP reported by BMC, in celsius",
       "labels": {
-        "fan": "bpb_fan_3a"
+        "vr": "p1"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_temp_vr_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 127,
+        "id": 67,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_3B reported by BMC, in rpm",
+      "description": "Temperature of VR_DIMMG0_TEMP reported by BMC, in celsius",
       "labels": {
-        "fan": "bpb_fan_3b"
+        "dimm": "g0"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_temp_vr_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 128,
+        "id": 68,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_4A reported by BMC, in rpm",
+      "description": "Temperature of VR_DIMMG1_TEMP reported by BMC, in celsius",
       "labels": {
-        "fan": "bpb_fan_4a"
+        "dimm": "g1"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_temp_vr_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 129,
+        "id": 69,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_4B reported by BMC, in rpm",
+      "description": "Temperature of VR_DIMMG2_TEMP reported by BMC, in celsius",
       "labels": {
-        "fan": "bpb_fan_4b"
+        "dimm": "g2"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_temp_vr_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 130,
+        "id": 70,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_5A reported by BMC, in rpm",
+      "description": "Temperature of VR_DIMMG3_TEMP reported by BMC, in celsius",
       "labels": {
-        "fan": "bpb_fan_5a"
+        "dimm": "g3"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_temp_vr_dimm_celsius",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 131,
+        "id": 71,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_5B reported by BMC, in rpm",
+      "description": "Voltage of VR_DIMMG0_VIN reported by BMC, in volt",
       "labels": {
-        "fan": "bpb_fan_5b"
+        "voltage": "vr_dimmg0_vin"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 132,
+        "id": 72,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_6A reported by BMC, in rpm",
+      "description": "Voltage of VR_DIMMG1_VIN reported by BMC, in volt",
       "labels": {
-        "fan": "bpb_fan_6a"
+        "voltage": "vr_dimmg1_vin"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 133,
+        "id": 73,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_6B reported by BMC, in rpm",
+      "description": "Voltage of VR_DIMMG2_VIN reported by BMC, in volt",
       "labels": {
-        "fan": "bpb_fan_6b"
+        "voltage": "vr_dimmg2_vin"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 134,
+        "id": 74,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_7A reported by BMC, in rpm",
+      "description": "Voltage of VR_DIMMG3_VIN reported by BMC, in volt",
       "labels": {
-        "fan": "bpb_fan_7a"
+        "voltage": "vr_dimmg3_vin"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 135,
+        "id": 75,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_7B reported by BMC, in rpm",
+      "description": "Voltage of VR_P0_VOUT reported by BMC, in volt",
       "labels": {
-        "fan": "bpb_fan_7b"
+        "voltage": "vr_p0_vout"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 136,
+        "id": 76,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_8A reported by BMC, in rpm",
+      "description": "Voltage of VR_P1_VOUT reported by BMC, in volt",
       "labels": {
-        "fan": "bpb_fan_8a"
+        "voltage": "vr_p1_vout"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 137,
+        "id": 77,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Speed of BPB_FAN_8B reported by BMC, in rpm",
+      "description": "Voltage of VR_DIMMG0_VOUT reported by BMC, in volt",
       "labels": {
-        "fan": "bpb_fan_8b"
+        "voltage": "vr_dimmg0_vout"
       },
-      "name": "bmc_fan_speed_rpm",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 138,
+        "id": 78,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Temperature of PSU1_HOTSPOT reported by BMC, in celsius",
+      "description": "Voltage of VR_DIMMG1_VOUT reported by BMC, in volt",
       "labels": {
-        "psu": "1"
+        "voltage": "vr_dimmg1_vout"
       },
-      "name": "bmc_temp_psuhotspot_celsius",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 152,
+        "id": 79,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Power consumption of CPU 1 reported by BMC, in watt",
+      "description": "Voltage of VR_DIMMG2_VOUT reported by BMC, in volt",
       "labels": {
-        "cpu": "1"
+        "voltage": "vr_dimmg2_vout"
       },
-      "name": "bmc_cpu_power_watt",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 168,
+        "id": 80,
         "protocol": "ipmisensor"
       }
     },
     {
-      "description": "Power consumption of CPU 2 reported by BMC, in watt",
+      "description": "Voltage of VR_DIMMG3_VOUT reported by BMC, in volt",
       "labels": {
-        "cpu": "2"
+        "voltage": "vr_dimmg3_vout"
       },
-      "name": "bmc_cpu_power_watt",
+      "name": "bmc_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 169,
+        "id": 81,
         "protocol": "ipmisensor"
       }
     },
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml
index f3a94185ec..ce343427d9 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml
@@ -28,583 +28,590 @@ metrics:
     period: 5000
     source:
       protocol: ipmisensor
-      id: 68 #INLET_AIR_TEMP
+      id: 41 #INLET_AIR_TEMP
 
-  - name: bmc_cpu_temp_celsius
-    description: Temperature of CPU 1 reported by BMC, in celsius
-    labels: {"cpu": "1"}
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 59 #SYS_POWER
+
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_1A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_1a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 3 #CPU0_TEMP
+      id: 11 #BPB_FAN_1A
 
-  - name: bmc_cpudts_temp_celsius
-    description: Temperature of CPU 1 DTS reported by BMC, in celsius
-    labels: {"cpu": "1"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_1B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_1b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 4 #CPU0_DTS
+      id: 12 #BPB_FAN_1B
 
-  - name: bmc_cpu_temp_celsius
-    description: Temperature of CPU 2 reported by BMC, in celsius
-    labels: {"cpu": "2"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_2A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_2a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 5 #CPU1_TEMP
+      id: 13 #BPB_FAN_2A
 
-  - name: bmc_cpudts_temp_celsius
-    description: Temperature of CPU 2 DTS reported by BMC, in celsius
-    labels: {"cpu": "2"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_2B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_2b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 6 #CPU1_DTS
+      id: 14 #BPB_FAN_2B
 
-  - name: bmc_temp_dimm_celsius
-    description: Temperature of DIMMG0 reported by BMC, in celsius
-    labels: {"dimm": "g0"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_3A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_3a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 7 #DIMMG0_TEMP
+      id: 15 #BPB_FAN_3A
 
-  - name: bmc_temp_dimm_celsius
-    description: Temperature of DIMMG1 reported by BMC, in celsius
-    labels: {"dimm": "g1"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_3B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_3b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 8 #DIMMG1_TEMP
+      id: 16 #BPB_FAN_3B
 
-  - name: bmc_temp_dimm_celsius
-    description: Temperature of DIMMG2 reported by BMC, in celsius
-    labels: {"dimm": "g2"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_4A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_4a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 9 #DIMMG2_TEMP
+      id: 17 #BPB_FAN_4A
 
-  - name: bmc_temp_dimm_celsius
-    description: Temperature of DIMMG3 reported by BMC, in celsius
-    labels: {"dimm": "g3"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_4B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_4b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 10 #DIMMG3_TEMP
+      id: 18 #BPB_FAN_4B
 
-  - name: bmc_temp_mb_celsius
-    description: Temperature of MB_TEMP1 reported by BMC, in celsius
-    labels: {"temp": "1"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_5A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_5a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 12 #MB_TEMP1
+      id: 19 #BPB_FAN_5A
 
-  - name: bmc_temp_mb_celsius
-    description: Temperature of MB_TEMP2 reported by BMC, in celsius
-    labels: {"temp": "2"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_5B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_5b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 13 #MB_TEMP2
+      id: 20 #BPB_FAN_5B
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_3V3 reported by BMC, in volt
-    labels: {"voltage": "p_3v3"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_6A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_6a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 15 #P_3V3
+      id: 21 #BPB_FAN_6A
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_5V reported by BMC, in volt
-    labels: {"voltage": "p_5v"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_6B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_6b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 16 #P_5V
+      id: 22 #BPB_FAN_6B
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_12V reported by BMC, in volt
-    labels: {"voltage": "p_12v"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_7A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_7a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 17 #P_12V
+      id: 23 #BPB_FAN_7A
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_1V15 reported by BMC, in volt
-    labels: {"voltage": "p_1v15"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_7B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_7b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 18 #P_1V15
+      id: 24 #BPB_FAN_7B
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_2V5_BMC_VPP reported by BMC, in volt
-    labels: {"voltage": "p_2v5_bmc_vpp"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_8A reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_8a"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 19 #P_2V5_BMC_VPP
+      id: 25 #BPB_FAN_8A
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_3V3_C reported by BMC, in volt
-    labels: {"voltage": "p_3v3_c"}
+  - name: bmc_fan_speed_rpm
+    description: Speed of BPB_FAN_8B reported by BMC, in rpm
+    labels: {"fan": "bpb_fan_8b"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 20 #P_3V3_C
+      id: 26 #BPB_FAN_8B
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_1V8_VDD reported by BMC, in volt
-    labels: {"voltage": "p_1v8_vdd"}
+  - name: bmc_cpu_power_watt
+    description: Power consumption of CPU 1 reported by BMC, in watt
+    labels: {"cpu": "1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 21 #P_1V8_VDD
+      id: 27 #CPU0_PWR
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_0V8_VDD reported by BMC, in volt
-    labels: {"voltage": "p_0v8_vdd"}
+  - name: bmc_cpu_power_watt
+    description: Power consumption of CPU 2 reported by BMC, in watt
+    labels: {"cpu": "2"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 22 #P_0V8_VDD
+      id: 28 #CPU1_PWR
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_VBAT reported by BMC, in volt
-    labels: {"voltage": "p_vbat"}
+  - name: bmc_cpu_temp_celsius
+    description: Temperature of CPU reported by BMC, in celsius
+    labels: {"cpu": "1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 23 #P_VBAT
+      id: 31 #CPU0_TEMP
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_1V2_BMC reported by BMC, in volt
-    labels: {"voltage": "p_1v2_bmc"}
+  - name: bmc_cpu_temp_celsius
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    labels: {"cpu": "2"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 24 #P_1V2_BMC
+      id: 32 #CPU1_TEMP
 
-  - name: bmc_voltage_volt
-    description: Voltage of P_12V_STBY reported by BMC, in volt
-    labels: {"voltage": "p_12v_stby"}
+  - name: bmc_temp_dimm_celsius
+    description: Temperature of DIMMG0 reported by BMC, in celsius
+    labels: {"dimm": "g0"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 25 #P_12V_STBY
+      id: 33 #DIMMG0_TEMP
 
-  - name: bmc_temp_vr_celsius
-    description: Temperature of VR_P0_TEMP reported by BMC, in celsius
-    labels: {"vr": "p0"}
+  - name: bmc_temp_dimm_celsius
+    description: Temperature of DIMMG1 reported by BMC, in celsius
+    labels: {"dimm": "g1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 41 #VR_P0_TEMP
+      id: 34 #DIMMG1_TEMP
 
-  - name: bmc_voltage_volt
-    description: Voltage of VR_P0_VOUT reported by BMC, in volt
-    labels: {"voltage": "vr_p0_vout"}
+  - name: bmc_temp_dimm_celsius
+    description: Temperature of DIMMG2 reported by BMC, in celsius
+    labels: {"dimm": "g2"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 43 #VR_P0_VOUT
+      id: 35 #DIMMG2_TEMP
 
-  - name: bmc_current_vr_amp
-    description: Current of VR_P0_IOUT reported by BMC, in amp
-    labels: {"vr": "p0_iout"}
+  - name: bmc_temp_dimm_celsius
+    description: Temperature of DIMMG3 reported by BMC, in celsius
+    labels: {"dimm": "g3"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 44 #VR_P0_IOUT
+      id: 36 #DIMMG3_TEMP
 
-  - name: bmc_temp_vr_celsius
-    description: Temperature of VR_P1_TEMP reported by BMC, in celsius
-    labels: {"vr": "p1"}
+  - name: bmc_cpudts_temp_celsius
+    description: Temperature of CPU 1 DTS reported by BMC, in celsius
+    labels: {"cpu": "1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 45 #VR_P1_TEMP
+      id: 37 #CPU0_DTS
 
-  - name: bmc_voltage_volt
-    description: Voltage of VR_P1_VOUT reported by BMC, in volt
-    labels: {"voltage": "vr_p1_vout"}
+  - name: bmc_cpudts_temp_celsius
+    description: Temperature of CPU 2 DTS reported by BMC, in celsius
+    labels: {"cpu": "2"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 47 #VR_P1_VOUT
+      id: 38 #CPU1_DTS
 
-  - name: bmc_current_vr_amp
-    description: Current of VR_P1_IOUT reported by BMC, in amp
-    labels: {"vr": "p1_iout"}
+  - name: bmc_temp_hdd_celsius
+    description: Temperature of HDD_TEMP_0 reported by BMC, in celsius
+    labels: {"hdd": "temp_0"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 48 #VR_P1_IOUT
+      id: 39 #HDD_TEMP_0
 
-  - name: bmc_temp_vr_dimm_celsius
-    description: Temperature of VR_DIMMG0_TEMP reported by BMC, in celsius
-    labels: {"dimm": "g0"}
+  - name: bmc_temp_hdd_celsius
+    description: Temperature of HDD_TEMP_1 reported by BMC, in celsius
+    labels: {"hdd": "temp_1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 49 #VR_DIMMG0_TEMP
+      id: 40 #HDD_TEMP_1
 
-  - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG0_VIN reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg0_vin"}
+  - name: bmc_temp_mb_celsius
+    description: Temperature of MB_TEMP1 reported by BMC, in celsius
+    labels: {"temp": "1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 50 #VR_DIMMG0_VIN
+      id: 42 #MB_TEMP1
 
-  - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG0_VOUT reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg0_vout"}
+  - name: bmc_temp_mb_celsius
+    description: Temperature of MB_TEMP2 reported by BMC, in celsius
+    labels: {"temp": "2"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 51 #VR_DIMMG0_VOUT
+      id: 43 #MB_TEMP2
 
-  - name: bmc_current_amp
-    description: Current of VR_DIMMG0_IOUT reported by BMC, in amp
-    labels: {"current": "vr_dimmg0_iout"}
+  - name: bmc_temp_psuhotspot_celsius
+    description: Temperature of PSU1_HOTSPOT reported by BMC, in celsius
+    labels: {"psu": "1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 52 #VR_DIMMG0_IOUT
+      id: 46 #PSU1_HOTSPOT
 
-  - name: bmc_temp_vr_dimm_celsius
-    description: Temperature of VR_DIMMG1_TEMP reported by BMC, in celsius
-    labels: {"dimm": "g1"}
+  - name: bmc_voltage_volt
+    description: Voltage of P_0V8_VDD reported by BMC, in volt
+    labels: {"voltage": "p_0v8_vdd"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 53 #VR_DIMMG1_TEMP
+      id: 48 #P_0V8_VDD
 
   - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG1_VIN reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg1_vin"}
+    description: Voltage of P_12V reported by BMC, in volt
+    labels: {"voltage": "p_12v"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 54 #VR_DIMMG1_VIN
+      id: 49 #P_12V
 
   - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG1_VOUT reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg1_vout"}
+    description: Voltage of P_12V_STBY reported by BMC, in volt
+    labels: {"voltage": "p_12v_stby"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 55 #VR_DIMMG1_VOUT
+      id: 50 #P_12V_STBY
 
-  - name: bmc_current_amp
-    description: Current of VR_DIMMG1_IOUT reported by BMC, in amp
-    labels: {"current": "vr_dimmg1_iout"}
+  - name: bmc_voltage_volt
+    description: Voltage of P_1V15 reported by BMC, in volt
+    labels: {"voltage": "p_1v15"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 56 #VR_DIMMG1_IOUT
+      id: 51 #P_1V15
 
-  - name: bmc_temp_vr_dimm_celsius
-    description: Temperature of VR_DIMMG2_TEMP reported by BMC, in celsius
-    labels: {"dimm": "g2"}
+  - name: bmc_voltage_volt
+    description: Voltage of P_1V2_BMC reported by BMC, in volt
+    labels: {"voltage": "p_1v2_bmc"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 57 #VR_DIMMG2_TEMP
+      id: 52 #P_1V2_BMC
 
   - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG2_VIN reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg2_vin"}
+    description: Voltage of P_1V8_VDD reported by BMC, in volt
+    labels: {"voltage": "p_1v8_vdd"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 58 #VR_DIMMG2_VIN
+      id: 53 #P_1V8_VDD
 
   - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG2_VOUT reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg2_vout"}
+    description: Voltage of P_2V5_BMC_VPP reported by BMC, in volt
+    labels: {"voltage": "p_2v5_bmc_vpp"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 59 #VR_DIMMG2_VOUT
+      id: 54 #P_2V5_BMC_VPP
 
-  - name: bmc_current_amp
-    description: Current of VR_DIMMG2_IOUT reported by BMC, in amp
-    labels: {"current": "vr_dimmg2_iout"}
+  - name: bmc_voltage_volt
+    description: Voltage of P_3V3 reported by BMC, in volt
+    labels: {"voltage": "p_3v3"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 60 #VR_DIMMG2_IOUT
+      id: 55 #P_3V3
 
-  - name: bmc_temp_vr_dimm_celsius
-    description: Temperature of VR_DIMMG3_TEMP reported by BMC, in celsius
-    labels: {"dimm": "g3"}
+  - name: bmc_voltage_volt
+    description: Voltage of P_3V3_C reported by BMC, in volt
+    labels: {"voltage": "p_3v3_c"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 61 #VR_DIMMG3_TEMP
+      id: 56 #P_3V3_C
 
   - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG3_VIN reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg3_vin"}
+    description: Voltage of P_5V reported by BMC, in volt
+    labels: {"voltage": "p_5v"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 62 #VR_DIMMG3_VIN
+      id: 57 #P_5V
 
   - name: bmc_voltage_volt
-    description: Voltage of VR_DIMMG3_VOUT reported by BMC, in volt
-    labels: {"voltage": "vr_dimmg3_vout"}
+    description: Voltage of P_VBAT reported by BMC, in volt
+    labels: {"voltage": "p_vbat"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 63 #VR_DIMMG3_VOUT
+      id: 58 #P_VBAT
 
-  - name: bmc_current_amp
-    description: Current of VR_DIMMG3_IOUT reported by BMC, in amp
-    labels: {"current": "vr_dimmg3_iout"}
+  - name: bmc_current_vr_amp
+    description: Current of VR_P0_IOUT reported by BMC, in amp
+    labels: {"vr": "p0_iout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 64 #VR_DIMMG3_IOUT
+      id: 60 #VR_P0_IOUT
 
-  - name: bmc_temp_hdd_celsius
-    description: Temperature of HDD_TEMP_0 reported by BMC, in celsius
-    labels: {"hdd": "temp_0"}
+  - name: bmc_current_vr_amp
+    description: Current of VR_P1_IOUT reported by BMC, in amp
+    labels: {"vr": "p1_iout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 83 #HDD_TEMP_0
+      id: 61 #VR_P1_IOUT
 
-  - name: bmc_temp_hdd_celsius
-    description: Temperature of HDD_TEMP_1 reported by BMC, in celsius
-    labels: {"hdd": "temp_1"}
+  - name: bmc_current_amp
+    description: Current of VR_DIMMG0_IOUT reported by BMC, in amp
+    labels: {"current": "vr_dimmg0_iout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 84 #HDD_TEMP_1
+      id: 62 #VR_DIMMG0_IOUT
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_1A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_1a"}
+  - name: bmc_current_amp
+    description: Current of VR_DIMMG1_IOUT reported by BMC, in amp
+    labels: {"current": "vr_dimmg1_iout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 123 #BPB_FAN_1A
+      id: 63 #VR_DIMMG1_IOUT
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_1B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_1b"}
+  - name: bmc_current_amp
+    description: Current of VR_DIMMG2_IOUT reported by BMC, in amp
+    labels: {"current": "vr_dimmg2_iout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 124 #BPB_FAN_1B
+      id: 64 #VR_DIMMG2_IOUT
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_2A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_2a"}
+  - name: bmc_current_amp
+    description: Current of VR_DIMMG3_IOUT reported by BMC, in amp
+    labels: {"current": "vr_dimmg3_iout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 125 #BPB_FAN_2A
+      id: 65 #VR_DIMMG3_IOUT
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_2B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_2b"}
+  - name: bmc_temp_vr_celsius
+    description: Temperature of VR_P0_TEMP reported by BMC, in celsius
+    labels: {"vr": "p0"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 126 #BPB_FAN_2B
+      id: 66 #VR_P0_TEMP
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_3A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_3a"}
+  - name: bmc_temp_vr_celsius
+    description: Temperature of VR_P1_TEMP reported by BMC, in celsius
+    labels: {"vr": "p1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 127 #BPB_FAN_3A
+      id: 67 #VR_P1_TEMP
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_3B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_3b"}
+  - name: bmc_temp_vr_dimm_celsius
+    description: Temperature of VR_DIMMG0_TEMP reported by BMC, in celsius
+    labels: {"dimm": "g0"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 128 #BPB_FAN_3B
+      id: 68 #VR_DIMMG0_TEMP
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_4A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_4a"}
+  - name: bmc_temp_vr_dimm_celsius
+    description: Temperature of VR_DIMMG1_TEMP reported by BMC, in celsius
+    labels: {"dimm": "g1"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 129 #BPB_FAN_4A
+      id: 69 #VR_DIMMG1_TEMP
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_4B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_4b"}
+  - name: bmc_temp_vr_dimm_celsius
+    description: Temperature of VR_DIMMG2_TEMP reported by BMC, in celsius
+    labels: {"dimm": "g2"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 130 #BPB_FAN_4B
+      id: 70 #VR_DIMMG2_TEMP
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_5A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_5a"}
+  - name: bmc_temp_vr_dimm_celsius
+    description: Temperature of VR_DIMMG3_TEMP reported by BMC, in celsius
+    labels: {"dimm": "g3"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 131 #BPB_FAN_5A
+      id: 71 #VR_DIMMG3_TEMP
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_5B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_5b"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG0_VIN reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg0_vin"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 132 #BPB_FAN_5B
+      id: 72 #VR_DIMMG0_VIN
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_6A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_6a"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG1_VIN reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg1_vin"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 133 #BPB_FAN_6A
+      id: 73 #VR_DIMMG1_VIN
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_6B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_6b"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG2_VIN reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg2_vin"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 134 #BPB_FAN_6B
+      id: 74 #VR_DIMMG2_VIN
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_7A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_7a"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG3_VIN reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg3_vin"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 135 #BPB_FAN_7A
+      id: 75 #VR_DIMMG3_VIN
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_7B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_7b"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_P0_VOUT reported by BMC, in volt
+    labels: {"voltage": "vr_p0_vout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 136 #BPB_FAN_7B
+      id: 76 #VR_P0_VOUT
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_8A reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_8a"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_P1_VOUT reported by BMC, in volt
+    labels: {"voltage": "vr_p1_vout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 137 #BPB_FAN_8A
+      id: 77 #VR_P1_VOUT
 
-  - name: bmc_fan_speed_rpm
-    description: Speed of BPB_FAN_8B reported by BMC, in rpm
-    labels: {"fan": "bpb_fan_8b"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG0_VOUT reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg0_vout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 138 #BPB_FAN_8B
+      id: 78 #VR_DIMMG0_VOUT
 
-  - name: bmc_temp_psuhotspot_celsius
-    description: Temperature of PSU1_HOTSPOT reported by BMC, in celsius
-    labels: {"psu": "1"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG1_VOUT reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg1_vout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 152 #PSU1_HOTSPOT
+      id: 79 #VR_DIMMG1_VOUT
 
-  - name: bmc_cpu_power_watt
-    description: Power consumption of CPU 1 reported by BMC, in watt
-    labels: {"cpu": "1"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG2_VOUT reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg2_vout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 168 #CPU0_PWR
+      id: 80 #VR_DIMMG2_VOUT
 
-  - name: bmc_cpu_power_watt
-    description: Power consumption of CPU 2 reported by BMC, in watt
-    labels: {"cpu": "2"}
+  - name: bmc_voltage_volt
+    description: Voltage of VR_DIMMG3_VOUT reported by BMC, in volt
+    labels: {"voltage": "vr_dimmg3_vout"}
     period: 0
     optional_period: 5000
     source:
       protocol: ipmisensor
-      id: 169 #CPU1_PWR
+      id: 81 #VR_DIMMG3_VOUT
 
   - name: prom_default_metrics
     description: Default subset of metrics from Prometheus Node Exporter
-- 
GitLab