diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
index d36f659811e3e57aa2a5cd5de0da3f731f209a88..5443599310062bd6e03774fed4b35c7739f49e78 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json
@@ -5,6 +5,180 @@
"kavlan": true,
"manufactured_at": "2016-11-14",
"metrics": [
+ {
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
+ "period": 5000,
+ "source": {
+ "id": "FIXME",
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Power consumption of node reported by BMC, in watt",
+ "name": "bmc_node_power_watt",
+ "period": 5000,
+ "source": {
+ "id": "FIXME",
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Temperature of Temp reported by BMC, in celsius",
+ "labels": {
+ "id": "temp"
+ },
+ "name": "bmc_other_temp_celsius",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 14,
+ "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": 59,
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Speed of Fan 1 reported by BMC, in rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 99,
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Speed of Fan 2 reported by BMC, in rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 100,
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Speed of Fan 3 reported by BMC, in rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 101,
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Speed of Fan 4 reported by BMC, in rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 102,
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Current of Input Current reported by BMC, in amp",
+ "labels": {
+ "id": "inputcurrent"
+ },
+ "name": "bmc_other_current_amp",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 114,
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Voltage of Input Voltage reported by BMC, in volt",
+ "labels": {
+ "id": "inputvoltage"
+ },
+ "name": "bmc_other_voltage_volt",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 115,
+ "protocol": "ipmisensor"
+ }
+ },
+ {
+ "description": "Usage of CPU Usage reported by BMC, in percent",
+ "labels": {
+ "id": "cpuusage"
+ },
+ "name": "bmc_cpu_power_watt",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": 167,
+ "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": 168,
+ "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": 169,
+ "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": 170,
+ "protocol": "ipmisensor"
+ }
+ },
{
"description": "Default subset of metrics from Prometheus Node Exporter",
"name": "prom_default_metrics",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2_metrics.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2_metrics.yaml
index 3c11d0073c1eaf21ed82b43e7c5efa5407ecd189..a03e257fef2837bddfef6a539742e2ae25f28f5a 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2_metrics.yaml
@@ -1,6 +1,128 @@
---
metrics:
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
+ period: 5000
+ source:
+ protocol: ipmisensor
+ id: FIXME #Inlet Temp
+
+ - name: bmc_node_power_watt
+ description: Power consumption of node reported by BMC, in watt
+ period: 5000
+ source:
+ protocol: ipmisensor
+ id: FIXME #Pwr Consumption
+
+ - 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: 14 #Temp
+
+ - 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: 59 #Pwr Consumption
+
+ - name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
+ description: Speed of Fan 1 reported by BMC, in rpm
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: ipmisensor
+ id: 99 #FAN_1
+
+ - name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
+ description: Speed of Fan 2 reported by BMC, in rpm
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: ipmisensor
+ id: 100 #FAN_2
+
+ - name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
+ description: Speed of Fan 3 reported by BMC, in rpm
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: ipmisensor
+ id: 101 #FAN_3
+
+ - name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
+ description: Speed of Fan 4 reported by BMC, in rpm
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: ipmisensor
+ id: 102 #FAN_4
+
+ - name: bmc_other_current_amp
+ labels: {"id": "inputcurrent"}
+ description: Current of Input Current reported by BMC, in amp
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: ipmisensor
+ id: 114 #Input Current
+
+ - name: bmc_other_voltage_volt
+ labels: {"id": "inputvoltage"}
+ description: Voltage of Input Voltage reported by BMC, in volt
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: ipmisensor
+ id: 115 #Input Voltage
+
+ - name: bmc_cpu_power_watt
+ labels: {"id": "cpuusage"}
+ description: Usage of CPU Usage reported by BMC, in percent
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: ipmisensor
+ id: 167 #CPU Usage
+
+ - 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: 168 #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: 169 #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: 170 #SYS Usage
+
- name: prom_default_metrics
description: Default subset of metrics from Prometheus Node Exporter
period: 0