From 8596e74dc0c14072a6be17728660f13e59fccae9 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 19 May 2020 10:56:12 +0200
Subject: [PATCH] [allsites] kwollect - update metrics description with labels
use
---
.../sites/grenoble/clusters/dahu/dahu.json | 74 ++++-
.../sites/grenoble/clusters/troll/troll.json | 104 ++++--
.../sites/grenoble/clusters/yeti/yeti.json | 84 +++--
.../sites/lille/clusters/chetemi/chetemi.json | 104 ++++--
.../sites/lille/clusters/chiclet/chiclet.json | 64 +++-
.../lille/clusters/chifflet/chifflet.json | 64 +++-
.../lille/clusters/chifflot/chifflot.json | 74 ++++-
.../luxembourg/clusters/granduc/granduc.json | 80 ++++-
.../clusters/petitprince/petitprince.json | 14 +-
.../sites/lyon/clusters/gemini/gemini.json | 297 ++++++++++++++----
.../sites/lyon/clusters/hercule/hercule.json | 70 ++++-
.../sites/lyon/clusters/nova/nova.json | 74 ++++-
.../sites/lyon/clusters/orion/orion.json | 64 +++-
.../sites/lyon/clusters/taurus/taurus.json | 64 +++-
.../nancy/clusters/graffiti/graffiti.json | 74 ++++-
.../nancy/clusters/graoully/graoully.json | 94 ++++--
.../nancy/clusters/graphique/graphique.json | 64 +++-
.../nancy/clusters/graphite/graphite.json | 64 +++-
.../sites/nancy/clusters/grcinq/grcinq.json | 70 ++++-
.../sites/nancy/clusters/grele/grele.json | 64 +++-
.../sites/nancy/clusters/grimani/grimani.json | 64 +++-
.../nancy/clusters/grimoire/grimoire.json | 94 ++++--
.../sites/nancy/clusters/grisou/grisou.json | 94 ++++--
.../sites/nancy/clusters/gros/gros.json | 69 +++-
.../sites/nancy/clusters/grue/grue.json | 84 +++--
.../sites/nancy/clusters/grvingt/grvingt.json | 74 ++++-
.../nantes/clusters/econome/econome.json | 70 ++++-
.../nantes/clusters/ecotype/ecotype.json | 104 ++++--
.../rennes/clusters/parapluie/parapluie.json | 260 ++++++++++++---
.../rennes/clusters/parasilo/parasilo.json | 94 ++++--
.../rennes/clusters/paravance/paravance.json | 94 ++++--
.../sites/sophia/clusters/suno/suno.json | 40 ++-
.../sites/sophia/clusters/uvb/uvb.json | 50 ++-
.../grenoble/clusters/dahu/dahu_metrics.yaml | 46 ++-
.../clusters/troll/troll_metrics.yaml | 64 ++--
.../grenoble/clusters/yeti/yeti_metrics.yaml | 52 +--
.../clusters/chetemi/chetemi_metrics.yaml | 64 ++--
.../clusters/chiclet/chiclet_metrics.yaml | 40 ++-
.../clusters/chifflet/chifflet_metrics.yaml | 40 ++-
.../clusters/chifflot/chifflot_metrics.yaml | 46 ++-
.../clusters/granduc/granduc_metrics.yaml | 48 ++-
.../petitprince/petitprince_metrics.yaml | 10 +-
.../lyon/clusters/gemini/gemini_metrics.yaml | 179 +++++++----
.../clusters/hercule/hercule_metrics.yaml | 42 ++-
.../lyon/clusters/nova/nova_metrics.yaml | 46 ++-
.../lyon/clusters/orion/orion_metrics.yaml | 40 ++-
.../lyon/clusters/taurus/taurus_metrics.yaml | 40 ++-
.../clusters/graffiti/graffiti_metrics.yaml | 46 ++-
.../clusters/graoully/graoully_metrics.yaml | 58 ++--
.../clusters/graphique/graphique_metrics.yaml | 40 ++-
.../clusters/graphite/graphite_metrics.yaml | 40 ++-
.../nancy/clusters/grcinq/grcinq_metrics.yaml | 42 ++-
.../nancy/clusters/grele/grele_metrics.yaml | 40 ++-
.../clusters/grimani/grimani_metrics.yaml | 40 ++-
.../clusters/grimoire/grimoire_metrics.yaml | 58 ++--
.../nancy/clusters/grisou/grisou_metrics.yaml | 58 ++--
.../nancy/clusters/gros/gros_metrics.yaml | 43 ++-
.../nancy/clusters/grue/grue_metrics.yaml | 52 +--
.../clusters/grvingt/grvingt_metrics.yaml | 46 ++-
.../clusters/econome/econome_metrics.yaml | 42 ++-
.../clusters/ecotype/ecotype_metrics.yaml | 64 ++--
.../clusters/parapluie/parapluie_metrics.yaml | 156 ++++++---
.../clusters/parasilo/parasilo_metrics.yaml | 58 ++--
.../clusters/paravance/paravance_metrics.yaml | 58 ++--
.../sophia/clusters/suno/suno_metrics.yaml | 24 +-
.../sophia/clusters/uvb/uvb_metrics.yaml | 30 +-
66 files changed, 3402 insertions(+), 1202 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index e9e607e4095..50a487249ed 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -161,7 +194,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -171,7 +207,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -182,7 +221,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index 31655f9c259..c26ad056946 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -39,7 +39,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -48,7 +48,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -58,7 +61,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -69,7 +75,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -79,7 +85,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -89,7 +98,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -99,7 +111,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -109,7 +124,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -119,7 +137,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -129,7 +150,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -139,7 +163,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -149,7 +176,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -159,7 +189,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -169,7 +202,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -179,7 +215,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -189,7 +228,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -199,7 +241,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -209,7 +254,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -219,7 +267,10 @@
},
{
"description": "Speed of Fan 8A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan8a_rpm",
+ "labels": {
+ "fan": "8a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -229,7 +280,10 @@
},
{
"description": "Speed of Fan 8B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan8b_rpm",
+ "labels": {
+ "fan": "8b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -239,7 +293,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -250,7 +307,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index b7d5ae6c848..d7d4089ba84 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -39,7 +39,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -48,7 +48,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -58,7 +61,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -68,7 +74,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -79,7 +88,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -90,7 +102,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -100,7 +112,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -110,7 +125,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -120,7 +138,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -130,7 +151,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -140,7 +164,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -150,7 +177,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -160,7 +190,10 @@
},
{
"description": "Speed of Fan 7 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7_rpm",
+ "labels": {
+ "fan": "7"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -170,7 +203,10 @@
},
{
"description": "Speed of Fan 8 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan8_rpm",
+ "labels": {
+ "fan": "8"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -180,7 +216,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -191,7 +230,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -202,7 +244,10 @@
},
{
"description": "Temperature of CPU 3 reported by BMC, in celsius",
- "name": "bmc_temp_cpu3_celsius",
+ "labels": {
+ "cpu": "3"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -213,7 +258,10 @@
},
{
"description": "Temperature of CPU 4 reported by BMC, in celsius",
- "name": "bmc_temp_cpu4_celsius",
+ "labels": {
+ "cpu": "4"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
index 102e67a0e5d..f68bffab977 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -161,7 +194,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -171,7 +207,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -181,7 +220,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -191,7 +233,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -201,7 +246,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -211,7 +259,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -221,7 +272,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -242,7 +296,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -253,7 +310,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 3411f1bf75b..0213635ee33 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -162,7 +195,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
index 803167dba9b..49edfa2f709 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -162,7 +192,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -173,7 +206,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index 06b5c52a9d7..3fb110b1b4a 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -162,7 +195,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -173,7 +209,10 @@
},
{
"description": "Temperature of GPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_gpu1_celsius",
+ "labels": {
+ "gpu": "1"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -184,7 +223,10 @@
},
{
"description": "Temperature of GPU 8 reported by BMC, in celsius",
- "name": "bmc_temp_gpu8_celsius",
+ "labels": {
+ "gpu": "8"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json b/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
index 7b6b67f483e..e963c99e9ed 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
@@ -29,7 +29,10 @@
},
{
"description": "Speed of FAN MOD 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod1a_rpm",
+ "labels": {
+ "fan": "mod1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -39,7 +42,10 @@
},
{
"description": "Speed of FAN MOD 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod1b_rpm",
+ "labels": {
+ "fan": "mod1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +55,10 @@
},
{
"description": "Speed of FAN MOD 1C reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod1c_rpm",
+ "labels": {
+ "fan": "mod1c"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +68,10 @@
},
{
"description": "Speed of FAN MOD 1D reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod1d_rpm",
+ "labels": {
+ "fan": "mod1d"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -69,7 +81,10 @@
},
{
"description": "Speed of FAN MOD 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod2a_rpm",
+ "labels": {
+ "fan": "mod2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -79,7 +94,10 @@
},
{
"description": "Speed of FAN MOD 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod2b_rpm",
+ "labels": {
+ "fan": "mod2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -89,7 +107,10 @@
},
{
"description": "Speed of FAN MOD 2C reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod2c_rpm",
+ "labels": {
+ "fan": "mod2c"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -99,7 +120,10 @@
},
{
"description": "Speed of FAN MOD 2D reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod2d_rpm",
+ "labels": {
+ "fan": "mod2d"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -109,7 +133,10 @@
},
{
"description": "Speed of FAN MOD 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod3a_rpm",
+ "labels": {
+ "fan": "mod3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -119,7 +146,10 @@
},
{
"description": "Speed of FAN MOD 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod3b_rpm",
+ "labels": {
+ "fan": "mod3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -129,7 +159,10 @@
},
{
"description": "Speed of FAN MOD 3C reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod3c_rpm",
+ "labels": {
+ "fan": "mod3c"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -139,7 +172,10 @@
},
{
"description": "Speed of FAN MOD 3D reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod3d_rpm",
+ "labels": {
+ "fan": "mod3d"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -149,7 +185,10 @@
},
{
"description": "Speed of FAN MOD 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod4a_rpm",
+ "labels": {
+ "fan": "mod4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -159,7 +198,10 @@
},
{
"description": "Speed of FAN MOD 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod4b_rpm",
+ "labels": {
+ "fan": "mod4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -169,7 +211,10 @@
},
{
"description": "Speed of FAN MOD 4C reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod4c_rpm",
+ "labels": {
+ "fan": "mod4c"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -179,7 +224,10 @@
},
{
"description": "Speed of FAN MOD 4D reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod4d_rpm",
+ "labels": {
+ "fan": "mod4d"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index b38d117e762..72f9cf5c61a 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -39,7 +39,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +49,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -60,7 +63,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/gemini.json b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
index 889b45a21be..150347b61c5 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/gemini.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
@@ -38,7 +38,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": 91,
@@ -47,7 +47,10 @@
},
{
"description": "Power consumption of GPU 0 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu0_watt",
+ "labels": {
+ "gpu": "0"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 83,
@@ -56,7 +59,10 @@
},
{
"description": "Power consumption of GPU 1 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu1_watt",
+ "labels": {
+ "gpu": "1"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 84,
@@ -65,7 +71,10 @@
},
{
"description": "Power consumption of GPU 2 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu2_watt",
+ "labels": {
+ "gpu": "2"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 85,
@@ -74,7 +83,10 @@
},
{
"description": "Power consumption of GPU 3 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu3_watt",
+ "labels": {
+ "gpu": "3"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 86,
@@ -83,7 +95,10 @@
},
{
"description": "Power consumption of GPU 4 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu4_watt",
+ "labels": {
+ "gpu": "4"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 87,
@@ -92,7 +107,10 @@
},
{
"description": "Power consumption of GPU 5 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu5_watt",
+ "labels": {
+ "gpu": "5"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 88,
@@ -101,7 +119,10 @@
},
{
"description": "Power consumption of GPU 6 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu6_watt",
+ "labels": {
+ "gpu": "6"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 89,
@@ -110,7 +131,10 @@
},
{
"description": "Power consumption of GPU 7 reported by BMC, in watt by BMC, in watt",
- "name": "bmc_power_gpgpu7_watt",
+ "labels": {
+ "gpu": "7"
+ },
+ "name": "bmc_gpu_power_watt",
"period": 5000,
"source": {
"id": 90,
@@ -128,7 +152,10 @@
},
{
"description": "Speed of SYS fan 0_1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan01_rpm",
+ "labels": {
+ "fan": "01"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -138,7 +165,10 @@
},
{
"description": "Speed of SYS fan 0_2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan02_rpm",
+ "labels": {
+ "fan": "02"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -148,7 +178,10 @@
},
{
"description": "Speed of SYS fan 1_1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan11_rpm",
+ "labels": {
+ "fan": "11"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -158,7 +191,10 @@
},
{
"description": "Speed of SYS fan 1_2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan12_rpm",
+ "labels": {
+ "fan": "12"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -168,7 +204,10 @@
},
{
"description": "Speed of SYS fan 2_1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan21_rpm",
+ "labels": {
+ "fan": "21"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -178,7 +217,10 @@
},
{
"description": "Speed of SYS fan 2_2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan22_rpm",
+ "labels": {
+ "fan": "22"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -188,7 +230,10 @@
},
{
"description": "Speed of SYS fan 3_1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan31_rpm",
+ "labels": {
+ "fan": "31"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -198,7 +243,10 @@
},
{
"description": "Speed of SYS fan 3_2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_sysfan32_rpm",
+ "labels": {
+ "fan": "32"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -208,7 +256,10 @@
},
{
"description": "Power consumption of HSC0 reported by BMC, in watt",
- "name": "bmc_power_hsc0_watt",
+ "labels": {
+ "hsc": "0"
+ },
+ "name": "bmc_hsc_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -218,7 +269,10 @@
},
{
"description": "Power consumption of HSC1 reported by BMC, in watt",
- "name": "bmc_power_hsc1_watt",
+ "labels": {
+ "hsc": "1"
+ },
+ "name": "bmc_hsc_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -228,7 +282,10 @@
},
{
"description": "Power consumption of HSC2 reported by BMC, in watt",
- "name": "bmc_power_hsc2_watt",
+ "labels": {
+ "hsc": "2"
+ },
+ "name": "bmc_hsc_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -238,7 +295,10 @@
},
{
"description": "Power consumption of PSU1 reported by BMC, in watt",
- "name": "bmc_power_psu1_watt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -248,7 +308,10 @@
},
{
"description": "Power consumption of PSU2 reported by BMC, in watt",
- "name": "bmc_power_psu2_watt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -258,7 +321,10 @@
},
{
"description": "Power consumption of PSU3 reported by BMC, in watt",
- "name": "bmc_power_psu3_watt",
+ "labels": {
+ "psu": "3"
+ },
+ "name": "bmc_psu_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -268,7 +334,10 @@
},
{
"description": "Power consumption of PSU4 reported by BMC, in watt",
- "name": "bmc_power_psu4_watt",
+ "labels": {
+ "psu": "4"
+ },
+ "name": "bmc_psu_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -308,7 +377,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -318,7 +390,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -328,7 +403,10 @@
},
{
"description": "Temperature of DIMM_AB reported by BMC, in celsius",
- "name": "bmc_temp_dimm_ab_celsius",
+ "labels": {
+ "dimm": "ab"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -338,7 +416,10 @@
},
{
"description": "Temperature of DIMM_CD reported by BMC, in celsius",
- "name": "bmc_temp_dimm_cd_celsius",
+ "labels": {
+ "dimm": "cd"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -348,7 +429,10 @@
},
{
"description": "Temperature of DIMM_EF reported by BMC, in celsius",
- "name": "bmc_temp_dimm_ef_celsius",
+ "labels": {
+ "dimm": "ef"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -358,7 +442,10 @@
},
{
"description": "Temperature of DIMM_GH reported by BMC, in celsius",
- "name": "bmc_temp_dimm_gh_celsius",
+ "labels": {
+ "dimm": "gh"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -378,7 +465,10 @@
},
{
"description": "Temperature of GPU0 reported by BMC, in celsius",
- "name": "bmc_temp_gpu0_celsius",
+ "labels": {
+ "gpu": "0"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -388,7 +478,10 @@
},
{
"description": "Temperature of GPU1 reported by BMC, in celsius",
- "name": "bmc_temp_gpu1_celsius",
+ "labels": {
+ "gpu": "1"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -398,7 +491,10 @@
},
{
"description": "Temperature of GPU2 reported by BMC, in celsius",
- "name": "bmc_temp_gpu2_celsius",
+ "labels": {
+ "gpu": "2"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -408,7 +504,10 @@
},
{
"description": "Temperature of GPU3 reported by BMC, in celsius",
- "name": "bmc_temp_gpu3_celsius",
+ "labels": {
+ "gpu": "3"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -418,7 +517,10 @@
},
{
"description": "Temperature of GPU4 reported by BMC, in celsius",
- "name": "bmc_temp_gpu4_celsius",
+ "labels": {
+ "gpu": "4"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -428,7 +530,10 @@
},
{
"description": "Temperature of GPU5 reported by BMC, in celsius",
- "name": "bmc_temp_gpu5_celsius",
+ "labels": {
+ "gpu": "5"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -438,7 +543,10 @@
},
{
"description": "Temperature of GPU6 reported by BMC, in celsius",
- "name": "bmc_temp_gpu6_celsius",
+ "labels": {
+ "gpu": "6"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -448,7 +556,10 @@
},
{
"description": "Temperature of GPU7 reported by BMC, in celsius",
- "name": "bmc_temp_gpu7_celsius",
+ "labels": {
+ "gpu": "7"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -458,7 +569,10 @@
},
{
"description": "Temperature of GPU B0 reported by BMC, in celsius",
- "name": "bmc_temp_gpu_b0_celsius",
+ "labels": {
+ "id": "0"
+ },
+ "name": "bmc_temp_gpub_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -468,7 +582,10 @@
},
{
"description": "Temperature of GPU B1 reported by BMC, in celsius",
- "name": "bmc_temp_gpu_b1_celsius",
+ "labels": {
+ "id": "1"
+ },
+ "name": "bmc_temp_gpub_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -538,7 +655,10 @@
},
{
"description": "Temperature of VR CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_vr_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_vr_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -548,7 +668,10 @@
},
{
"description": "Temperature of VR CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_vr_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_vr_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -558,7 +681,10 @@
},
{
"description": "Temperature of VR DIMM_AB reported by BMC, in celsius",
- "name": "bmc_temp_vr_dimm_ab_celsius",
+ "labels": {
+ "dimm": "ab"
+ },
+ "name": "bmc_temp_vr_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -568,7 +694,10 @@
},
{
"description": "Temperature of VR DIMM_CD reported by BMC, in celsius",
- "name": "bmc_temp_vr_dimm_cd_celsius",
+ "labels": {
+ "dimm": "cd"
+ },
+ "name": "bmc_temp_vr_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -578,7 +707,10 @@
},
{
"description": "Temperature of VR DIMM_EF reported by BMC, in celsius",
- "name": "bmc_temp_vr_dimm_ef_celsius",
+ "labels": {
+ "dimm": "ef"
+ },
+ "name": "bmc_temp_vr_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -588,7 +720,10 @@
},
{
"description": "Temperature of VR DIMM_GH reported by BMC, in celsius",
- "name": "bmc_temp_vr_dimm_gh_celsius",
+ "labels": {
+ "dimm": "gh"
+ },
+ "name": "bmc_temp_vr_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -598,7 +733,10 @@
},
{
"description": "Voltage of P12V reported by BMC, in volt",
- "name": "bmc_voltage_p12v_volt",
+ "labels": {
+ "voltage": "p12v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -608,7 +746,10 @@
},
{
"description": "Voltage of P1V05 reported by BMC, in volt",
- "name": "bmc_voltage_p1v05_volt",
+ "labels": {
+ "voltage": "p1v05"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -618,7 +759,10 @@
},
{
"description": "Voltage of P1V8_AUX reported by BMC, in volt",
- "name": "bmc_voltage_p1v8_aux_volt",
+ "labels": {
+ "voltage": "p1v8_aux"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -628,7 +772,10 @@
},
{
"description": "Voltage of P3V3 reported by BMC, in volt",
- "name": "bmc_voltage_p3v3_volt",
+ "labels": {
+ "voltage": "p3v3"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -638,7 +785,10 @@
},
{
"description": "Voltage of P3V3_AUX reported by BMC, in volt",
- "name": "bmc_voltage_p3v3_aux_volt",
+ "labels": {
+ "voltage": "p3v3_aux"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -648,7 +798,10 @@
},
{
"description": "Voltage of P3V_BAT reported by BMC, in volt",
- "name": "bmc_voltage_p3v_bat_volt",
+ "labels": {
+ "voltage": "p3v_bat"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -658,7 +811,10 @@
},
{
"description": "Voltage of P5V reported by BMC, in volt",
- "name": "bmc_voltage_p5v_volt",
+ "labels": {
+ "voltage": "p5v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -668,7 +824,10 @@
},
{
"description": "Voltage of P5V_AUX reported by BMC, in volt",
- "name": "bmc_voltage_p5v_aux_volt",
+ "labels": {
+ "voltage": "p5v_aux"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -678,7 +837,10 @@
},
{
"description": "Voltage of VR CPU1 reported by BMC, in volt",
- "name": "bmc_voltage_vr_cpu1_volt",
+ "labels": {
+ "voltage": "vr_cpu1"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -688,7 +850,10 @@
},
{
"description": "Voltage of VR CPU2 reported by BMC, in volt",
- "name": "bmc_voltage_vr_cpu1_volt",
+ "labels": {
+ "voltage": "vr_cpu1"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -698,7 +863,10 @@
},
{
"description": "Voltage of VR DIMM_AB reported by BMC, in volt",
- "name": "bmc_voltage_vr_dimm_ab_volt",
+ "labels": {
+ "voltage": "vr_dimm_ab"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -708,7 +876,10 @@
},
{
"description": "Voltage of VR DIMM_CD reported by BMC, in volt",
- "name": "bmc_voltage_vr_dimm_cd_volt",
+ "labels": {
+ "voltage": "vr_dimm_cd"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -718,7 +889,10 @@
},
{
"description": "Voltage of VR DIMM_EF reported by BMC, in volt",
- "name": "bmc_voltage_vr_dimm_ef_volt",
+ "labels": {
+ "voltage": "vr_dimm_ef"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -728,7 +902,10 @@
},
{
"description": "Voltage of VR DIMM_GH reported by BMC, in volt",
- "name": "bmc_voltage_vr_dimm_gh_volt",
+ "labels": {
+ "voltage": "vr_dimm_gh"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/hercule/hercule.json b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
index eaf534d3aa2..b90f35cbc83 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/hercule.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
@@ -29,7 +29,10 @@
},
{
"description": "12V Standby voltage reported by BMC, in volt",
- "name": "bmc_voltage_12vstandby_volt",
+ "labels": {
+ "voltage": "12vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -39,7 +42,10 @@
},
{
"description": "5V Standby voltage reported by BMC, in volt",
- "name": "bmc_voltage_5vstandby_volt",
+ "labels": {
+ "voltage": "5vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +55,10 @@
},
{
"description": "5V voltage reported by BMC, in volt",
- "name": "bmc_voltage_5v_volt",
+ "labels": {
+ "voltage": "5v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +68,10 @@
},
{
"description": "3.3V Standby voltage reported by BMC, in volt",
- "name": "bmc_voltage_3.3vstandby_volt",
+ "labels": {
+ "voltage": "3.3vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -69,7 +81,10 @@
},
{
"description": "3.3V voltage reported by BMC, in volt",
- "name": "bmc_voltage_3.3v_volt",
+ "labels": {
+ "voltage": "3.3v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -89,7 +104,10 @@
},
{
"description": "Temperature of CPU1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -99,7 +117,10 @@
},
{
"description": "Temperature of CPU2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -109,7 +130,10 @@
},
{
"description": "Temperature of DIMM ZONE 1 reported by BMC, in celsius",
- "name": "bmc_temp_dimmzone1_celsius",
+ "labels": {
+ "zone": "1"
+ },
+ "name": "bmc_temp_dimmzone_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -119,7 +143,10 @@
},
{
"description": "Temperature of DIMM ZONE 2 reported by BMC, in celsius",
- "name": "bmc_temp_dimmzone2_celsius",
+ "labels": {
+ "zone": "2"
+ },
+ "name": "bmc_temp_dimmzone_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -139,7 +166,10 @@
},
{
"description": "Voltage of input reported by BMC, in volt",
- "name": "bmc_voltage_inputvoltage_volt",
+ "labels": {
+ "voltage": "inputvoltage"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -159,7 +189,10 @@
},
{
"description": "Speed of fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan_1_rpm",
+ "labels": {
+ "fan": "_1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -169,7 +202,10 @@
},
{
"description": "Speed of fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan_2_rpm",
+ "labels": {
+ "fan": "_2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -179,7 +215,10 @@
},
{
"description": "Speed of fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan_3_rpm",
+ "labels": {
+ "fan": "_3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -189,7 +228,10 @@
},
{
"description": "Speed of fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan_4_rpm",
+ "labels": {
+ "fan": "_4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 2815093cea3..9f97c80afb0 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -39,7 +39,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -48,7 +48,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -59,7 +62,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +76,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -80,7 +86,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -90,7 +99,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -100,7 +112,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -110,7 +125,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -120,7 +138,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -130,7 +151,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -140,7 +164,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -150,7 +177,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -160,7 +190,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -170,7 +203,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -180,7 +216,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -191,7 +230,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index 31cc0f52e91..e33a8f1a04f 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -39,7 +39,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -48,7 +48,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -58,7 +61,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -68,7 +74,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -79,7 +88,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -90,7 +102,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -100,7 +112,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -110,7 +125,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -120,7 +138,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -130,7 +151,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -140,7 +164,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -150,7 +177,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -171,7 +201,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -182,7 +215,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index c74503ad3c7..0d7d80f5f51 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -39,7 +39,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -48,7 +48,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -58,7 +61,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -68,7 +74,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -79,7 +88,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -90,7 +102,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -100,7 +112,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -110,7 +125,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -120,7 +138,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -130,7 +151,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -140,7 +164,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -150,7 +177,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -171,7 +201,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -182,7 +215,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index cc3f45dcfa5..7073d2391b6 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Speed of Fan Ext R reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanextr_rpm",
+ "labels": {
+ "fan": "extr"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -161,7 +194,10 @@
},
{
"description": "Speed of Fan Ext L reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanextl_rpm",
+ "labels": {
+ "fan": "extl"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -171,7 +207,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -182,7 +221,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/graoully.json b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
index cf8ca35f26d..97fbce7627a 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/graoully.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
@@ -38,7 +38,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
@@ -47,7 +47,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -57,7 +60,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -68,7 +74,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -78,7 +84,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -88,7 +97,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -98,7 +110,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -108,7 +123,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -118,7 +136,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -128,7 +149,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -138,7 +162,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -148,7 +175,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -158,7 +188,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -168,7 +201,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -178,7 +214,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -188,7 +227,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -198,7 +240,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -208,7 +253,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -229,7 +277,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -240,7 +291,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/graphique.json b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
index 1dc22e7eb99..8b38e960bdc 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/graphique.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -162,7 +192,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -173,7 +206,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/graphite.json b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
index 46a1b24d844..2e3f1cf4acc 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/graphite.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -162,7 +192,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -173,7 +206,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json b/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
index 49033ec4d93..b971ac5ceb2 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
@@ -29,7 +29,10 @@
},
{
"description": "Voltage of 12V Standby reported by BMC, in volt",
- "name": "bmc_voltage_12vstandby_volt",
+ "labels": {
+ "voltage": "12vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -39,7 +42,10 @@
},
{
"description": "Voltage of 5V Standby reported by BMC, in volt",
- "name": "bmc_voltage_5vstandby_volt",
+ "labels": {
+ "voltage": "5vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +55,10 @@
},
{
"description": "Voltage of 5V reported by BMC, in volt",
- "name": "bmc_voltage_5v_volt",
+ "labels": {
+ "voltage": "5v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +68,10 @@
},
{
"description": "Voltage of 3.3V Standby reported by BMC, in volt",
- "name": "bmc_voltage_3.3vstandby_volt",
+ "labels": {
+ "voltage": "3.3vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -69,7 +81,10 @@
},
{
"description": "Voltage of 3.3V reported by BMC, in volt",
- "name": "bmc_voltage_3.3v_volt",
+ "labels": {
+ "voltage": "3.3v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -79,7 +94,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -89,7 +107,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -99,7 +120,10 @@
},
{
"description": "Temperature of DIMM ZONE 1 reported by BMC, in celsius",
- "name": "bmc_temp_dimmzone1_celsius",
+ "labels": {
+ "zone": "1"
+ },
+ "name": "bmc_temp_dimmzone_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -109,7 +133,10 @@
},
{
"description": "Temperature of DIMM ZONE 2 reported by BMC, in celsius",
- "name": "bmc_temp_dimmzone2_celsius",
+ "labels": {
+ "zone": "2"
+ },
+ "name": "bmc_temp_dimmzone_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -129,7 +156,10 @@
},
{
"description": "Voltage of Input reported by BMC, in volt",
- "name": "bmc_voltage_input_volt",
+ "labels": {
+ "voltage": "input"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -149,7 +179,10 @@
},
{
"description": "Speed of FAN 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -159,7 +192,10 @@
},
{
"description": "Speed of FAN 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -169,7 +205,10 @@
},
{
"description": "Speed of FAN 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -179,7 +218,10 @@
},
{
"description": "Speed of FAN 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index 7b6faa2b5cf..aef608ce33a 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -162,7 +192,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -173,7 +206,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/grimani.json b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
index 3df217fb86d..dffaa164eea 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/grimani.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -162,7 +192,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -173,7 +206,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
index 64450ca9ebb..4942e95a1b8 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
@@ -38,7 +38,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
@@ -47,7 +47,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -57,7 +60,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -68,7 +74,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -78,7 +84,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -88,7 +97,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -98,7 +110,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -108,7 +123,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -118,7 +136,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -128,7 +149,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -138,7 +162,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -148,7 +175,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -158,7 +188,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -168,7 +201,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -178,7 +214,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -188,7 +227,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -198,7 +240,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -208,7 +253,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -229,7 +277,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -240,7 +291,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index 2d142128c67..320a768046c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -38,7 +38,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
@@ -47,7 +47,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -57,7 +60,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -68,7 +74,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -78,7 +84,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -88,7 +97,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -98,7 +110,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -108,7 +123,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -118,7 +136,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -128,7 +149,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -138,7 +162,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -148,7 +175,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -158,7 +188,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -168,7 +201,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -178,7 +214,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -188,7 +227,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -198,7 +240,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -208,7 +253,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -229,7 +277,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -240,7 +291,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index 5035da9fdcc..f8da98413b3 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -39,7 +39,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
@@ -48,7 +48,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -58,7 +61,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -69,7 +75,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -79,7 +85,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -89,7 +98,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -99,7 +111,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -109,7 +124,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -119,7 +137,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -129,7 +150,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -139,7 +163,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -149,7 +176,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -159,7 +189,10 @@
},
{
"description": "Speed of Fan 8A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan8a_rpm",
+ "labels": {
+ "fan": "8a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -169,7 +202,10 @@
},
{
"description": "Speed of Fan 8B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan8b_rpm",
+ "labels": {
+ "fan": "8b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -179,7 +215,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index e886bb5e3d7..5bc0c57d549 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5_rpm",
+ "labels": {
+ "fan": "5"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6_rpm",
+ "labels": {
+ "fan": "6"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -162,7 +195,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -173,7 +209,10 @@
},
{
"description": "Temperature of GPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_gpu1_celsius",
+ "labels": {
+ "gpu": "1"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -184,7 +223,10 @@
},
{
"description": "Temperature of GPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_gpu2_celsius",
+ "labels": {
+ "gpu": "2"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -195,7 +237,10 @@
},
{
"description": "Temperature of GPU 5 reported by BMC, in celsius",
- "name": "bmc_temp_gpu5_celsius",
+ "labels": {
+ "gpu": "5"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -206,7 +251,10 @@
},
{
"description": "Temperature of GPU 8 reported by BMC, in celsius",
- "name": "bmc_temp_gpu8_celsius",
+ "labels": {
+ "gpu": "8"
+ },
+ "name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index 8987e424d47..24f21484c75 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -161,7 +194,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -171,7 +207,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -182,7 +221,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nantes/clusters/econome/econome.json b/data/grid5000/sites/nantes/clusters/econome/econome.json
index 7632aa8b86e..7f3b682d6c6 100644
--- a/data/grid5000/sites/nantes/clusters/econome/econome.json
+++ b/data/grid5000/sites/nantes/clusters/econome/econome.json
@@ -29,7 +29,10 @@
},
{
"description": "Voltage of 12V Standby reported by BMC, in volt",
- "name": "bmc_voltage_12vstandby_volt",
+ "labels": {
+ "voltage": "12vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -39,7 +42,10 @@
},
{
"description": "Voltage of 5V Standby reported by BMC, in volt",
- "name": "bmc_voltage_5vstandby_volt",
+ "labels": {
+ "voltage": "5vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +55,10 @@
},
{
"description": "Voltage of 5V reported by BMC, in volt",
- "name": "bmc_voltage_5v_volt",
+ "labels": {
+ "voltage": "5v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +68,10 @@
},
{
"description": "Voltage of 3.3V Standby reported by BMC, in volt",
- "name": "bmc_voltage_3.3vstandby_volt",
+ "labels": {
+ "voltage": "3.3vstandby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -69,7 +81,10 @@
},
{
"description": "Voltage of 3.3V reported by BMC, in volt",
- "name": "bmc_voltage_3.3v_volt",
+ "labels": {
+ "voltage": "3.3v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -79,7 +94,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -89,7 +107,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -99,7 +120,10 @@
},
{
"description": "Temperature of DIMM ZONE 1 reported by BMC, in celsius",
- "name": "bmc_temp_dimmzone1_celsius",
+ "labels": {
+ "zone": "1"
+ },
+ "name": "bmc_temp_dimmzone_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -109,7 +133,10 @@
},
{
"description": "Temperature of DIMM ZONE 2 reported by BMC, in celsius",
- "name": "bmc_temp_dimmzone2_celsius",
+ "labels": {
+ "zone": "2"
+ },
+ "name": "bmc_temp_dimmzone_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -129,7 +156,10 @@
},
{
"description": "Input voltage reported by BMC, in volt",
- "name": "bmc_voltage_input_volt",
+ "labels": {
+ "voltage": "input"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -149,7 +179,10 @@
},
{
"description": "Speed of fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1_rpm",
+ "labels": {
+ "fan": "1"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -159,7 +192,10 @@
},
{
"description": "Speed of fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2_rpm",
+ "labels": {
+ "fan": "2"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -169,7 +205,10 @@
},
{
"description": "Speed of fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3_rpm",
+ "labels": {
+ "fan": "3"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -179,7 +218,10 @@
},
{
"description": "Speed of fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4_rpm",
+ "labels": {
+ "fan": "4"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index 2e7e660b814..bed43e42ae1 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -30,7 +30,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -39,7 +39,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +52,10 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +65,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -70,7 +79,10 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "labels": {
+ "psu": "2"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -81,7 +93,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -91,7 +103,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -101,7 +116,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -111,7 +129,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -121,7 +142,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +155,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +168,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -151,7 +181,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -161,7 +194,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -171,7 +207,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -181,7 +220,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -191,7 +233,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -201,7 +246,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -211,7 +259,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -221,7 +272,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -242,7 +296,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -253,7 +310,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
index 7f8954b0fbb..e8f258df368 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
@@ -20,7 +20,10 @@
},
{
"description": "Voltage of PVCORE1 reported by BMC, in volt",
- "name": "bmc_voltage_pvcore1_volt",
+ "labels": {
+ "voltage": "pvcore1"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -30,7 +33,10 @@
},
{
"description": "Voltage of PVNB CPU1 reported by BMC, in volt",
- "name": "bmc_voltage_pvnbcpu1_volt",
+ "labels": {
+ "voltage": "pvnbcpu1"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -40,7 +46,10 @@
},
{
"description": "Voltage of P1V5 DDR3 CPU1 reported by BMC, in volt",
- "name": "bmc_voltage_p1v5ddr3cpu1_volt",
+ "labels": {
+ "voltage": "p1v5ddr3cpu1"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -50,7 +59,10 @@
},
{
"description": "Voltage of PVCORE2 reported by BMC, in volt",
- "name": "bmc_voltage_pvcore2_volt",
+ "labels": {
+ "voltage": "pvcore2"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -60,7 +72,10 @@
},
{
"description": "Voltage of PVNB CPU2 reported by BMC, in volt",
- "name": "bmc_voltage_pvnbcpu2_volt",
+ "labels": {
+ "voltage": "pvnbcpu2"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -70,7 +85,10 @@
},
{
"description": "Voltage of P1V5 DDR3 CPU2 reported by BMC, in volt",
- "name": "bmc_voltage_p1v5ddr3cpu2_volt",
+ "labels": {
+ "voltage": "p1v5ddr3cpu2"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -80,7 +98,10 @@
},
{
"description": "Voltage of P12V reported by BMC, in volt",
- "name": "bmc_voltage_p12v_volt",
+ "labels": {
+ "voltage": "p12v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -90,7 +111,10 @@
},
{
"description": "Voltage of P5V reported by BMC, in volt",
- "name": "bmc_voltage_p5v_volt",
+ "labels": {
+ "voltage": "p5v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -100,7 +124,10 @@
},
{
"description": "Voltage of P5V STBY reported by BMC, in volt",
- "name": "bmc_voltage_p5vstby_volt",
+ "labels": {
+ "voltage": "p5vstby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -110,7 +137,10 @@
},
{
"description": "Voltage of P3V3 reported by BMC, in volt",
- "name": "bmc_voltage_p3v3_volt",
+ "labels": {
+ "voltage": "p3v3"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -120,7 +150,10 @@
},
{
"description": "Voltage of P3V3 STBY reported by BMC, in volt",
- "name": "bmc_voltage_p3v3stby_volt",
+ "labels": {
+ "voltage": "p3v3stby"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -130,7 +163,10 @@
},
{
"description": "Voltage of P1V1 SR5670 reported by BMC, in volt",
- "name": "bmc_voltage_p1v1sr5670_volt",
+ "labels": {
+ "voltage": "p1v1sr5670"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -140,7 +176,10 @@
},
{
"description": "Speed of PSU Fan 1 Inlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan1inlet_rpm",
+ "labels": {
+ "fan": "psufan1inlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -150,7 +189,10 @@
},
{
"description": "Speed of PSU Fan 1 Outlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan1outlet_rpm",
+ "labels": {
+ "fan": "psufan1outlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -160,7 +202,10 @@
},
{
"description": "Speed of PSU Fan 2 Inlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan2inlet_rpm",
+ "labels": {
+ "fan": "psufan2inlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -170,7 +215,10 @@
},
{
"description": "Speed of PSU Fan 2 Outlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan2outlet_rpm",
+ "labels": {
+ "fan": "psufan2outlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -180,7 +228,10 @@
},
{
"description": "Speed of PSU Fan 3 Inlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan3inlet_rpm",
+ "labels": {
+ "fan": "psufan3inlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -190,7 +241,10 @@
},
{
"description": "Speed of PSU Fan 3 Outlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan3outlet_rpm",
+ "labels": {
+ "fan": "psufan3outlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -200,7 +254,10 @@
},
{
"description": "Speed of PSU Fan 4 Inlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan4inlet_rpm",
+ "labels": {
+ "fan": "psufan4inlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -210,7 +267,10 @@
},
{
"description": "Speed of PSU Fan 4 Outlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan4outlet_rpm",
+ "labels": {
+ "fan": "psufan4outlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -220,7 +280,10 @@
},
{
"description": "Speed of PSU Fan 5 Inlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan5inlet_rpm",
+ "labels": {
+ "fan": "psufan5inlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -230,7 +293,10 @@
},
{
"description": "Speed of PSU Fan 5 Outlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan5outlet_rpm",
+ "labels": {
+ "fan": "psufan5outlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -240,7 +306,10 @@
},
{
"description": "Speed of PSU Fan 6 Inlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan6inlet_rpm",
+ "labels": {
+ "fan": "psufan6inlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -250,7 +319,10 @@
},
{
"description": "Speed of PSU Fan 6 Outlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan6outlet_rpm",
+ "labels": {
+ "fan": "psufan6outlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -260,7 +332,10 @@
},
{
"description": "Speed of PSU Fan 7 Inlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan7inlet_rpm",
+ "labels": {
+ "fan": "psufan7inlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -270,7 +345,10 @@
},
{
"description": "Speed of PSU Fan 7 Outlet reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan7outlet_rpm",
+ "labels": {
+ "fan": "psufan7outlet"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -280,7 +358,10 @@
},
{
"description": "Temperature of CPU1 DIMM1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm1_celsius",
+ "labels": {
+ "dimm": "cpu1dimm1"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -290,7 +371,10 @@
},
{
"description": "Temperature of CPU1 DIMM2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm2_celsius",
+ "labels": {
+ "dimm": "cpu1dimm2"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -300,7 +384,10 @@
},
{
"description": "Temperature of CPU1 DIMM3 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm3_celsius",
+ "labels": {
+ "dimm": "cpu1dimm3"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -310,7 +397,10 @@
},
{
"description": "Temperature of CPU1 DIMM4 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm4_celsius",
+ "labels": {
+ "dimm": "cpu1dimm4"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -320,7 +410,10 @@
},
{
"description": "Temperature of CPU1 DIMM5 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm5_celsius",
+ "labels": {
+ "dimm": "cpu1dimm5"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -330,7 +423,10 @@
},
{
"description": "Temperature of CPU1 DIMM6 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm6_celsius",
+ "labels": {
+ "dimm": "cpu1dimm6"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -340,7 +436,10 @@
},
{
"description": "Temperature of CPU1 DIMM7 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm7_celsius",
+ "labels": {
+ "dimm": "cpu1dimm7"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -350,7 +449,10 @@
},
{
"description": "Temperature of CPU1 DIMM8 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm8_celsius",
+ "labels": {
+ "dimm": "cpu1dimm8"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -360,7 +462,10 @@
},
{
"description": "Temperature of CPU1 DIMM9 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm9_celsius",
+ "labels": {
+ "dimm": "cpu1dimm9"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -370,7 +475,10 @@
},
{
"description": "Temperature of CPU1 DIMM10 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm10_celsius",
+ "labels": {
+ "dimm": "cpu1dimm10"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -380,7 +488,10 @@
},
{
"description": "Temperature of CPU1 DIMM11 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm11_celsius",
+ "labels": {
+ "dimm": "cpu1dimm11"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -390,7 +501,10 @@
},
{
"description": "Temperature of CPU1 DIMM12 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1dimm12_celsius",
+ "labels": {
+ "dimm": "cpu1dimm12"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -400,7 +514,10 @@
},
{
"description": "Temperature of CPU2 DIMM1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm1_celsius",
+ "labels": {
+ "dimm": "cpu2dimm1"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -410,7 +527,10 @@
},
{
"description": "Temperature of CPU2 DIMM2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm2_celsius",
+ "labels": {
+ "dimm": "cpu2dimm2"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -420,7 +540,10 @@
},
{
"description": "Temperature of CPU2 DIMM3 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm3_celsius",
+ "labels": {
+ "dimm": "cpu2dimm3"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -430,7 +553,10 @@
},
{
"description": "Temperature of CPU2 DIMM4 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm4_celsius",
+ "labels": {
+ "dimm": "cpu2dimm4"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -440,7 +566,10 @@
},
{
"description": "Temperature of CPU2 DIMM5 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm5_celsius",
+ "labels": {
+ "dimm": "cpu2dimm5"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -450,7 +579,10 @@
},
{
"description": "Temperature of CPU2 DIMM6 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm6_celsius",
+ "labels": {
+ "dimm": "cpu2dimm6"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -460,7 +592,10 @@
},
{
"description": "Temperature of CPU2 DIMM7 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm7_celsius",
+ "labels": {
+ "dimm": "cpu2dimm7"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -470,7 +605,10 @@
},
{
"description": "Temperature of CPU2 DIMM8 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm8_celsius",
+ "labels": {
+ "dimm": "cpu2dimm8"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -480,7 +618,10 @@
},
{
"description": "Temperature of CPU2 DIMM9 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm9_celsius",
+ "labels": {
+ "dimm": "cpu2dimm9"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -490,7 +631,10 @@
},
{
"description": "Temperature of CPU2 DIMM10 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm10_celsius",
+ "labels": {
+ "dimm": "cpu2dimm10"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -500,7 +644,10 @@
},
{
"description": "Temperature of CPU2 DIMM11 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm11_celsius",
+ "labels": {
+ "dimm": "cpu2dimm11"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -510,7 +657,10 @@
},
{
"description": "Temperature of CPU2 DIMM12 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2dimm12_celsius",
+ "labels": {
+ "dimm": "cpu2dimm12"
+ },
+ "name": "bmc_temp_dimm_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -530,7 +680,10 @@
},
{
"description": "Temperature of CPU1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -540,7 +693,10 @@
},
{
"description": "Temperature of CPU2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index 4c930da5b9e..2b17ed49dac 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -38,7 +38,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
@@ -47,7 +47,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -57,7 +60,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -68,7 +74,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -78,7 +84,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -88,7 +97,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -98,7 +110,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -108,7 +123,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -118,7 +136,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -128,7 +149,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -138,7 +162,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -148,7 +175,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -158,7 +188,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -168,7 +201,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -178,7 +214,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -188,7 +227,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -198,7 +240,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -208,7 +253,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -229,7 +277,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -240,7 +291,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/paravance.json b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
index d7b82dca1bd..4fd564e4e10 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/paravance.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
@@ -38,7 +38,7 @@
},
{
"description": "Power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt",
+ "name": "bmc_node_power_watt",
"period": 5000,
"source": {
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
@@ -47,7 +47,10 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -57,7 +60,10 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "labels": {
+ "psu": "1"
+ },
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -68,7 +74,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "name": "bmc_node_power_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -78,7 +84,10 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "labels": {
+ "fan": "1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -88,7 +97,10 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "labels": {
+ "fan": "2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -98,7 +110,10 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "labels": {
+ "fan": "3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -108,7 +123,10 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "labels": {
+ "fan": "4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -118,7 +136,10 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "labels": {
+ "fan": "5a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -128,7 +149,10 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "labels": {
+ "fan": "6a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -138,7 +162,10 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "labels": {
+ "fan": "7a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -148,7 +175,10 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "labels": {
+ "fan": "1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -158,7 +188,10 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "labels": {
+ "fan": "2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -168,7 +201,10 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "labels": {
+ "fan": "3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -178,7 +214,10 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "labels": {
+ "fan": "4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -188,7 +227,10 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "labels": {
+ "fan": "5b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -198,7 +240,10 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "labels": {
+ "fan": "6b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -208,7 +253,10 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "labels": {
+ "fan": "7b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -229,7 +277,10 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -240,7 +291,10 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/sophia/clusters/suno/suno.json b/data/grid5000/sites/sophia/clusters/suno/suno.json
index 63bef564ffb..d82c3a8d5cd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/suno.json
+++ b/data/grid5000/sites/sophia/clusters/suno/suno.json
@@ -29,7 +29,10 @@
},
{
"description": "Speed of FAN MOD 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod1a_rpm",
+ "labels": {
+ "fan": "mod1a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -39,7 +42,10 @@
},
{
"description": "Speed of FAN MOD 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod1b_rpm",
+ "labels": {
+ "fan": "mod1b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -49,7 +55,10 @@
},
{
"description": "Speed of FAN MOD 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod2a_rpm",
+ "labels": {
+ "fan": "mod2a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -59,7 +68,10 @@
},
{
"description": "Speed of FAN MOD 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod2b_rpm",
+ "labels": {
+ "fan": "mod2b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -69,7 +81,10 @@
},
{
"description": "Speed of FAN MOD 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod3a_rpm",
+ "labels": {
+ "fan": "mod3a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -79,7 +94,10 @@
},
{
"description": "Speed of FAN MOD 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod3b_rpm",
+ "labels": {
+ "fan": "mod3b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -89,7 +107,10 @@
},
{
"description": "Speed of FAN MOD 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod4a_rpm",
+ "labels": {
+ "fan": "mod4a"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -99,7 +120,10 @@
},
{
"description": "Speed of FAN MOD 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fanmod4b_rpm",
+ "labels": {
+ "fan": "mod4b"
+ },
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index 5bb2259f101..f1d3e9a0365 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -20,7 +20,10 @@
},
{
"description": "Voltage of PS 12V reported by BMC, in volt",
- "name": "bmc_voltage_ps12v_volt",
+ "labels": {
+ "voltage": "ps12v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -30,7 +33,10 @@
},
{
"description": "Voltage of PS 5V reported by BMC, in volt",
- "name": "bmc_voltage_ps5v_volt",
+ "labels": {
+ "voltage": "ps5v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -40,7 +46,10 @@
},
{
"description": "Temperature of MLB TEMP 2 reported by BMC, in celsius",
- "name": "bmc_temp_mlbtemp2_celsius",
+ "labels": {
+ "id": "2"
+ },
+ "name": "bmc_temp_mlb_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -50,7 +59,10 @@
},
{
"description": "Temperature of MLB TEMP 3 reported by BMC, in celsius",
- "name": "bmc_temp_mlbtemp3_celsius",
+ "labels": {
+ "id": "3"
+ },
+ "name": "bmc_temp_mlb_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -60,7 +72,10 @@
},
{
"description": "Temperature of Processor 1 reported by BMC, in celsius",
- "name": "bmc_temp_processor1temp_celsius",
+ "labels": {
+ "cpu": "1"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -70,7 +85,10 @@
},
{
"description": "Temperature of MLB TEMP 1 reported by BMC, in celsius",
- "name": "bmc_temp_mlbtemp1_celsius",
+ "labels": {
+ "id": "1"
+ },
+ "name": "bmc_temp_mlb_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -80,7 +98,10 @@
},
{
"description": "Temperature of Processor 2 reported by BMC, in celsius",
- "name": "bmc_temp_processor2temp_celsius",
+ "labels": {
+ "cpu": "2"
+ },
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -90,7 +111,10 @@
},
{
"description": "Voltage of STBY 3.3V reported by BMC, in volt",
- "name": "bmc_voltage_stby3.3v_volt",
+ "labels": {
+ "voltage": "stby3.3v"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -110,7 +134,10 @@
},
{
"description": "Voltage of VCORE 1 reported by BMC, in volt",
- "name": "bmc_voltage_vcore1_volt",
+ "labels": {
+ "voltage": "vcore1"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -120,7 +147,10 @@
},
{
"description": "Voltage of VCORE 2 reported by BMC, in volt",
- "name": "bmc_voltage_vcore2_volt",
+ "labels": {
+ "voltage": "vcore2"
+ },
+ "name": "bmc_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
index 6d3fc9c1b24..ab788f6ec30 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -126,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -134,7 +146,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -143,7 +156,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
index d0b8de04f5d..9a369b3dff2 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
@@ -28,14 +28,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -43,7 +44,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -52,7 +54,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -60,7 +62,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -68,7 +71,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -76,7 +80,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -84,7 +89,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -92,7 +98,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -100,7 +107,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -108,7 +116,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -116,7 +125,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -124,7 +134,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -132,7 +143,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -140,7 +152,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -148,7 +161,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -156,7 +170,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -164,7 +179,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -172,7 +188,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-- name: bmc_fanspeed_fan8a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "8a"}
description: Speed of Fan 8A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -180,7 +197,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15
-- name: bmc_fanspeed_fan8b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "8b"}
description: Speed of Fan 8B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -188,7 +206,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -197,7 +216,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
index 53976059b1c..e66f3e8c5e7 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
@@ -28,14 +28,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -43,7 +44,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -51,7 +53,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -60,7 +63,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -69,7 +73,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -77,7 +81,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -85,7 +90,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -93,7 +99,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -101,7 +108,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -109,7 +117,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -117,7 +126,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -125,7 +135,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7"}
description: Speed of Fan 7 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -133,7 +144,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan8_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "8"}
description: Speed of Fan 8 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -141,7 +153,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -150,7 +163,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -159,7 +173,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu3_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "3"}
description: Temperature of CPU 3 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -168,7 +183,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
-- name: bmc_temp_cpu4_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "4"}
description: Temperature of CPU 4 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
index 2c07378ee80..38b684ea655 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -126,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -134,7 +146,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -142,7 +155,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -150,7 +164,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -158,7 +173,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -166,7 +182,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -174,7 +191,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -191,7 +209,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -200,7 +219,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
index e7c12130953..e34964db534 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -127,7 +138,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
index 31ba4cbc87f..6ad2c0c4ca1 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -127,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -136,7 +147,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
index 9704d7a92c4..6abdb4f9d6d 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -127,7 +138,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -136,7 +148,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_gpu1_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "1"}
description: Temperature of GPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -145,7 +158,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
-- name: bmc_temp_gpu8_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "8"}
description: Temperature of GPU 8 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
index 0edede0820d..cd244be002c 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
@@ -20,7 +20,8 @@ metrics:
protocol: ipmisensor
id: 5 #Ambient Temp
-- name: bmc_fanspeed_fanmod1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod1a"}
description: Speed of FAN MOD 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -28,7 +29,8 @@ metrics:
protocol: ipmisensor
id: 22 #FAN MOD 1A RPM
-- name: bmc_fanspeed_fanmod1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod1b"}
description: Speed of FAN MOD 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -36,7 +38,8 @@ metrics:
protocol: ipmisensor
id: 23 #FAN MOD 1B RPM
-- name: bmc_fanspeed_fanmod1c_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod1c"}
description: Speed of FAN MOD 1C reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -44,7 +47,8 @@ metrics:
protocol: ipmisensor
id: 24 #FAN MOD 1C RPM
-- name: bmc_fanspeed_fanmod1d_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod1d"}
description: Speed of FAN MOD 1D reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -52,7 +56,8 @@ metrics:
protocol: ipmisensor
id: 25 #FAN MOD 1D RPM
-- name: bmc_fanspeed_fanmod2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod2a"}
description: Speed of FAN MOD 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -60,7 +65,8 @@ metrics:
protocol: ipmisensor
id: 26 #FAN MOD 2A RPM
-- name: bmc_fanspeed_fanmod2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod2b"}
description: Speed of FAN MOD 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -68,7 +74,8 @@ metrics:
protocol: ipmisensor
id: 27 #FAN MOD 2B RPM
-- name: bmc_fanspeed_fanmod2c_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod2c"}
description: Speed of FAN MOD 2C reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -76,7 +83,8 @@ metrics:
protocol: ipmisensor
id: 28 #FAN MOD 2C RPM
-- name: bmc_fanspeed_fanmod2d_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod2d"}
description: Speed of FAN MOD 2D reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -84,7 +92,8 @@ metrics:
protocol: ipmisensor
id: 29 #FAN MOD 2D RPM
-- name: bmc_fanspeed_fanmod3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod3a"}
description: Speed of FAN MOD 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -92,7 +101,8 @@ metrics:
protocol: ipmisensor
id: 30 #FAN MOD 3A RPM
-- name: bmc_fanspeed_fanmod3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod3b"}
description: Speed of FAN MOD 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -100,7 +110,8 @@ metrics:
protocol: ipmisensor
id: 31 #FAN MOD 3B RPM
-- name: bmc_fanspeed_fanmod3c_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod3c"}
description: Speed of FAN MOD 3C reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -108,7 +119,8 @@ metrics:
protocol: ipmisensor
id: 32 #FAN MOD 3C RPM
-- name: bmc_fanspeed_fanmod3d_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod3d"}
description: Speed of FAN MOD 3D reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -116,7 +128,8 @@ metrics:
protocol: ipmisensor
id: 33 #FAN MOD 3D RPM
-- name: bmc_fanspeed_fanmod4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod4a"}
description: Speed of FAN MOD 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -124,7 +137,8 @@ metrics:
protocol: ipmisensor
id: 34 #FAN MOD 4A RPM
-- name: bmc_fanspeed_fanmod4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod4b"}
description: Speed of FAN MOD 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -132,7 +146,8 @@ metrics:
protocol: ipmisensor
id: 35 #FAN MOD 4B RPM
-- name: bmc_fanspeed_fanmod4c_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod4c"}
description: Speed of FAN MOD 4C reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -140,7 +155,8 @@ metrics:
protocol: ipmisensor
id: 36 #FAN MOD 4C RPM
-- name: bmc_fanspeed_fanmod4d_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod4d"}
description: Speed of FAN MOD 4D reported by BMC, in rpm
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
index 3d206170450..7455a262ea6 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
@@ -21,14 +21,14 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -36,7 +36,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -45,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
index 189fd5f26e3..92e88740428 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
@@ -26,63 +26,71 @@ metrics:
protocol: ipmisensor
id: 97 #Temp_Ambient_FP
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 91 #Pwr_Node
-- name: bmc_power_gpgpu0_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "0"}
description: Power consumption of GPU 0 reported by BMC, in watt by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 83 #Power_GPGPU0
-- name: bmc_power_gpgpu1_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "1"}
description: Power consumption of GPU 1 reported by BMC, in watt by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 84 #Power_GPGPU1
-- name: bmc_power_gpgpu2_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "2"}
description: Power consumption of GPU 2 reported by BMC, in watt by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 85 #Power_GPGPU2
-- name: bmc_power_gpgpu3_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "3"}
description: Power consumption of GPU 3 reported by BMC, in watt by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 86 #Power_GPGPU3
-- name: bmc_power_gpgpu4_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "4"}
description: Power consumption of GPU 4 reported by BMC, in watt by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 87 #Power_GPGPU4
-- name: bmc_power_gpgpu5_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "5"}
description: Power consumption of GPU 5 reported by BMC, in watt by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 88 #Power_GPGPU5
-- name: bmc_power_gpgpu6_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "6"}
description: Power consumption of GPU 6 reported by BMC, in watt by BMC, in watt
period: 5000
source:
protocol: ipmisensor
id: 89 #Power_GPGPU6
-- name: bmc_power_gpgpu7_watt
+- name: bmc_gpu_power_watt
+ labels: {"gpu": "7"}
description: Power consumption of GPU 7 reported by BMC, in watt by BMC, in watt
period: 5000
source:
@@ -96,7 +104,8 @@ metrics:
protocol: ipmisensor
id: 2 #Airflow
-- name: bmc_fanspeed_sysfan01_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "01"}
description: Speed of SYS fan 0_1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -104,7 +113,8 @@ metrics:
protocol: ipmisensor
id: 18 #Fan_SYS0_1
-- name: bmc_fanspeed_sysfan02_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "02"}
description: Speed of SYS fan 0_2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -112,7 +122,8 @@ metrics:
protocol: ipmisensor
id: 19 #Fan_SYS0_2
-- name: bmc_fanspeed_sysfan11_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "11"}
description: Speed of SYS fan 1_1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -120,7 +131,8 @@ metrics:
protocol: ipmisensor
id: 20 #Fan_SYS1_1
-- name: bmc_fanspeed_sysfan12_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "12"}
description: Speed of SYS fan 1_2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -128,7 +140,8 @@ metrics:
protocol: ipmisensor
id: 21 #Fan_SYS1_2
-- name: bmc_fanspeed_sysfan21_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "21"}
description: Speed of SYS fan 2_1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -136,7 +149,8 @@ metrics:
protocol: ipmisensor
id: 22 #Fan_SYS2_1
-- name: bmc_fanspeed_sysfan22_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "22"}
description: Speed of SYS fan 2_2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -144,7 +158,8 @@ metrics:
protocol: ipmisensor
id: 23 #Fan_SYS2_2
-- name: bmc_fanspeed_sysfan31_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "31"}
description: Speed of SYS fan 3_1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -152,7 +167,8 @@ metrics:
protocol: ipmisensor
id: 24 #Fan_SYS3_1
-- name: bmc_fanspeed_sysfan32_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "32"}
description: Speed of SYS fan 3_2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -160,7 +176,8 @@ metrics:
protocol: ipmisensor
id: 25 #Fan_SYS3_2
-- name: bmc_power_hsc0_watt
+- name: bmc_hsc_power_watt
+ labels: {"hsc": "0"}
description: Power consumption of HSC0 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -168,7 +185,8 @@ metrics:
protocol: ipmisensor
id: 48 #HSC0 Input
-- name: bmc_power_hsc1_watt
+- name: bmc_hsc_power_watt
+ labels: {"hsc": "1"}
description: Power consumption of HSC1 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -176,7 +194,8 @@ metrics:
protocol: ipmisensor
id: 51 #HSC1 Input
-- name: bmc_power_hsc2_watt
+- name: bmc_hsc_power_watt
+ labels: {"hsc": "2"}
description: Power consumption of HSC2 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -184,7 +203,8 @@ metrics:
protocol: ipmisensor
id: 53 #HSC2 Input
-- name: bmc_power_psu1_watt
+- name: bmc_psu_power_watt
+ labels: {"psu": "1"}
description: Power consumption of PSU1 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -192,7 +212,8 @@ metrics:
protocol: ipmisensor
id: 74 #PSU1 Input
-- name: bmc_power_psu2_watt
+- name: bmc_psu_power_watt
+ labels: {"psu": "2"}
description: Power consumption of PSU2 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -200,7 +221,8 @@ metrics:
protocol: ipmisensor
id: 76 #PSU2 Input
-- name: bmc_power_psu3_watt
+- name: bmc_psu_power_watt
+ labels: {"psu": "3"}
description: Power consumption of PSU3 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -208,7 +230,8 @@ metrics:
protocol: ipmisensor
id: 78 #PSU3 Input
-- name: bmc_power_psu4_watt
+- name: bmc_psu_power_watt
+ labels: {"psu": "4"}
description: Power consumption of PSU4 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -240,7 +263,8 @@ metrics:
protocol: ipmisensor
id: 98 #Temp_Ambient_PCI
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -248,7 +272,8 @@ metrics:
protocol: ipmisensor
id: 99 #Temp_CPU0
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -256,7 +281,8 @@ metrics:
protocol: ipmisensor
id: 100 #Temp_CPU1
-- name: bmc_temp_dimm_ab_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "ab"}
description: Temperature of DIMM_AB reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -264,7 +290,8 @@ metrics:
protocol: ipmisensor
id: 101 #Temp_DIMM_AB
-- name: bmc_temp_dimm_cd_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cd"}
description: Temperature of DIMM_CD reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -272,7 +299,8 @@ metrics:
protocol: ipmisensor
id: 102 #Temp_DIMM_CD
-- name: bmc_temp_dimm_ef_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "ef"}
description: Temperature of DIMM_EF reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -280,7 +308,8 @@ metrics:
protocol: ipmisensor
id: 103 #Temp_DIMM_EF
-- name: bmc_temp_dimm_gh_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "gh"}
description: Temperature of DIMM_GH reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -296,7 +325,8 @@ metrics:
protocol: ipmisensor
id: 105 #Temp_EXPB
-- name: bmc_temp_gpu0_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "0"}
description: Temperature of GPU0 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -304,7 +334,8 @@ metrics:
protocol: ipmisensor
id: 106 #Temp_GPGPU0
-- name: bmc_temp_gpu1_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "1"}
description: Temperature of GPU1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -312,7 +343,8 @@ metrics:
protocol: ipmisensor
id: 107 #Temp_GPGPU1
-- name: bmc_temp_gpu2_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "2"}
description: Temperature of GPU2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -320,7 +352,8 @@ metrics:
protocol: ipmisensor
id: 108 #Temp_GPGPU2
-- name: bmc_temp_gpu3_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "3"}
description: Temperature of GPU3 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -328,7 +361,8 @@ metrics:
protocol: ipmisensor
id: 109 #Temp_GPGPU3
-- name: bmc_temp_gpu4_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "4"}
description: Temperature of GPU4 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -336,7 +370,8 @@ metrics:
protocol: ipmisensor
id: 110 #Temp_GPGPU4
-- name: bmc_temp_gpu5_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "5"}
description: Temperature of GPU5 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -344,7 +379,8 @@ metrics:
protocol: ipmisensor
id: 111 #Temp_GPGPU5
-- name: bmc_temp_gpu6_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "6"}
description: Temperature of GPU6 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -352,7 +388,8 @@ metrics:
protocol: ipmisensor
id: 112 #Temp_GPGPU6
-- name: bmc_temp_gpu7_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "7"}
description: Temperature of GPU7 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -360,7 +397,8 @@ metrics:
protocol: ipmisensor
id: 113 #Temp_GPGPU7
-- name: bmc_temp_gpu_b0_celsius
+- name: bmc_temp_gpub_celsius
+ labels: {"id": "0"}
description: Temperature of GPU B0 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -368,7 +406,8 @@ metrics:
protocol: ipmisensor
id: 114 #Temp_GPUB0
-- name: bmc_temp_gpu_b1_celsius
+- name: bmc_temp_gpub_celsius
+ labels: {"id": "1"}
description: Temperature of GPU B1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -424,7 +463,8 @@ metrics:
protocol: ipmisensor
id: 121 #Temp_RaidCard
-- name: bmc_temp_vr_cpu1_celsius
+- name: bmc_cpu_temp_vr_celsius
+ labels: {"cpu": "1"}
description: Temperature of VR CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -432,7 +472,8 @@ metrics:
protocol: ipmisensor
id: 122 #Temp_VR_CPU0
-- name: bmc_temp_vr_cpu2_celsius
+- name: bmc_cpu_temp_vr_celsius
+ labels: {"cpu": "2"}
description: Temperature of VR CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -440,7 +481,8 @@ metrics:
protocol: ipmisensor
id: 123 #Temp_VR_CPU1
-- name: bmc_temp_vr_dimm_ab_celsius
+- name: bmc_temp_vr_dimm_celsius
+ labels: {"dimm": "ab"}
description: Temperature of VR DIMM_AB reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -448,7 +490,8 @@ metrics:
protocol: ipmisensor
id: 124 #Temp_VR_DIMM_AB
-- name: bmc_temp_vr_dimm_cd_celsius
+- name: bmc_temp_vr_dimm_celsius
+ labels: {"dimm": "cd"}
description: Temperature of VR DIMM_CD reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -456,7 +499,8 @@ metrics:
protocol: ipmisensor
id: 125 #Temp_VR_DIMM_CD
-- name: bmc_temp_vr_dimm_ef_celsius
+- name: bmc_temp_vr_dimm_celsius
+ labels: {"dimm": "ef"}
description: Temperature of VR DIMM_EF reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -464,7 +508,8 @@ metrics:
protocol: ipmisensor
id: 126 #Temp_VR_DIMM_EF
-- name: bmc_temp_vr_dimm_gh_celsius
+- name: bmc_temp_vr_dimm_celsius
+ labels: {"dimm": "gh"}
description: Temperature of VR DIMM_GH reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -472,7 +517,8 @@ metrics:
protocol: ipmisensor
id: 127 #Temp_VR_DIMM_GH
-- name: bmc_voltage_p12v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p12v"}
description: Voltage of P12V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -480,7 +526,8 @@ metrics:
protocol: ipmisensor
id: 128 #Volt_P12V
-- name: bmc_voltage_p1v05_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p1v05"}
description: Voltage of P1V05 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -488,7 +535,8 @@ metrics:
protocol: ipmisensor
id: 129 #Volt_P1V05
-- name: bmc_voltage_p1v8_aux_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p1v8_aux"}
description: Voltage of P1V8_AUX reported by BMC, in volt
period: 0
optional_period: 5000
@@ -496,7 +544,8 @@ metrics:
protocol: ipmisensor
id: 130 #Volt_P1V8_AUX
-- name: bmc_voltage_p3v3_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p3v3"}
description: Voltage of P3V3 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -504,7 +553,8 @@ metrics:
protocol: ipmisensor
id: 131 #Volt_P3V3
-- name: bmc_voltage_p3v3_aux_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p3v3_aux"}
description: Voltage of P3V3_AUX reported by BMC, in volt
period: 0
optional_period: 5000
@@ -512,7 +562,8 @@ metrics:
protocol: ipmisensor
id: 132 #Volt_P3V3_AUX
-- name: bmc_voltage_p3v_bat_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p3v_bat"}
description: Voltage of P3V_BAT reported by BMC, in volt
period: 0
optional_period: 5000
@@ -520,7 +571,8 @@ metrics:
protocol: ipmisensor
id: 133 #Volt_P3V_BAT
-- name: bmc_voltage_p5v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p5v"}
description: Voltage of P5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -528,7 +580,8 @@ metrics:
protocol: ipmisensor
id: 134 #Volt_P5V
-- name: bmc_voltage_p5v_aux_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p5v_aux"}
description: Voltage of P5V_AUX reported by BMC, in volt
period: 0
optional_period: 5000
@@ -536,7 +589,8 @@ metrics:
protocol: ipmisensor
id: 135 #Volt_P5V_AUX
-- name: bmc_voltage_vr_cpu1_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vr_cpu1"}
description: Voltage of VR CPU1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -544,7 +598,8 @@ metrics:
protocol: ipmisensor
id: 136 #Volt_VR_CPU0
-- name: bmc_voltage_vr_cpu1_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vr_cpu1"}
description: Voltage of VR CPU2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -552,7 +607,8 @@ metrics:
protocol: ipmisensor
id: 137 #Volt_VR_CPU1
-- name: bmc_voltage_vr_dimm_ab_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vr_dimm_ab"}
description: Voltage of VR DIMM_AB reported by BMC, in volt
period: 0
optional_period: 5000
@@ -560,7 +616,8 @@ metrics:
protocol: ipmisensor
id: 138 #Volt_VR_DIMM_AB
-- name: bmc_voltage_vr_dimm_cd_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vr_dimm_cd"}
description: Voltage of VR DIMM_CD reported by BMC, in volt
period: 0
optional_period: 5000
@@ -568,7 +625,8 @@ metrics:
protocol: ipmisensor
id: 139 #Volt_VR_DIMM_CD
-- name: bmc_voltage_vr_dimm_ef_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vr_dimm_ef"}
description: Voltage of VR DIMM_EF reported by BMC, in volt
period: 0
optional_period: 5000
@@ -576,7 +634,8 @@ metrics:
protocol: ipmisensor
id: 140 #Volt_VR_DIMM_EF
-- name: bmc_voltage_vr_dimm_gh_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vr_dimm_gh"}
description: Voltage of VR DIMM_GH reported by BMC, in volt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
index 0498520465f..d89c8ff0536 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
@@ -25,7 +25,8 @@ metrics:
protocol: ipmisensor
id: 49 #Inlet Temp
-- name: bmc_voltage_12vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "12vstandby"}
description: 12V Standby voltage reported by BMC, in volt
period: 0
optional_period: 5000
@@ -33,7 +34,8 @@ metrics:
protocol: ipmisensor
id: 5 #12V Standby
-- name: bmc_voltage_5vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "5vstandby"}
description: 5V Standby voltage reported by BMC, in volt
period: 0
optional_period: 5000
@@ -41,7 +43,8 @@ metrics:
protocol: ipmisensor
id: 6 #5V Standby
-- name: bmc_voltage_5v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "5v"}
description: 5V voltage reported by BMC, in volt
period: 0
optional_period: 5000
@@ -49,7 +52,8 @@ metrics:
protocol: ipmisensor
id: 7 #5V
-- name: bmc_voltage_3.3vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "3.3vstandby"}
description: 3.3V Standby voltage reported by BMC, in volt
period: 0
optional_period: 5000
@@ -57,7 +61,8 @@ metrics:
protocol: ipmisensor
id: 8 #3.3V Standby
-- name: bmc_voltage_3.3v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "3.3v"}
description: 3.3V voltage reported by BMC, in volt
period: 0
optional_period: 5000
@@ -73,7 +78,8 @@ metrics:
protocol: ipmisensor
id: 11 #MEZZ1 TEMP
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -81,7 +87,8 @@ metrics:
protocol: ipmisensor
id: 12 #CPU1 Temp
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -89,7 +96,8 @@ metrics:
protocol: ipmisensor
id: 13 #CPU2 Temp
-- name: bmc_temp_dimmzone1_celsius
+- name: bmc_temp_dimmzone_celsius
+ labels: {"zone": "1"}
description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -97,7 +105,8 @@ metrics:
protocol: ipmisensor
id: 14 #DIMM ZONE 1 Temp
-- name: bmc_temp_dimmzone2_celsius
+- name: bmc_temp_dimmzone_celsius
+ labels: {"zone": "2"}
description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -113,7 +122,8 @@ metrics:
protocol: ipmisensor
id: 18 #PCH Temp
-- name: bmc_voltage_inputvoltage_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "inputvoltage"}
description: Voltage of input reported by BMC, in volt
period: 0
optional_period: 5000
@@ -129,7 +139,8 @@ metrics:
protocol: ipmisensor
id: 52 #Input Current
-- name: bmc_fanspeed_fan_1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "_1"}
description: Speed of fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -137,7 +148,8 @@ metrics:
protocol: ipmisensor
id: 96 #FAN_1
-- name: bmc_fanspeed_fan_2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "_2"}
description: Speed of fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -145,7 +157,8 @@ metrics:
protocol: ipmisensor
id: 97 #FAN_2
-- name: bmc_fanspeed_fan_3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "_3"}
description: Speed of fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -153,7 +166,8 @@ metrics:
protocol: ipmisensor
id: 98 #FAN_3
-- name: bmc_fanspeed_fan_4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "_4"}
description: Speed of fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 07237e38429..63c3551e776 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -28,14 +28,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -44,7 +45,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +55,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -61,7 +63,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -69,7 +72,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -77,7 +81,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -85,7 +90,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -93,7 +99,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -101,7 +108,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -109,7 +117,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -117,7 +126,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -125,7 +135,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -133,7 +144,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -141,7 +153,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -150,7 +163,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index 97b530912e8..e3286f724fb 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -27,14 +27,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -42,7 +43,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -50,7 +52,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -59,7 +62,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -68,7 +72,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -76,7 +80,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -84,7 +89,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -92,7 +98,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -100,7 +107,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -108,7 +116,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -116,7 +125,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -133,7 +143,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -142,7 +153,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index ef041c62005..69b364ce41d 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -28,14 +28,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -43,7 +44,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -51,7 +53,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -60,7 +63,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -69,7 +73,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -77,7 +81,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -85,7 +90,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -93,7 +99,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -101,7 +108,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -109,7 +117,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -117,7 +126,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -134,7 +144,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -143,7 +154,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
index 3e7d8261a94..e714a26a65c 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fanextr_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "extr"}
description: Speed of Fan Ext R reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -126,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fanextl_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "extl"}
description: Speed of Fan Ext L reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -134,7 +146,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -143,7 +156,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
index 939b09f94c2..1f2af08836f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
@@ -27,14 +27,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -42,7 +43,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -51,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -59,7 +61,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -67,7 +70,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -75,7 +79,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -83,7 +88,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -91,7 +97,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -99,7 +106,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -107,7 +115,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -115,7 +124,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -123,7 +133,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -131,7 +142,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -139,7 +151,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -147,7 +160,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -155,7 +169,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -163,7 +178,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -180,7 +196,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -189,7 +206,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
index 31ba4cbc87f..6ad2c0c4ca1 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -127,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -136,7 +147,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
index 31ba4cbc87f..6ad2c0c4ca1 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -127,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -136,7 +147,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml b/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
index 8bc282e04b2..e7564186599 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
@@ -20,7 +20,8 @@ metrics:
protocol: ipmisensor
id: 11 #Inlet Temp
-- name: bmc_voltage_12vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "12vstandby"}
description: Voltage of 12V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -28,7 +29,8 @@ metrics:
protocol: ipmisensor
id: 5 #12V Standby
-- name: bmc_voltage_5vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "5vstandby"}
description: Voltage of 5V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +38,8 @@ metrics:
protocol: ipmisensor
id: 6 #5V Standby
-- name: bmc_voltage_5v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "5v"}
description: Voltage of 5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +47,8 @@ metrics:
protocol: ipmisensor
id: 7 #5V
-- name: bmc_voltage_3.3vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "3.3vstandby"}
description: Voltage of 3.3V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -52,7 +56,8 @@ metrics:
protocol: ipmisensor
id: 8 #3.3V Standby
-- name: bmc_voltage_3.3v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "3.3v"}
description: Voltage of 3.3V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -60,7 +65,8 @@ metrics:
protocol: ipmisensor
id: 9 #3.3V
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -68,7 +74,8 @@ metrics:
protocol: ipmisensor
id: 12 #CPU1 Temp
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -76,7 +83,8 @@ metrics:
protocol: ipmisensor
id: 13 #CPU2 Temp
-- name: bmc_temp_dimmzone1_celsius
+- name: bmc_temp_dimmzone_celsius
+ labels: {"zone": "1"}
description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -84,7 +92,8 @@ metrics:
protocol: ipmisensor
id: 14 #DIMM ZONE 1 Temp
-- name: bmc_temp_dimmzone2_celsius
+- name: bmc_temp_dimmzone_celsius
+ labels: {"zone": "2"}
description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -100,7 +109,8 @@ metrics:
protocol: ipmisensor
id: 18 #PCH Temp
-- name: bmc_voltage_input_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "input"}
description: Voltage of Input reported by BMC, in volt
period: 0
optional_period: 5000
@@ -116,7 +126,8 @@ metrics:
protocol: ipmisensor
id: 17 #Input Current
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of FAN 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -124,7 +135,8 @@ metrics:
protocol: ipmisensor
id: 24 #FAN_1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of FAN 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -132,7 +144,8 @@ metrics:
protocol: ipmisensor
id: 28 #FAN_2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of FAN 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -140,7 +153,8 @@ metrics:
protocol: ipmisensor
id: 29 #FAN_3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of FAN 4 reported by BMC, in rpm
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
index 31ba4cbc87f..6ad2c0c4ca1 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -127,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -136,7 +147,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
index 31ba4cbc87f..6ad2c0c4ca1 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -127,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -136,7 +147,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
index 939b09f94c2..1f2af08836f 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
@@ -27,14 +27,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -42,7 +43,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -51,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -59,7 +61,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -67,7 +70,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -75,7 +79,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -83,7 +88,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -91,7 +97,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -99,7 +106,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -107,7 +115,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -115,7 +124,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -123,7 +133,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -131,7 +142,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -139,7 +151,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -147,7 +160,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -155,7 +169,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -163,7 +178,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -180,7 +196,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -189,7 +206,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
index 939b09f94c2..1f2af08836f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
@@ -27,14 +27,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -42,7 +43,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -51,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -59,7 +61,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -67,7 +70,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -75,7 +79,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -83,7 +88,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -91,7 +97,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -99,7 +106,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -107,7 +115,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -115,7 +124,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -123,7 +133,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -131,7 +142,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -139,7 +151,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -147,7 +160,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -155,7 +169,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -163,7 +178,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -180,7 +196,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -189,7 +206,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
index e955cc98c51..8138b841a35 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
@@ -28,14 +28,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -43,7 +44,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -52,7 +54,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -60,7 +62,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -68,7 +71,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -76,7 +80,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -84,7 +89,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -92,7 +98,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -100,7 +107,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -108,7 +116,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -116,7 +125,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -124,7 +134,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan8a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "8a"}
description: Speed of Fan 8A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -132,7 +143,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan8b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "8b"}
description: Speed of Fan 8B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -140,7 +152,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
index 1e0c64fd949..6d1c8f52aae 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5"}
description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6"}
description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -127,7 +138,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -136,7 +148,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_gpu1_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "1"}
description: Temperature of GPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -145,7 +158,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
-- name: bmc_temp_gpu2_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "2"}
description: Temperature of GPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -154,7 +168,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
-- name: bmc_temp_gpu5_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "5"}
description: Temperature of GPU 5 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -163,7 +178,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6
-- name: bmc_temp_gpu8_celsius
+- name: bmc_gpu_temp_celsius
+ labels: {"gpu": "8"}
description: Temperature of GPU 8 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
index 6d3fc9c1b24..ab788f6ec30 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -126,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -134,7 +146,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -143,7 +156,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml b/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
index 8569f41277d..c685e742e81 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
@@ -20,7 +20,8 @@ metrics:
protocol: ipmisensor
id: 11 #Inlet Temp
-- name: bmc_voltage_12vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "12vstandby"}
description: Voltage of 12V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -28,7 +29,8 @@ metrics:
protocol: ipmisensor
id: 5 #12V Standby
-- name: bmc_voltage_5vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "5vstandby"}
description: Voltage of 5V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +38,8 @@ metrics:
protocol: ipmisensor
id: 6 #5V Standby
-- name: bmc_voltage_5v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "5v"}
description: Voltage of 5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +47,8 @@ metrics:
protocol: ipmisensor
id: 7 #5V
-- name: bmc_voltage_3.3vstandby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "3.3vstandby"}
description: Voltage of 3.3V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -52,7 +56,8 @@ metrics:
protocol: ipmisensor
id: 8 #3.3V Standby
-- name: bmc_voltage_3.3v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "3.3v"}
description: Voltage of 3.3V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -60,7 +65,8 @@ metrics:
protocol: ipmisensor
id: 9 #3.3V
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -68,7 +74,8 @@ metrics:
protocol: ipmisensor
id: 12 #CPU1 Temp
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -76,7 +83,8 @@ metrics:
protocol: ipmisensor
id: 13 #CPU2 Temp
-- name: bmc_temp_dimmzone1_celsius
+- name: bmc_temp_dimmzone_celsius
+ labels: {"zone": "1"}
description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -84,7 +92,8 @@ metrics:
protocol: ipmisensor
id: 14 #DIMM ZONE 1 Temp
-- name: bmc_temp_dimmzone2_celsius
+- name: bmc_temp_dimmzone_celsius
+ labels: {"zone": "2"}
description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -100,7 +109,8 @@ metrics:
protocol: ipmisensor
id: 18 #PCH Temp
-- name: bmc_voltage_input_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "input"}
description: Input voltage reported by BMC, in volt
period: 0
optional_period: 5000
@@ -116,7 +126,8 @@ metrics:
protocol: ipmisensor
id: 17 #Input Current
-- name: bmc_fanspeed_fan1_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1"}
description: Speed of fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -124,7 +135,8 @@ metrics:
protocol: ipmisensor
id: 21 #FAN_1
-- name: bmc_fanspeed_fan2_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2"}
description: Speed of fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -132,7 +144,8 @@ metrics:
protocol: ipmisensor
id: 24 #FAN_2
-- name: bmc_fanspeed_fan3_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3"}
description: Speed of fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -140,7 +153,8 @@ metrics:
protocol: ipmisensor
id: 28 #FAN_3
-- name: bmc_fanspeed_fan4_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4"}
description: Speed of fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
index 2c07378ee80..38b684ea655 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
@@ -21,14 +21,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -36,7 +37,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_voltage_psu2_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "2"}
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,7 +46,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -53,7 +56,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_current_psu2_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "2"}
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -62,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -70,7 +74,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -78,7 +83,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -86,7 +92,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -94,7 +101,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -102,7 +110,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -110,7 +119,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -118,7 +128,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -126,7 +137,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -134,7 +146,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -142,7 +155,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -150,7 +164,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -158,7 +173,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -166,7 +182,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -174,7 +191,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -191,7 +209,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -200,7 +219,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
index 4fa32329cca..1117bf53996 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
@@ -13,7 +13,8 @@ metrics:
source:
protocol: network_equipment
-- name: bmc_voltage_pvcore1_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "pvcore1"}
description: Voltage of PVCORE1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -21,7 +22,8 @@ metrics:
protocol: ipmisensor
id: 2720 #PVCORE1
-- name: bmc_voltage_pvnbcpu1_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "pvnbcpu1"}
description: Voltage of PVNB CPU1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -29,7 +31,8 @@ metrics:
protocol: ipmisensor
id: 2784 #PVNB CPU1
-- name: bmc_voltage_p1v5ddr3cpu1_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p1v5ddr3cpu1"}
description: Voltage of P1V5 DDR3 CPU1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -37,7 +40,8 @@ metrics:
protocol: ipmisensor
id: 2848 #P1V5 DDR3 CPU1
-- name: bmc_voltage_pvcore2_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "pvcore2"}
description: Voltage of PVCORE2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -45,7 +49,8 @@ metrics:
protocol: ipmisensor
id: 2912 #PVCORE2
-- name: bmc_voltage_pvnbcpu2_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "pvnbcpu2"}
description: Voltage of PVNB CPU2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -53,7 +58,8 @@ metrics:
protocol: ipmisensor
id: 2976 #PVNB CPU2
-- name: bmc_voltage_p1v5ddr3cpu2_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p1v5ddr3cpu2"}
description: Voltage of P1V5 DDR3 CPU2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -61,7 +67,8 @@ metrics:
protocol: ipmisensor
id: 3040 #P1V5 DDR3 CPU2
-- name: bmc_voltage_p12v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p12v"}
description: Voltage of P12V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -69,7 +76,8 @@ metrics:
protocol: ipmisensor
id: 3104 #P12V
-- name: bmc_voltage_p5v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p5v"}
description: Voltage of P5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -77,7 +85,8 @@ metrics:
protocol: ipmisensor
id: 3168 #P5V
-- name: bmc_voltage_p5vstby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p5vstby"}
description: Voltage of P5V STBY reported by BMC, in volt
period: 0
optional_period: 5000
@@ -85,7 +94,8 @@ metrics:
protocol: ipmisensor
id: 3232 #P5V STBY
-- name: bmc_voltage_p3v3_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p3v3"}
description: Voltage of P3V3 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -93,7 +103,8 @@ metrics:
protocol: ipmisensor
id: 3296 #P3V3
-- name: bmc_voltage_p3v3stby_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p3v3stby"}
description: Voltage of P3V3 STBY reported by BMC, in volt
period: 0
optional_period: 5000
@@ -101,7 +112,8 @@ metrics:
protocol: ipmisensor
id: 3360 #P3V3 STBY
-- name: bmc_voltage_p1v1sr5670_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "p1v1sr5670"}
description: Voltage of P1V1 SR5670 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -109,7 +121,8 @@ metrics:
protocol: ipmisensor
id: 3424 #P1V1 SR5670
-- name: bmc_fanspeed_psufan1inlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan1inlet"}
description: Speed of PSU Fan 1 Inlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -117,7 +130,8 @@ metrics:
protocol: ipmisensor
id: 3536 #Fan1 Inlet
-- name: bmc_fanspeed_psufan1outlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan1outlet"}
description: Speed of PSU Fan 1 Outlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -125,7 +139,8 @@ metrics:
protocol: ipmisensor
id: 3648 #Fan1 Outlet
-- name: bmc_fanspeed_psufan2inlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan2inlet"}
description: Speed of PSU Fan 2 Inlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -133,7 +148,8 @@ metrics:
protocol: ipmisensor
id: 3760 #Fan2 Inlet
-- name: bmc_fanspeed_psufan2outlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan2outlet"}
description: Speed of PSU Fan 2 Outlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -141,7 +157,8 @@ metrics:
protocol: ipmisensor
id: 3872 #Fan2 Outlet
-- name: bmc_fanspeed_psufan3inlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan3inlet"}
description: Speed of PSU Fan 3 Inlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -149,7 +166,8 @@ metrics:
protocol: ipmisensor
id: 3984 #Fan3 Inlet
-- name: bmc_fanspeed_psufan3outlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan3outlet"}
description: Speed of PSU Fan 3 Outlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -157,7 +175,8 @@ metrics:
protocol: ipmisensor
id: 4096 #Fan3 Outlet
-- name: bmc_fanspeed_psufan4inlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan4inlet"}
description: Speed of PSU Fan 4 Inlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -165,7 +184,8 @@ metrics:
protocol: ipmisensor
id: 4208 #Fan4 Inlet
-- name: bmc_fanspeed_psufan4outlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan4outlet"}
description: Speed of PSU Fan 4 Outlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -173,7 +193,8 @@ metrics:
protocol: ipmisensor
id: 4320 #Fan4 Outlet
-- name: bmc_fanspeed_psufan5inlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan5inlet"}
description: Speed of PSU Fan 5 Inlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -181,7 +202,8 @@ metrics:
protocol: ipmisensor
id: 4384 #Fan5 Inlet
-- name: bmc_fanspeed_psufan5outlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan5outlet"}
description: Speed of PSU Fan 5 Outlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -189,7 +211,8 @@ metrics:
protocol: ipmisensor
id: 4448 #Fan5 Outlet
-- name: bmc_fanspeed_psufan6inlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan6inlet"}
description: Speed of PSU Fan 6 Inlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -197,7 +220,8 @@ metrics:
protocol: ipmisensor
id: 4512 #Fan6 Inlet
-- name: bmc_fanspeed_psufan6outlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan6outlet"}
description: Speed of PSU Fan 6 Outlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -205,7 +229,8 @@ metrics:
protocol: ipmisensor
id: 4576 #Fan6 Outlet
-- name: bmc_fanspeed_psufan7inlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan7inlet"}
description: Speed of PSU Fan 7 Inlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -213,7 +238,8 @@ metrics:
protocol: ipmisensor
id: 4640 #Fan7 Inlet
-- name: bmc_fanspeed_psufan7outlet_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "psufan7outlet"}
description: Speed of PSU Fan 7 Outlet reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -221,7 +247,8 @@ metrics:
protocol: ipmisensor
id: 4704 #Fan7 Outlet
-- name: bmc_temp_cpu1dimm1_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm1"}
description: Temperature of CPU1 DIMM1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -229,7 +256,8 @@ metrics:
protocol: ipmisensor
id: 4816 #CPU1 DIMM1
-- name: bmc_temp_cpu1dimm2_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm2"}
description: Temperature of CPU1 DIMM2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -237,7 +265,8 @@ metrics:
protocol: ipmisensor
id: 4880 #CPU1 DIMM2
-- name: bmc_temp_cpu1dimm3_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm3"}
description: Temperature of CPU1 DIMM3 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -245,7 +274,8 @@ metrics:
protocol: ipmisensor
id: 4944 #CPU1 DIMM3
-- name: bmc_temp_cpu1dimm4_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm4"}
description: Temperature of CPU1 DIMM4 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -253,7 +283,8 @@ metrics:
protocol: ipmisensor
id: 5008 #CPU1 DIMM4
-- name: bmc_temp_cpu1dimm5_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm5"}
description: Temperature of CPU1 DIMM5 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -261,7 +292,8 @@ metrics:
protocol: ipmisensor
id: 5072 #CPU1 DIMM5
-- name: bmc_temp_cpu1dimm6_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm6"}
description: Temperature of CPU1 DIMM6 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -269,7 +301,8 @@ metrics:
protocol: ipmisensor
id: 5136 #CPU1 DIMM6
-- name: bmc_temp_cpu1dimm7_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm7"}
description: Temperature of CPU1 DIMM7 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -277,7 +310,8 @@ metrics:
protocol: ipmisensor
id: 5200 #CPU1 DIMM7
-- name: bmc_temp_cpu1dimm8_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm8"}
description: Temperature of CPU1 DIMM8 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -285,7 +319,8 @@ metrics:
protocol: ipmisensor
id: 5264 #CPU1 DIMM8
-- name: bmc_temp_cpu1dimm9_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm9"}
description: Temperature of CPU1 DIMM9 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -293,7 +328,8 @@ metrics:
protocol: ipmisensor
id: 5328 #CPU1 DIMM9
-- name: bmc_temp_cpu1dimm10_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm10"}
description: Temperature of CPU1 DIMM10 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -301,7 +337,8 @@ metrics:
protocol: ipmisensor
id: 5392 #CPU1 DIMM10
-- name: bmc_temp_cpu1dimm11_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm11"}
description: Temperature of CPU1 DIMM11 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -309,7 +346,8 @@ metrics:
protocol: ipmisensor
id: 5456 #CPU1 DIMM11
-- name: bmc_temp_cpu1dimm12_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu1dimm12"}
description: Temperature of CPU1 DIMM12 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -317,7 +355,8 @@ metrics:
protocol: ipmisensor
id: 5520 #CPU1 DIMM12
-- name: bmc_temp_cpu2dimm1_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm1"}
description: Temperature of CPU2 DIMM1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -325,7 +364,8 @@ metrics:
protocol: ipmisensor
id: 5584 #CPU2 DIMM1
-- name: bmc_temp_cpu2dimm2_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm2"}
description: Temperature of CPU2 DIMM2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -333,7 +373,8 @@ metrics:
protocol: ipmisensor
id: 5648 #CPU2 DIMM2
-- name: bmc_temp_cpu2dimm3_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm3"}
description: Temperature of CPU2 DIMM3 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -341,7 +382,8 @@ metrics:
protocol: ipmisensor
id: 5712 #CPU2 DIMM3
-- name: bmc_temp_cpu2dimm4_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm4"}
description: Temperature of CPU2 DIMM4 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -349,7 +391,8 @@ metrics:
protocol: ipmisensor
id: 5776 #CPU2 DIMM4
-- name: bmc_temp_cpu2dimm5_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm5"}
description: Temperature of CPU2 DIMM5 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -357,7 +400,8 @@ metrics:
protocol: ipmisensor
id: 5840 #CPU2 DIMM5
-- name: bmc_temp_cpu2dimm6_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm6"}
description: Temperature of CPU2 DIMM6 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -365,7 +409,8 @@ metrics:
protocol: ipmisensor
id: 5904 #CPU2 DIMM6
-- name: bmc_temp_cpu2dimm7_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm7"}
description: Temperature of CPU2 DIMM7 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -373,7 +418,8 @@ metrics:
protocol: ipmisensor
id: 5968 #CPU2 DIMM7
-- name: bmc_temp_cpu2dimm8_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm8"}
description: Temperature of CPU2 DIMM8 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -381,7 +427,8 @@ metrics:
protocol: ipmisensor
id: 6032 #CPU2 DIMM8
-- name: bmc_temp_cpu2dimm9_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm9"}
description: Temperature of CPU2 DIMM9 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -389,7 +436,8 @@ metrics:
protocol: ipmisensor
id: 6096 #CPU2 DIMM9
-- name: bmc_temp_cpu2dimm10_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm10"}
description: Temperature of CPU2 DIMM10 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -397,7 +445,8 @@ metrics:
protocol: ipmisensor
id: 6160 #CPU2 DIMM10
-- name: bmc_temp_cpu2dimm11_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm11"}
description: Temperature of CPU2 DIMM11 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -405,7 +454,8 @@ metrics:
protocol: ipmisensor
id: 6224 #CPU2 DIMM11
-- name: bmc_temp_cpu2dimm12_celsius
+- name: bmc_temp_dimm_celsius
+ labels: {"dimm": "cpu2dimm12"}
description: Temperature of CPU2 DIMM12 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -421,7 +471,8 @@ metrics:
protocol: ipmisensor
id: 6400 #Inlet Ambient
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -429,7 +480,8 @@ metrics:
protocol: ipmisensor
id: 6464 #CPU1
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
index eea7d0e4cab..cab6fcf5de1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
@@ -27,14 +27,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -42,7 +43,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -51,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -59,7 +61,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -67,7 +70,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -75,7 +79,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -83,7 +88,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -91,7 +97,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -99,7 +106,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -107,7 +115,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -115,7 +124,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -123,7 +133,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -131,7 +142,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -139,7 +151,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -147,7 +160,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -155,7 +169,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -163,7 +178,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -180,7 +196,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -189,7 +206,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
index 939b09f94c2..1f2af08836f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
@@ -27,14 +27,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_power_node_watt
+- name: bmc_node_power_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
-- name: bmc_voltage_psu1_volt
+- name: bmc_psu_voltage_volt
+ labels: {"psu": "1"}
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -42,7 +43,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu1_amp
+- name: bmc_psu_current_amp
+ labels: {"psu": "1"}
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -51,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_power_node_watt_total
+- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
@@ -59,7 +61,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_fan1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1a"}
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -67,7 +70,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_fan2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2a"}
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -75,7 +79,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_fan3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3a"}
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -83,7 +88,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_fan4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4a"}
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -91,7 +97,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_fan5a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5a"}
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -99,7 +106,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_fan6a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6a"}
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -107,7 +115,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_fan7a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7a"}
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -115,7 +124,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_fan1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "1b"}
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -123,7 +133,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_fan2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "2b"}
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -131,7 +142,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_fan3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "3b"}
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -139,7 +151,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-- name: bmc_fanspeed_fan4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "4b"}
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -147,7 +160,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-- name: bmc_fanspeed_fan5b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "5b"}
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -155,7 +169,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-- name: bmc_fanspeed_fan6b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "6b"}
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -163,7 +178,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-- name: bmc_fanspeed_fan7b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "7b"}
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -180,7 +196,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_cpu1_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -189,7 +206,8 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_temp_cpu2_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml b/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
index 7893fd5d28f..dfa26b24895 100644
--- a/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
@@ -20,7 +20,8 @@ metrics:
protocol: ipmisensor
id: 10 #Inlet Temp
-- name: bmc_fanspeed_fanmod1a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod1a"}
description: Speed of FAN MOD 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -28,7 +29,8 @@ metrics:
protocol: ipmisensor
id: 33 #FAN MOD 1A RPM
-- name: bmc_fanspeed_fanmod1b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod1b"}
description: Speed of FAN MOD 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -36,7 +38,8 @@ metrics:
protocol: ipmisensor
id: 34 #FAN MOD 1B RPM
-- name: bmc_fanspeed_fanmod2a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod2a"}
description: Speed of FAN MOD 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -44,7 +47,8 @@ metrics:
protocol: ipmisensor
id: 35 #FAN MOD 2A RPM
-- name: bmc_fanspeed_fanmod2b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod2b"}
description: Speed of FAN MOD 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -52,7 +56,8 @@ metrics:
protocol: ipmisensor
id: 36 #FAN MOD 2B RPM
-- name: bmc_fanspeed_fanmod3a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod3a"}
description: Speed of FAN MOD 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -60,7 +65,8 @@ metrics:
protocol: ipmisensor
id: 37 #FAN MOD 3A RPM
-- name: bmc_fanspeed_fanmod3b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod3b"}
description: Speed of FAN MOD 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -68,7 +74,8 @@ metrics:
protocol: ipmisensor
id: 38 #FAN MOD 3B RPM
-- name: bmc_fanspeed_fanmod4a_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod4a"}
description: Speed of FAN MOD 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -76,7 +83,8 @@ metrics:
protocol: ipmisensor
id: 39 #FAN MOD 4A RPM
-- name: bmc_fanspeed_fanmod4b_rpm
+- name: bmc_fan_speed_rpm
+ labels: {"fan": "mod4b"}
description: Speed of FAN MOD 4B reported by BMC, in rpm
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
index cc480dfdb90..f708943a7b4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
@@ -13,7 +13,8 @@ metrics:
source:
protocol: network_equipment
-- name: bmc_voltage_ps12v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "ps12v"}
description: Voltage of PS 12V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -21,7 +22,8 @@ metrics:
protocol: ipmisensor
id: 14 #PS 12V
-- name: bmc_voltage_ps5v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "ps5v"}
description: Voltage of PS 5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -29,7 +31,8 @@ metrics:
protocol: ipmisensor
id: 15 #PS 5V
-- name: bmc_temp_mlbtemp2_celsius
+- name: bmc_temp_mlb_celsius
+ labels: {"id": "2"}
description: Temperature of MLB TEMP 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -37,7 +40,8 @@ metrics:
protocol: ipmisensor
id: 16 #MLB TEMP 2
-- name: bmc_temp_mlbtemp3_celsius
+- name: bmc_temp_mlb_celsius
+ labels: {"id": "3"}
description: Temperature of MLB TEMP 3 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -45,7 +49,8 @@ metrics:
protocol: ipmisensor
id: 17 #MLB TEMP 3
-- name: bmc_temp_processor1temp_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "1"}
description: Temperature of Processor 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -53,7 +58,8 @@ metrics:
protocol: ipmisensor
id: 18 #Processor 1 Temp
-- name: bmc_temp_mlbtemp1_celsius
+- name: bmc_temp_mlb_celsius
+ labels: {"id": "1"}
description: Temperature of MLB TEMP 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -61,7 +67,8 @@ metrics:
protocol: ipmisensor
id: 19 #MLB TEMP 1
-- name: bmc_temp_processor2temp_celsius
+- name: bmc_cpu_temp_celsius
+ labels: {"cpu": "2"}
description: Temperature of Processor 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -69,7 +76,8 @@ metrics:
protocol: ipmisensor
id: 20 #Processor 2 Temp
-- name: bmc_voltage_stby3.3v_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "stby3.3v"}
description: Voltage of STBY 3.3V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -85,7 +93,8 @@ metrics:
protocol: ipmisensor
id: 22 #PS Current
-- name: bmc_voltage_vcore1_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vcore1"}
description: Voltage of VCORE 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -93,7 +102,8 @@ metrics:
protocol: ipmisensor
id: 26 #VCORE 1
-- name: bmc_voltage_vcore2_volt
+- name: bmc_voltage_volt
+ labels: {"voltage": "vcore2"}
description: Voltage of VCORE 2 reported by BMC, in volt
period: 0
optional_period: 5000
--
GitLab