From 59e343677ab3416165233bcdd52c598412465eeb Mon Sep 17 00:00:00 2001
From: Noah Mandler <noah.mandler@inria.fr>
Date: Wed, 26 Feb 2025 09:53:34 +0100
Subject: [PATCH 1/3] [rennes][abacus28] Add BMC metrics for Kwollect

---
 .../rennes/clusters/abacus28/abacus28.json    | 514 ++++++++++++++++++
 .../clusters/abacus28/abacus28_metrics.yaml   | 362 +++++++++++-
 2 files changed, 874 insertions(+), 2 deletions(-)

diff --git a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
index 4fcd84577f5..0a7da11b71d 100644
--- a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
+++ b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
@@ -5,6 +5,520 @@
   "kavlan": true,
   "manufactured_at": "2020-12-05",
   "metrics": [
+    {
+      "description": "Temperature of Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 1,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature reported by BMC, in celsius",
+      "name": "bmc_ambient_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 3,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan1A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan1a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 31,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan1B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan1b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 32,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan2A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan2a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 33,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan2B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan2b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 34,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan3A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan3a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 35,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan3B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan3b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 36,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Current of Current 1 reported by BMC, in amp",
+      "labels": {
+        "id": "current1"
+      },
+      "name": "bmc_other_current_amp",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 44,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Current of Current 2 reported by BMC, in amp",
+      "labels": {
+        "id": "current2"
+      },
+      "name": "bmc_other_current_amp",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 45,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Voltage of Voltage 1 reported by BMC, in volt",
+      "labels": {
+        "id": "voltage1"
+      },
+      "name": "bmc_other_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 46,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Voltage of Voltage 2 reported by BMC, in volt",
+      "labels": {
+        "id": "voltage2"
+      },
+      "name": "bmc_other_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 47,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Power consumption of Pwr Consumption reported by BMC, in watt",
+      "labels": {
+        "id": "pwrconsumption"
+      },
+      "name": "bmc_other_power_watt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 53,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of IO Usage reported by BMC, in percent",
+      "labels": {
+        "id": "iousage"
+      },
+      "name": "bmc_other_usage_percent",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 60,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of MEM Usage reported by BMC, in percent",
+      "labels": {
+        "id": "memusage"
+      },
+      "name": "bmc_other_usage_percent",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 61,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of SYS Usage reported by BMC, in percent",
+      "labels": {
+        "id": "sysusage"
+      },
+      "name": "bmc_other_usage_percent",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 62,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Usage of CPU Usage reported by BMC, in percent",
+      "labels": {
+        "id": "cpuusage"
+      },
+      "name": "bmc_other_usage_percent",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 63,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan4A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan4a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 124,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan4B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan4b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 125,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan5A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan5a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 126,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan5B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan5b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 127,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan6A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan6a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 128,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan6B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan6b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 129,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan7A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan7a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 130,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan7B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan7b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 131,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan8A reported by BMC, in rpm",
+      "labels": {
+        "id": "fan8a"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 132,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Speed of Fan8B reported by BMC, in rpm",
+      "labels": {
+        "id": "fan8b"
+      },
+      "name": "bmc_other_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 133,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature reported by BMC, in celsius",
+      "name": "bmc_exhaust_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 144,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT1 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot1temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 155,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT2 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot2temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 156,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT4 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot4temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 157,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT3 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot3temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 158,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT5 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot5temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 166,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT6 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot6temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 167,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT7 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot7temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 168,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT8 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot8temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 169,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Temperature of SLOT9 Temp reported by BMC, in celsius",
+      "labels": {
+        "id": "slot9temp"
+      },
+      "name": "bmc_other_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 170,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Voltage of VCORE VR reported by BMC, in volt",
+      "labels": {
+        "id": "vcorevr"
+      },
+      "name": "bmc_other_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 202,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Voltage of MEM012 VR reported by BMC, in volt",
+      "labels": {
+        "id": "mem012vr"
+      },
+      "name": "bmc_other_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 204,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Voltage of MEM345 VR reported by BMC, in volt",
+      "labels": {
+        "id": "mem345vr"
+      },
+      "name": "bmc_other_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": 205,
+        "protocol": "ipmisensor"
+      }
+    },
     {
       "description": "Default subset of metrics from Prometheus Node Exporter",
       "name": "prom_default_metrics",
diff --git a/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
index a59d3e58fa6..875ea6df62c 100644
--- a/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
@@ -1,6 +1,364 @@
 ---
 metrics:
 
+  - name: bmc_other_temp_celsius
+    labels: {"id": "temp"}
+    description: Temperature of Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 1 #Temp
+
+  - name: bmc_ambient_temp_celsius
+    description: Temperature reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3 #Inlet Temp
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan1a"}
+    description: Speed of Fan1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 31 #Fan1A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan1b"}
+    description: Speed of Fan1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 32 #Fan1B
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan2a"}
+    description: Speed of Fan2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 33 #Fan2A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan2b"}
+    description: Speed of Fan2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 34 #Fan2B
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan3a"}
+    description: Speed of Fan3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 35 #Fan3A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan3b"}
+    description: Speed of Fan3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 36 #Fan3B
+
+  - name: bmc_other_current_amp
+    labels: {"id": "current1"}
+    description: Current of Current 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 44 #Current 1
+
+  - name: bmc_other_current_amp
+    labels: {"id": "current2"}
+    description: Current of Current 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 45 #Current 2
+
+  - name: bmc_other_voltage_volt
+    labels: {"id": "voltage1"}
+    description: Voltage of Voltage 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 46 #Voltage 1
+
+  - name: bmc_other_voltage_volt
+    labels: {"id": "voltage2"}
+    description: Voltage of Voltage 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 47 #Voltage 2
+
+  - name: bmc_other_power_watt
+    labels: {"id": "pwrconsumption"}
+    description: Power consumption of Pwr Consumption reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 53 #Pwr Consumption
+
+  - name: bmc_other_usage_percent
+    labels: {"id": "iousage"}
+    description: Usage of IO Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 60 #IO Usage
+
+  - name: bmc_other_usage_percent
+    labels: {"id": "memusage"}
+    description: Usage of MEM Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 61 #MEM Usage
+
+  - name: bmc_other_usage_percent
+    labels: {"id": "sysusage"}
+    description: Usage of SYS Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 62 #SYS Usage
+
+  - name: bmc_other_usage_percent
+    labels: {"id": "cpuusage"}
+    description: Usage of CPU Usage reported by BMC, in percent
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 63 #CPU Usage
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan4a"}
+    description: Speed of Fan4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 124 #Fan4A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan4b"}
+    description: Speed of Fan4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 125 #Fan4B
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan5a"}
+    description: Speed of Fan5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 126 #Fan5A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan5b"}
+    description: Speed of Fan5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 127 #Fan5B
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan6a"}
+    description: Speed of Fan6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 128 #Fan6A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan6b"}
+    description: Speed of Fan6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 129 #Fan6B
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan7a"}
+    description: Speed of Fan7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 130 #Fan7A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan7b"}
+    description: Speed of Fan7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 131 #Fan7B
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan8a"}
+    description: Speed of Fan8A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 132 #Fan8A
+
+  - name: bmc_other_speed_rpm
+    labels: {"id": "fan8b"}
+    description: Speed of Fan8B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 133 #Fan8B
+
+  - name: bmc_exhaust_temp_celsius
+    description: Temperature reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 144 #Exhaust Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot1temp"}
+    description: Temperature of SLOT1 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 155 #SLOT1 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot2temp"}
+    description: Temperature of SLOT2 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 156 #SLOT2 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot4temp"}
+    description: Temperature of SLOT4 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 157 #SLOT4 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot3temp"}
+    description: Temperature of SLOT3 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 158 #SLOT3 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot5temp"}
+    description: Temperature of SLOT5 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 166 #SLOT5 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot6temp"}
+    description: Temperature of SLOT6 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 167 #SLOT6 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot7temp"}
+    description: Temperature of SLOT7 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 168 #SLOT7 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot8temp"}
+    description: Temperature of SLOT8 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 169 #SLOT8 Temp
+
+  - name: bmc_other_temp_celsius
+    labels: {"id": "slot9temp"}
+    description: Temperature of SLOT9 Temp reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 170 #SLOT9 Temp
+
+  - name: bmc_other_voltage_volt
+    labels: {"id": "vcorevr"}
+    description: Voltage of VCORE VR reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 202 #VCORE VR
+
+  - name: bmc_other_voltage_volt
+    labels: {"id": "mem012vr"}
+    description: Voltage of MEM012 VR reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 204 #MEM012 VR
+
+  - name: bmc_other_voltage_volt
+    labels: {"id": "mem345vr"}
+    description: Voltage of MEM345 VR reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 205 #MEM345 VR
+
   - name: prom_default_metrics
     description: Default subset of metrics from Prometheus Node Exporter
     period: 0
@@ -54,11 +412,11 @@ metrics:
         - DCGM_FI_DEV_GPU_TEMP
         - DCGM_FI_DEV_POWER_USAGE
         - DCGM_FI_DEV_MEM_COPY_UTIL
-
+  
   - name: prom_nvgpu_all_metrics
     description: All metrics from Prometheus Nvidia DCGM Exporter
     period: 0
     optional_period: 15000
     source:
       protocol: prometheus
-      port: 9400
+      port: 9400      
\ No newline at end of file
-- 
GitLab


From 8eee15ca978e47ac09291ec94397d6dd287ef414 Mon Sep 17 00:00:00 2001
From: Noah Mandler <noah.mandler@inria.fr>
Date: Fri, 28 Feb 2025 10:55:06 +0100
Subject: [PATCH 2/3] [rennes][abacus28] Add BMC metrics for Kwollect using
 SNMP

---
 .../clusters/abacus28/abacus28_metrics.yaml   | 399 +++++++-----------
 1 file changed, 142 insertions(+), 257 deletions(-)

diff --git a/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
index 875ea6df62c..e6f6fe5eeb2 100644
--- a/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
@@ -1,363 +1,248 @@
 ---
 metrics:
 
-  - name: bmc_other_temp_celsius
-    labels: {"id": "temp"}
-    description: Temperature of Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 1 #Temp
-
   - name: bmc_ambient_temp_celsius
-    description: Temperature reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 3 #Inlet Temp
-
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan1a"}
-    description: Speed of Fan1A reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
+    description: Front node ambient temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
     source:
-      protocol: ipmisensor
-      id: 31 #Fan1A
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan1b"}
-    description: Speed of Fan1B reported by BMC, in rpm
-    period: 0
-    optional_period: 5000
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
     source:
-      protocol: ipmisensor
-      id: 32 #Fan1B
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == System Board Pwr Consumption }}
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan2a"}
-    description: Speed of Fan2A reported by BMC, in rpm
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 33 #Fan2A
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan2b"}
-    description: Speed of Fan2B reported by BMC, in rpm
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 34 #Fan2B
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan3a"}
-    description: Speed of Fan3A reported by BMC, in rpm
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
     period: 0
     optional_period: 5000
+    scale_factor: 0.1
     source:
-      protocol: ipmisensor
-      id: 35 #Fan3A
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == PS1 Current 1 }}
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan3b"}
-    description: Speed of Fan3B reported by BMC, in rpm
+  - name: bmc_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
     period: 0
     optional_period: 5000
+    scale_factor: 0.1
     source:
-      protocol: ipmisensor
-      id: 36 #Fan3B
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == PS2 Current 2 }}
 
-  - name: bmc_other_current_amp
-    labels: {"id": "current1"}
-    description: Current of Current 1 reported by BMC, in amp
+  - name: bmc_node_power_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt-hour
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 44 #Current 1
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
 
-  - name: bmc_other_current_amp
-    labels: {"id": "current2"}
-    description: Current of Current 2 reported by BMC, in amp
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 45 #Current 2
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
 
-  - name: bmc_other_voltage_volt
-    labels: {"id": "voltage1"}
-    description: Voltage of Voltage 1 reported by BMC, in volt
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 46 #Voltage 1
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
 
-  - name: bmc_other_voltage_volt
-    labels: {"id": "voltage2"}
-    description: Voltage of Voltage 2 reported by BMC, in volt
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 47 #Voltage 2
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
 
-  - name: bmc_other_power_watt
-    labels: {"id": "pwrconsumption"}
-    description: Power consumption of Pwr Consumption reported by BMC, in watt
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 53 #Pwr Consumption
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
 
-  - name: bmc_other_usage_percent
-    labels: {"id": "iousage"}
-    description: Usage of IO Usage reported by BMC, in percent
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 60 #IO Usage
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
 
-  - name: bmc_other_usage_percent
-    labels: {"id": "memusage"}
-    description: Usage of MEM Usage reported by BMC, in percent
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 61 #MEM Usage
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
 
-  - name: bmc_other_usage_percent
-    labels: {"id": "sysusage"}
-    description: Usage of SYS Usage reported by BMC, in percent
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 62 #SYS Usage
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
 
-  - name: bmc_other_usage_percent
-    labels: {"id": "cpuusage"}
-    description: Usage of CPU Usage reported by BMC, in percent
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 63 #CPU Usage
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan4a"}
-    description: Speed of Fan4A reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 124 #Fan4A
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan4b"}
-    description: Speed of Fan4B reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 125 #Fan4B
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan5a"}
-    description: Speed of Fan5A reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 126 #Fan5A
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan5b"}
-    description: Speed of Fan5B reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 127 #Fan5B
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan6a"}
-    description: Speed of Fan6A reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 128 #Fan6A
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan6b"}
-    description: Speed of Fan6B reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 129 #Fan6B
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan7a"}
-    description: Speed of Fan7A reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8a"}
+    description: Speed of Fan 8A reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 130 #Fan7A
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan7b"}
-    description: Speed of Fan7B reported by BMC, in rpm
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8b"}
+    description: Speed of Fan 8B reported by BMC, in rpm
     period: 0
     optional_period: 5000
     source:
-      protocol: ipmisensor
-      id: 131 #Fan7B
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan8a"}
-    description: Speed of Fan8A reported by BMC, in rpm
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
     period: 0
     optional_period: 5000
+    scale_factor: 0.1
     source:
-      protocol: ipmisensor
-      id: 132 #Fan8A
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
 
-  - name: bmc_other_speed_rpm
-    labels: {"id": "fan8b"}
-    description: Speed of Fan8B reported by BMC, in rpm
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
     period: 0
     optional_period: 5000
+    scale_factor: 0.1
     source:
-      protocol: ipmisensor
-      id: 133 #Fan8B
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
 
   - name: bmc_exhaust_temp_celsius
-    description: Temperature reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 144 #Exhaust Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot1temp"}
-    description: Temperature of SLOT1 Temp reported by BMC, in celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
     period: 0
     optional_period: 5000
+    scale_factor: 0.1
     source:
-      protocol: ipmisensor
-      id: 155 #SLOT1 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot2temp"}
-    description: Temperature of SLOT2 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 156 #SLOT2 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot4temp"}
-    description: Temperature of SLOT4 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 157 #SLOT4 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot3temp"}
-    description: Temperature of SLOT3 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 158 #SLOT3 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot5temp"}
-    description: Temperature of SLOT5 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 166 #SLOT5 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot6temp"}
-    description: Temperature of SLOT6 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 167 #SLOT6 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot7temp"}
-    description: Temperature of SLOT7 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 168 #SLOT7 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot8temp"}
-    description: Temperature of SLOT8 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 169 #SLOT8 Temp
-
-  - name: bmc_other_temp_celsius
-    labels: {"id": "slot9temp"}
-    description: Temperature of SLOT9 Temp reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 170 #SLOT9 Temp
-
-  - name: bmc_other_voltage_volt
-    labels: {"id": "vcorevr"}
-    description: Voltage of VCORE VR reported by BMC, in volt
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 202 #VCORE VR
-
-  - name: bmc_other_voltage_volt
-    labels: {"id": "mem012vr"}
-    description: Voltage of MEM012 VR reported by BMC, in volt
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 204 #MEM012 VR
-
-  - name: bmc_other_voltage_volt
-    labels: {"id": "mem345vr"}
-    description: Voltage of MEM345 VR reported by BMC, in volt
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 205 #MEM345 VR
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
 
   - name: prom_default_metrics
     description: Default subset of metrics from Prometheus Node Exporter
@@ -412,7 +297,7 @@ metrics:
         - DCGM_FI_DEV_GPU_TEMP
         - DCGM_FI_DEV_POWER_USAGE
         - DCGM_FI_DEV_MEM_COPY_UTIL
-  
+
   - name: prom_nvgpu_all_metrics
     description: All metrics from Prometheus Nvidia DCGM Exporter
     period: 0
-- 
GitLab


From 9af30b2e1ae7b4c0b9134fb66e98e1fdce47a659 Mon Sep 17 00:00:00 2001
From: Noah Mandler <noah.mandler@inria.fr>
Date: Fri, 28 Feb 2025 10:56:03 +0100
Subject: [PATCH 3/3] [rennes][abacus28] Generate reference-api

---
 .../rennes/clusters/abacus28/abacus28.json    | 448 ++++++------------
 1 file changed, 132 insertions(+), 316 deletions(-)

diff --git a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
index 0a7da11b71d..a2388c98a80 100644
--- a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
+++ b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
@@ -6,517 +6,333 @@
   "manufactured_at": "2020-12-05",
   "metrics": [
     {
-      "description": "Temperature of Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 1,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature reported by BMC, in celsius",
+      "description": "Front node ambient temperature reported by BMC, in celsius",
       "name": "bmc_ambient_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 3,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Speed of Fan1A reported by BMC, in rpm",
-      "labels": {
-        "id": "fan1a"
-      },
-      "name": "bmc_other_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
+      "period": 5000,
+      "scale_factor": 0.1,
       "source": {
-        "id": 31,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan1B reported by BMC, in rpm",
-      "labels": {
-        "id": "fan1b"
-      },
-      "name": "bmc_other_speed_rpm",
-      "optional_period": 5000,
-      "period": 0,
+      "description": "Power consumption of node reported by BMC, in watt",
+      "name": "bmc_node_power_watt",
+      "period": 5000,
       "source": {
-        "id": 32,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan2A reported by BMC, in rpm",
+      "description": "Voltage of PSU 1 reported by BMC, in volt",
       "labels": {
-        "id": "fan2a"
+        "psu": "1"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_psu_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 33,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan2B reported by BMC, in rpm",
+      "description": "Voltage of PSU 2 reported by BMC, in volt",
       "labels": {
-        "id": "fan2b"
+        "psu": "2"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_psu_voltage_volt",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 34,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan3A reported by BMC, in rpm",
+      "description": "Current of PSU 1 reported by BMC, in amp",
       "labels": {
-        "id": "fan3a"
+        "psu": "1"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_psu_current_amp",
       "optional_period": 5000,
       "period": 0,
+      "scale_factor": 0.1,
       "source": {
-        "id": 35,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan3B reported by BMC, in rpm",
+      "description": "Current of PSU 2 reported by BMC, in amp",
       "labels": {
-        "id": "fan3b"
+        "psu": "2"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_psu_current_amp",
       "optional_period": 5000,
       "period": 0,
+      "scale_factor": 0.1,
       "source": {
-        "id": 36,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Current of Current 1 reported by BMC, in amp",
-      "labels": {
-        "id": "current1"
-      },
-      "name": "bmc_other_current_amp",
+      "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
+      "name": "bmc_node_power_watthour_total",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 44,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Current of Current 2 reported by BMC, in amp",
+      "description": "Speed of Fan 1A reported by BMC, in rpm",
       "labels": {
-        "id": "current2"
+        "fan": "1a"
       },
-      "name": "bmc_other_current_amp",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 45,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Voltage of Voltage 1 reported by BMC, in volt",
+      "description": "Speed of Fan 1B reported by BMC, in rpm",
       "labels": {
-        "id": "voltage1"
+        "fan": "1b"
       },
-      "name": "bmc_other_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 46,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Voltage of Voltage 2 reported by BMC, in volt",
+      "description": "Speed of Fan 2A reported by BMC, in rpm",
       "labels": {
-        "id": "voltage2"
+        "fan": "2a"
       },
-      "name": "bmc_other_voltage_volt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 47,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Power consumption of Pwr Consumption reported by BMC, in watt",
+      "description": "Speed of Fan 2B reported by BMC, in rpm",
       "labels": {
-        "id": "pwrconsumption"
+        "fan": "2b"
       },
-      "name": "bmc_other_power_watt",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 53,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Usage of IO Usage reported by BMC, in percent",
+      "description": "Speed of Fan 3A reported by BMC, in rpm",
       "labels": {
-        "id": "iousage"
+        "fan": "3a"
       },
-      "name": "bmc_other_usage_percent",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 60,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Usage of MEM Usage reported by BMC, in percent",
+      "description": "Speed of Fan 3B reported by BMC, in rpm",
       "labels": {
-        "id": "memusage"
+        "fan": "3b"
       },
-      "name": "bmc_other_usage_percent",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 61,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Usage of SYS Usage reported by BMC, in percent",
+      "description": "Speed of Fan 4A reported by BMC, in rpm",
       "labels": {
-        "id": "sysusage"
+        "fan": "4a"
       },
-      "name": "bmc_other_usage_percent",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 62,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Usage of CPU Usage reported by BMC, in percent",
+      "description": "Speed of Fan 4B reported by BMC, in rpm",
       "labels": {
-        "id": "cpuusage"
+        "fan": "4b"
       },
-      "name": "bmc_other_usage_percent",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 63,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan4A reported by BMC, in rpm",
+      "description": "Speed of Fan 5A reported by BMC, in rpm",
       "labels": {
-        "id": "fan4a"
+        "fan": "5a"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 124,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan4B reported by BMC, in rpm",
+      "description": "Speed of Fan 5B reported by BMC, in rpm",
       "labels": {
-        "id": "fan4b"
+        "fan": "5b"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 125,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan5A reported by BMC, in rpm",
+      "description": "Speed of Fan 6A reported by BMC, in rpm",
       "labels": {
-        "id": "fan5a"
+        "fan": "6a"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 126,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan5B reported by BMC, in rpm",
+      "description": "Speed of Fan 6B reported by BMC, in rpm",
       "labels": {
-        "id": "fan5b"
+        "fan": "6b"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 127,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan6A reported by BMC, in rpm",
+      "description": "Speed of Fan 7A reported by BMC, in rpm",
       "labels": {
-        "id": "fan6a"
+        "fan": "7a"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 128,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan6B reported by BMC, in rpm",
+      "description": "Speed of Fan 7B reported by BMC, in rpm",
       "labels": {
-        "id": "fan6b"
+        "fan": "7b"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 129,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan7A reported by BMC, in rpm",
+      "description": "Speed of Fan 8A reported by BMC, in rpm",
       "labels": {
-        "id": "fan7a"
+        "fan": "8a"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 130,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan7B reported by BMC, in rpm",
+      "description": "Speed of Fan 8B reported by BMC, in rpm",
       "labels": {
-        "id": "fan7b"
+        "fan": "8b"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_fan_speed_rpm",
       "optional_period": 5000,
       "period": 0,
       "source": {
-        "id": 131,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan8A reported by BMC, in rpm",
+      "description": "Temperature of CPU 1 reported by BMC, in celsius",
       "labels": {
-        "id": "fan8a"
+        "cpu": "1"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_cpu_temp_celsius",
       "optional_period": 5000,
       "period": 0,
+      "scale_factor": 0.1,
       "source": {
-        "id": 132,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Speed of Fan8B reported by BMC, in rpm",
+      "description": "Temperature of CPU 2 reported by BMC, in celsius",
       "labels": {
-        "id": "fan8b"
+        "cpu": "2"
       },
-      "name": "bmc_other_speed_rpm",
+      "name": "bmc_cpu_temp_celsius",
       "optional_period": 5000,
       "period": 0,
+      "scale_factor": 0.1,
       "source": {
-        "id": 133,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
+        "protocol": "snmp"
       }
     },
     {
-      "description": "Temperature reported by BMC, in celsius",
+      "description": "Temperature of exhausted air reported by BMC, in celsius",
       "name": "bmc_exhaust_temp_celsius",
       "optional_period": 5000,
       "period": 0,
+      "scale_factor": 0.1,
       "source": {
-        "id": 144,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT1 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot1temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 155,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT2 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot2temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 156,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT4 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot4temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 157,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT3 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot3temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 158,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT5 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot5temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 166,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT6 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot6temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 167,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT7 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot7temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 168,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT8 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot8temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 169,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Temperature of SLOT9 Temp reported by BMC, in celsius",
-      "labels": {
-        "id": "slot9temp"
-      },
-      "name": "bmc_other_temp_celsius",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 170,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Voltage of VCORE VR reported by BMC, in volt",
-      "labels": {
-        "id": "vcorevr"
-      },
-      "name": "bmc_other_voltage_volt",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 202,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Voltage of MEM012 VR reported by BMC, in volt",
-      "labels": {
-        "id": "mem012vr"
-      },
-      "name": "bmc_other_voltage_volt",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 204,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Voltage of MEM345 VR reported by BMC, in volt",
-      "labels": {
-        "id": "mem345vr"
-      },
-      "name": "bmc_other_voltage_volt",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 205,
-        "protocol": "ipmisensor"
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
+        "protocol": "snmp"
       }
     },
     {
-- 
GitLab