diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index 621f383513c34ba584b42270d676f7639d96af72..200a1686230c0ea9356f2321ebf5cc173be139ee 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -180,7 +180,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -193,7 +193,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -207,7 +207,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/grenoble/clusters/drac/drac.json b/data/grid5000/sites/grenoble/clusters/drac/drac.json
index 266080a523fd1cffb72c353a763f813fa628113f..1af2be77342354eadb29b65d3ce9895657608b0f 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/drac.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/drac.json
@@ -5,7 +5,7 @@
"metrics": [
{
"description": "Front node ambient temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambient_celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"source": {
"id": 175,
@@ -24,9 +24,9 @@
{
"description": "Temperature of CPU Diode 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "cpu_diode_1"
},
- "name": "bmc_cpudiode_temp_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -37,9 +37,9 @@
{
"description": "Temperature of CPU Diode 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "cpu_diode_2"
},
- "name": "bmc_cpudiode_temp_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -50,7 +50,7 @@
{
"description": "Temperature of CPU1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -63,7 +63,7 @@
{
"description": "Temperature of CPU2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -76,7 +76,7 @@
{
"description": "Temperature of DIMM1 reported by BMC, in celsius",
"labels": {
- "dimm": "1"
+ "id": "1"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -89,7 +89,7 @@
{
"description": "Temperature of DIMM2 reported by BMC, in celsius",
"labels": {
- "dimm": "2"
+ "id": "2"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Temperature of DIMM3 reported by BMC, in celsius",
"labels": {
- "dimm": "3"
+ "id": "3"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Temperature of DIMM4 reported by BMC, in celsius",
"labels": {
- "dimm": "4"
+ "id": "4"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Temperature of DIMM5 reported by BMC, in celsius",
"labels": {
- "dimm": "5"
+ "id": "5"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Temperature of DIMM6 reported by BMC, in celsius",
"labels": {
- "dimm": "6"
+ "id": "6"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Temperature of DIMM7 reported by BMC, in celsius",
"labels": {
- "dimm": "7"
+ "id": "7"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Temperature of DIMM8 reported by BMC, in celsius",
"labels": {
- "dimm": "8"
+ "id": "8"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -180,7 +180,7 @@
{
"description": "Temperature of DIMM9 reported by BMC, in celsius",
"labels": {
- "dimm": "9"
+ "id": "9"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -193,7 +193,7 @@
{
"description": "Temperature of DIMM10 reported by BMC, in celsius",
"labels": {
- "dimm": "10"
+ "id": "10"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -206,7 +206,7 @@
{
"description": "Temperature of DIMM11 reported by BMC, in celsius",
"labels": {
- "dimm": "11"
+ "id": "11"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -219,7 +219,7 @@
{
"description": "Temperature of DIMM12 reported by BMC, in celsius",
"labels": {
- "dimm": "12"
+ "id": "12"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -232,7 +232,7 @@
{
"description": "Temperature of DIMM13 reported by BMC, in celsius",
"labels": {
- "dimm": "13"
+ "id": "13"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -245,7 +245,7 @@
{
"description": "Temperature of DIMM14 reported by BMC, in celsius",
"labels": {
- "dimm": "14"
+ "id": "14"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -258,7 +258,7 @@
{
"description": "Temperature of DIMM15 reported by BMC, in celsius",
"labels": {
- "dimm": "15"
+ "id": "15"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -271,7 +271,7 @@
{
"description": "Temperature of DIMM16 reported by BMC, in celsius",
"labels": {
- "dimm": "16"
+ "id": "16"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -284,7 +284,7 @@
{
"description": "Temperature of DIMM17 reported by BMC, in celsius",
"labels": {
- "dimm": "17"
+ "id": "17"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -297,7 +297,7 @@
{
"description": "Temperature of DIMM18 reported by BMC, in celsius",
"labels": {
- "dimm": "18"
+ "id": "18"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -310,7 +310,7 @@
{
"description": "Temperature of DIMM19 reported by BMC, in celsius",
"labels": {
- "dimm": "19"
+ "id": "19"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -323,7 +323,7 @@
{
"description": "Temperature of DIMM20 reported by BMC, in celsius",
"labels": {
- "dimm": "20"
+ "id": "20"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -336,7 +336,7 @@
{
"description": "Temperature of DIMM21 reported by BMC, in celsius",
"labels": {
- "dimm": "21"
+ "id": "21"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -349,7 +349,7 @@
{
"description": "Temperature of DIMM22 reported by BMC, in celsius",
"labels": {
- "dimm": "22"
+ "id": "22"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -362,7 +362,7 @@
{
"description": "Temperature of DIMM23 reported by BMC, in celsius",
"labels": {
- "dimm": "23"
+ "id": "23"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -375,7 +375,7 @@
{
"description": "Temperature of DIMM24 reported by BMC, in celsius",
"labels": {
- "dimm": "24"
+ "id": "24"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -388,7 +388,7 @@
{
"description": "Temperature of DIMM25 reported by BMC, in celsius",
"labels": {
- "dimm": "25"
+ "id": "25"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -401,7 +401,7 @@
{
"description": "Temperature of DIMM26 reported by BMC, in celsius",
"labels": {
- "dimm": "26"
+ "id": "26"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -414,7 +414,7 @@
{
"description": "Temperature of DIMM27 reported by BMC, in celsius",
"labels": {
- "dimm": "27"
+ "id": "27"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -427,7 +427,7 @@
{
"description": "Temperature of DIMM28 reported by BMC, in celsius",
"labels": {
- "dimm": "28"
+ "id": "28"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -440,7 +440,7 @@
{
"description": "Temperature of DIMM29 reported by BMC, in celsius",
"labels": {
- "dimm": "29"
+ "id": "29"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -453,7 +453,7 @@
{
"description": "Temperature of DIMM30 reported by BMC, in celsius",
"labels": {
- "dimm": "30"
+ "id": "30"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -466,7 +466,7 @@
{
"description": "Temperature of DIMM31 reported by BMC, in celsius",
"labels": {
- "dimm": "31"
+ "id": "31"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -479,7 +479,7 @@
{
"description": "Temperature of DIMM32 reported by BMC, in celsius",
"labels": {
- "dimm": "32"
+ "id": "32"
},
"name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
@@ -502,7 +502,7 @@
{
"description": "Power consumption of Mem Proc1 reported by BMC, in watt",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_mem_power_watt",
"optional_period": 5000,
@@ -515,7 +515,7 @@
{
"description": "Power consumption of Mem Proc2 reported by BMC, in watt",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_mem_power_watt",
"optional_period": 5000,
@@ -528,9 +528,9 @@
{
"description": "Power consumption of PCIE Proc1 reported by BMC, in watt",
"labels": {
- "cpu": "1"
+ "id": "pcie_proc1"
},
- "name": "bmc_pcie_power_watt",
+ "name": "bmc_other_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -540,7 +540,10 @@
},
{
"description": "Power consumption of Mem Cache reported by BMC, in watt",
- "name": "bmc_memcache_power_watt",
+ "labels": {
+ "id": "mem_cache"
+ },
+ "name": "bmc_other_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -549,9 +552,9 @@
}
},
{
- "description": "Power consumption of Proc1 reported by BMC, in watt",
+ "description": "Power consumption of CPU 1 reported by BMC, in watt",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_power_watt",
"optional_period": 5000,
@@ -564,9 +567,9 @@
{
"description": "Voltage of CPU VDD reported by BMC, in volt",
"labels": {
- "voltage": "cpuvdd"
+ "id": "cpu_vdd"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -577,9 +580,9 @@
{
"description": "Current of CPU VDD reported by BMC, in amp",
"labels": {
- "current": "cpuvdd"
+ "id": "cpu_vdd"
},
- "name": "bmc_current_amp",
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -588,9 +591,9 @@
}
},
{
- "description": "Power consumption of Proc2 reported by BMC, in watt",
+ "description": "Power consumption of CPU 2 reported by BMC, in watt",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_power_watt",
"optional_period": 5000,
@@ -603,9 +606,9 @@
{
"description": "Power consumption of PCIE Proc2 reported by BMC, in watt",
"labels": {
- "cpu": "2"
+ "id": "pcie_proc2"
},
- "name": "bmc_pcie_power_watt",
+ "name": "bmc_other_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -626,7 +629,7 @@
{
"description": "Temperature of GPU 1 reported by BMC, in celsius",
"labels": {
- "gpu": "1"
+ "id": "1"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -639,7 +642,7 @@
{
"description": "Temperature of GPU 2 reported by BMC, in celsius",
"labels": {
- "gpu": "2"
+ "id": "2"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -652,7 +655,7 @@
{
"description": "Temperature of GPU 3 reported by BMC, in celsius",
"labels": {
- "gpu": "3"
+ "id": "3"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -665,7 +668,7 @@
{
"description": "Temperature of GPU 4 reported by BMC, in celsius",
"labels": {
- "gpu": "4"
+ "id": "4"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -678,7 +681,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -691,7 +694,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -704,7 +707,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -717,7 +720,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -730,9 +733,9 @@
{
"description": "Temperature of CPU 1 VDD reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "cpu_1_vdd"
},
- "name": "bmc_vdd_temp_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -743,9 +746,9 @@
{
"description": "Temperature of CPU 2 VDD reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "cpu_2_vdd"
},
- "name": "bmc_vdd_temp_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index 47bebd1678ce49980026697e8a236b92be62cdb0..87f0b196ea88981557fe3f0e08a0b65d6c55726d 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -13,8 +13,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -34,7 +34,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -47,7 +47,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -59,7 +59,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -71,7 +71,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -84,7 +84,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -97,7 +97,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -110,7 +110,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -123,7 +123,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -136,7 +136,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -149,7 +149,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -162,7 +162,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -175,7 +175,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -188,7 +188,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -201,7 +201,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -214,7 +214,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -227,7 +227,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -240,7 +240,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -253,7 +253,7 @@
{
"description": "Speed of Fan 8A reported by BMC, in rpm",
"labels": {
- "fan": "8a"
+ "id": "8a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -266,7 +266,7 @@
{
"description": "Speed of Fan 8B reported by BMC, in rpm",
"labels": {
- "fan": "8b"
+ "id": "8b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -279,7 +279,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -293,7 +293,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -306,7 +306,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_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 523b5f6de9bb551768de90267cbb114283857fda..41459527c1773127b00bc0b9b30875437a3435cd 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -13,8 +13,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -34,7 +34,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -47,7 +47,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -60,7 +60,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -74,7 +74,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -86,7 +86,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -98,7 +98,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -111,7 +111,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -124,7 +124,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -137,7 +137,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -150,7 +150,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -163,7 +163,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -176,7 +176,7 @@
{
"description": "Speed of Fan 7 reported by BMC, in rpm",
"labels": {
- "fan": "7"
+ "id": "7"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -189,7 +189,7 @@
{
"description": "Speed of Fan 8 reported by BMC, in rpm",
"labels": {
- "fan": "8"
+ "id": "8"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -202,7 +202,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -216,7 +216,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -230,7 +230,7 @@
{
"description": "Temperature of CPU 3 reported by BMC, in celsius",
"labels": {
- "cpu": "3"
+ "id": "3"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -244,7 +244,7 @@
{
"description": "Temperature of CPU 4 reported by BMC, in celsius",
"labels": {
- "cpu": "4"
+ "id": "4"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -257,7 +257,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_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 4d660ebe6bba05aa7e08561489840bc977f04647..0465dfffb7a19fd3f13113e37fdde934666a8b6d 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -180,7 +180,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -193,7 +193,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -206,7 +206,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -219,7 +219,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -232,7 +232,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -245,7 +245,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -258,7 +258,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -270,7 +270,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -282,7 +282,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -296,7 +296,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 6b15cabbb0a110e5c2b93057b8075d948d6b8082..91bf0a3b6c4c40c9f950918b01965039800c597d 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -181,7 +181,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -194,7 +194,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_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 cb956784590407af783ee2d9ebf7bf197ad1728c..85aed7df55884a2cf4fecb57f3245827537ce37b 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -166,7 +166,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -178,7 +178,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -192,7 +192,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index ffd125c54d99d1627e0d3eb220ee38f3f16fff5d..e6d0414962c3798ba28e6d310691056d45d781dc 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -181,7 +181,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -195,7 +195,7 @@
{
"description": "Temperature of GPU 1 reported by BMC, in celsius",
"labels": {
- "gpu": "1"
+ "id": "1"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -209,7 +209,7 @@
{
"description": "Temperature of GPU 8 reported by BMC, in celsius",
"labels": {
- "gpu": "8"
+ "id": "8"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -222,7 +222,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index 076a7873f367b0a2250672748f4fedf4c9c3085d..e68bc73c5c4e95d3d12d8b5e808f1f262fa8c466 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -23,7 +23,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -35,7 +35,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -49,7 +49,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/lyon/clusters/gemini/gemini.json b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
index 6d1e7d146b687f4bc80bc877b9212830cdeac71f..ea237e42566a8e790bc6d337ab23685b9be85c1d 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/gemini.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
@@ -13,8 +13,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambient_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"source": {
"id": 97,
@@ -33,7 +33,7 @@
{
"description": "Power consumption of GPU 0 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "0"
+ "id": "0"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -45,7 +45,7 @@
{
"description": "Power consumption of GPU 1 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "1"
+ "id": "1"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -57,7 +57,7 @@
{
"description": "Power consumption of GPU 2 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "2"
+ "id": "2"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -69,7 +69,7 @@
{
"description": "Power consumption of GPU 3 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "3"
+ "id": "3"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -81,7 +81,7 @@
{
"description": "Power consumption of GPU 4 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "4"
+ "id": "4"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -93,7 +93,7 @@
{
"description": "Power consumption of GPU 5 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "5"
+ "id": "5"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -105,7 +105,7 @@
{
"description": "Power consumption of GPU 6 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "6"
+ "id": "6"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -117,7 +117,7 @@
{
"description": "Power consumption of GPU 7 reported by BMC, in watt by BMC, in watt",
"labels": {
- "gpu": "7"
+ "id": "7"
},
"name": "bmc_gpu_power_watt",
"period": 5000,
@@ -128,7 +128,7 @@
},
{
"description": "Airflow reported by BMC, in CFM",
- "name": "bmc_airflow_cfm",
+ "name": "bmc_other_airflow_cfm",
"period": 5000,
"source": {
"id": 2,
@@ -138,7 +138,7 @@
{
"description": "Speed of SYS fan 0_1 reported by BMC, in rpm",
"labels": {
- "fan": "01"
+ "id": "01"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -151,7 +151,7 @@
{
"description": "Speed of SYS fan 0_2 reported by BMC, in rpm",
"labels": {
- "fan": "02"
+ "id": "02"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -164,7 +164,7 @@
{
"description": "Speed of SYS fan 1_1 reported by BMC, in rpm",
"labels": {
- "fan": "11"
+ "id": "11"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -177,7 +177,7 @@
{
"description": "Speed of SYS fan 1_2 reported by BMC, in rpm",
"labels": {
- "fan": "12"
+ "id": "12"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -190,7 +190,7 @@
{
"description": "Speed of SYS fan 2_1 reported by BMC, in rpm",
"labels": {
- "fan": "21"
+ "id": "21"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -203,7 +203,7 @@
{
"description": "Speed of SYS fan 2_2 reported by BMC, in rpm",
"labels": {
- "fan": "22"
+ "id": "22"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -216,7 +216,7 @@
{
"description": "Speed of SYS fan 3_1 reported by BMC, in rpm",
"labels": {
- "fan": "31"
+ "id": "31"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -229,7 +229,7 @@
{
"description": "Speed of SYS fan 3_2 reported by BMC, in rpm",
"labels": {
- "fan": "32"
+ "id": "32"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -242,9 +242,9 @@
{
"description": "Power consumption of HSC0 reported by BMC, in watt",
"labels": {
- "hsc": "0"
+ "id": "hsc0"
},
- "name": "bmc_hsc_power_watt",
+ "name": "bmc_other_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -255,9 +255,9 @@
{
"description": "Power consumption of HSC1 reported by BMC, in watt",
"labels": {
- "hsc": "1"
+ "id": "hsc1"
},
- "name": "bmc_hsc_power_watt",
+ "name": "bmc_other_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -268,9 +268,9 @@
{
"description": "Power consumption of HSC2 reported by BMC, in watt",
"labels": {
- "hsc": "2"
+ "id": "hsc2"
},
- "name": "bmc_hsc_power_watt",
+ "name": "bmc_other_power_watt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -281,7 +281,7 @@
{
"description": "Power consumption of PSU1 reported by BMC, in watt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_power_watt",
"optional_period": 5000,
@@ -294,7 +294,7 @@
{
"description": "Power consumption of PSU2 reported by BMC, in watt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_power_watt",
"optional_period": 5000,
@@ -307,7 +307,7 @@
{
"description": "Power consumption of PSU3 reported by BMC, in watt",
"labels": {
- "psu": "3"
+ "id": "3"
},
"name": "bmc_psu_power_watt",
"optional_period": 5000,
@@ -320,7 +320,7 @@
{
"description": "Power consumption of PSU4 reported by BMC, in watt",
"labels": {
- "psu": "4"
+ "id": "4"
},
"name": "bmc_psu_power_watt",
"optional_period": 5000,
@@ -332,7 +332,10 @@
},
{
"description": "Temperature of BP0 reported by BMC, in celsius",
- "name": "bmc_temp_ambient_bp0_celsius",
+ "labels": {
+ "id": "bp0"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -342,7 +345,10 @@
},
{
"description": "Temperature of BP1 reported by BMC, in celsius",
- "name": "bmc_temp_ambient_bp1_celsius",
+ "labels": {
+ "id": "bp1"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -352,7 +358,10 @@
},
{
"description": "Temperature of PCI reported by BMC, in celsius",
- "name": "bmc_temp_ambient_pci_celsius",
+ "labels": {
+ "id": "pci"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -363,7 +372,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -376,7 +385,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -389,9 +398,9 @@
{
"description": "Temperature of DIMM_AB reported by BMC, in celsius",
"labels": {
- "dimm": "ab"
+ "id": "ab"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -402,9 +411,9 @@
{
"description": "Temperature of DIMM_CD reported by BMC, in celsius",
"labels": {
- "dimm": "cd"
+ "id": "cd"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -415,9 +424,9 @@
{
"description": "Temperature of DIMM_EF reported by BMC, in celsius",
"labels": {
- "dimm": "ef"
+ "id": "ef"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -428,9 +437,9 @@
{
"description": "Temperature of DIMM_GH reported by BMC, in celsius",
"labels": {
- "dimm": "gh"
+ "id": "gh"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -440,7 +449,10 @@
},
{
"description": "Temperature of EXPB reported by BMC, in celsius",
- "name": "bmc_temp_expb_celsius",
+ "labels": {
+ "id": "expb"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -451,7 +463,7 @@
{
"description": "Temperature of GPU0 reported by BMC, in celsius",
"labels": {
- "gpu": "0"
+ "id": "0"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -464,7 +476,7 @@
{
"description": "Temperature of GPU1 reported by BMC, in celsius",
"labels": {
- "gpu": "1"
+ "id": "1"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -477,7 +489,7 @@
{
"description": "Temperature of GPU2 reported by BMC, in celsius",
"labels": {
- "gpu": "2"
+ "id": "2"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -490,7 +502,7 @@
{
"description": "Temperature of GPU3 reported by BMC, in celsius",
"labels": {
- "gpu": "3"
+ "id": "3"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -503,7 +515,7 @@
{
"description": "Temperature of GPU4 reported by BMC, in celsius",
"labels": {
- "gpu": "4"
+ "id": "4"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -516,7 +528,7 @@
{
"description": "Temperature of GPU5 reported by BMC, in celsius",
"labels": {
- "gpu": "5"
+ "id": "5"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -529,7 +541,7 @@
{
"description": "Temperature of GPU6 reported by BMC, in celsius",
"labels": {
- "gpu": "6"
+ "id": "6"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -542,7 +554,7 @@
{
"description": "Temperature of GPU7 reported by BMC, in celsius",
"labels": {
- "gpu": "7"
+ "id": "7"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -555,9 +567,9 @@
{
"description": "Temperature of GPU B0 reported by BMC, in celsius",
"labels": {
- "id": "0"
+ "id": "gpub0"
},
- "name": "bmc_temp_gpub_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -568,9 +580,9 @@
{
"description": "Temperature of GPU B1 reported by BMC, in celsius",
"labels": {
- "id": "1"
+ "id": "gpub1"
},
- "name": "bmc_temp_gpub_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -580,7 +592,10 @@
},
{
"description": "Temperature of Inlet MB reported by BMC, in celsius",
- "name": "bmc_temp_inlet_mb_celsius",
+ "labels": {
+ "id": "inlet_mb"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -590,7 +605,10 @@
},
{
"description": "Temperature of OCP Mezz reported by BMC, in celsius",
- "name": "bmc_temp_ocp_mezz_celsius",
+ "labels": {
+ "id": "ocp_mezz"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -600,7 +618,10 @@
},
{
"description": "Temperature of Outlet reported by BMC, in celsius",
- "name": "bmc_temp_outlet_celsius",
+ "labels": {
+ "id": "outlet"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -610,7 +631,10 @@
},
{
"description": "Temperature of PCH reported by BMC, in celsius",
- "name": "bmc_temp_pch_celsius",
+ "labels": {
+ "id": "pch"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -620,7 +644,10 @@
},
{
"description": "Temperature of PDB reported by BMC, in celsius",
- "name": "bmc_temp_pdb_celsius",
+ "labels": {
+ "id": "pdb"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -630,7 +657,10 @@
},
{
"description": "Temperature of Raid Card reported by BMC, in celsius",
- "name": "bmc_temp_raidcard_celsius",
+ "labels": {
+ "id": "raidcard"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -641,9 +671,9 @@
{
"description": "Temperature of VR CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "vr_cpu1"
},
- "name": "bmc_cpu_temp_vr_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -654,9 +684,9 @@
{
"description": "Temperature of VR CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "vr_cpu2"
},
- "name": "bmc_cpu_temp_vr_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -667,9 +697,9 @@
{
"description": "Temperature of VR DIMM_AB reported by BMC, in celsius",
"labels": {
- "dimm": "ab"
+ "id": "vr_dimm_ab"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -680,9 +710,9 @@
{
"description": "Temperature of VR DIMM_CD reported by BMC, in celsius",
"labels": {
- "dimm": "cd"
+ "id": "vr_dimm_cd"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -693,9 +723,9 @@
{
"description": "Temperature of VR DIMM_EF reported by BMC, in celsius",
"labels": {
- "dimm": "ef"
+ "id": "vr_dimm_ef"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -706,9 +736,9 @@
{
"description": "Temperature of VR DIMM_GH reported by BMC, in celsius",
"labels": {
- "dimm": "gh"
+ "id": "vr_dimm_gh"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -719,9 +749,9 @@
{
"description": "Voltage of P12V reported by BMC, in volt",
"labels": {
- "voltage": "p12v"
+ "id": "p12v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -732,9 +762,9 @@
{
"description": "Voltage of P1V05 reported by BMC, in volt",
"labels": {
- "voltage": "p1v05"
+ "id": "p1v05"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -745,9 +775,9 @@
{
"description": "Voltage of P1V8_AUX reported by BMC, in volt",
"labels": {
- "voltage": "p1v8_aux"
+ "id": "p1v8_aux"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -758,9 +788,9 @@
{
"description": "Voltage of P3V3 reported by BMC, in volt",
"labels": {
- "voltage": "p3v3"
+ "id": "p3v3"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -771,9 +801,9 @@
{
"description": "Voltage of P3V3_AUX reported by BMC, in volt",
"labels": {
- "voltage": "p3v3_aux"
+ "id": "p3v3_aux"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -784,9 +814,9 @@
{
"description": "Voltage of P3V_BAT reported by BMC, in volt",
"labels": {
- "voltage": "p3v_bat"
+ "id": "p3v_bat"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -797,9 +827,9 @@
{
"description": "Voltage of P5V reported by BMC, in volt",
"labels": {
- "voltage": "p5v"
+ "id": "p5v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -810,9 +840,9 @@
{
"description": "Voltage of P5V_AUX reported by BMC, in volt",
"labels": {
- "voltage": "p5v_aux"
+ "id": "p5v_aux"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -823,9 +853,9 @@
{
"description": "Voltage of VR CPU1 reported by BMC, in volt",
"labels": {
- "voltage": "vr_cpu1"
+ "id": "vr_cpu1"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -836,9 +866,9 @@
{
"description": "Voltage of VR CPU2 reported by BMC, in volt",
"labels": {
- "voltage": "vr_cpu2"
+ "id": "vr_cpu2"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -849,9 +879,9 @@
{
"description": "Voltage of VR DIMM_AB reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimm_ab"
+ "id": "vr_dimm_ab"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -862,9 +892,9 @@
{
"description": "Voltage of VR DIMM_CD reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimm_cd"
+ "id": "vr_dimm_cd"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -875,9 +905,9 @@
{
"description": "Voltage of VR DIMM_EF reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimm_ef"
+ "id": "vr_dimm_ef"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -888,9 +918,9 @@
{
"description": "Voltage of VR DIMM_GH reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimm_gh"
+ "id": "vr_dimm_gh"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_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 3fc4079bcadfbe2d226ee2ac577f013d3149ca2c..98957cf7f2d48a9246ad7dcc8c24182e95175ef3 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/hercule.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"source": {
"id": 49,
@@ -13,11 +13,11 @@
}
},
{
- "description": "12V Standby voltage reported by BMC, in volt",
+ "description": "Voltage of 12V Standby reported by BMC, in volt",
"labels": {
- "voltage": "12vstandby"
+ "id": "12v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -26,11 +26,11 @@
}
},
{
- "description": "5V Standby voltage reported by BMC, in volt",
+ "description": "Voltage of 5V Standby reported by BMC, in volt",
"labels": {
- "voltage": "5vstandby"
+ "id": "5v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -39,11 +39,11 @@
}
},
{
- "description": "5V voltage reported by BMC, in volt",
+ "description": "Voltage of 5V reported by BMC, in volt",
"labels": {
- "voltage": "5v"
+ "id": "5v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -52,11 +52,11 @@
}
},
{
- "description": "3.3V Standby voltage reported by BMC, in volt",
+ "description": "Voltage of 3.3V Standby reported by BMC, in volt",
"labels": {
- "voltage": "3.3vstandby"
+ "id": "3.3v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -65,11 +65,11 @@
}
},
{
- "description": "3.3V voltage reported by BMC, in volt",
+ "description": "Voltage of 3.3V reported by BMC, in volt",
"labels": {
- "voltage": "3.3v"
+ "id": "3.3v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -79,7 +79,10 @@
},
{
"description": "Temperature of MEZZ1 reported by BMC, in celsius",
- "name": "bmc_temp_mezz1_celsius",
+ "labels": {
+ "id": "mezz1"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -90,7 +93,7 @@
{
"description": "Temperature of CPU1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -103,7 +106,7 @@
{
"description": "Temperature of CPU2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -116,9 +119,9 @@
{
"description": "Temperature of DIMM ZONE 1 reported by BMC, in celsius",
"labels": {
- "zone": "1"
+ "id": "dimm_zone_1"
},
- "name": "bmc_temp_dimmzone_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -129,9 +132,9 @@
{
"description": "Temperature of DIMM ZONE 2 reported by BMC, in celsius",
"labels": {
- "zone": "2"
+ "id": "dimm_zone_2"
},
- "name": "bmc_temp_dimmzone_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -141,7 +144,10 @@
},
{
"description": "Temperature of PCH reported by BMC, in celsius",
- "name": "bmc_temp_pch_celsius",
+ "labels": {
+ "id": "pch"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -152,9 +158,9 @@
{
"description": "Voltage of input reported by BMC, in volt",
"labels": {
- "voltage": "inputvoltage"
+ "id": "input"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -163,8 +169,11 @@
}
},
{
- "description": "Current of input reported by BMC, in ampere",
- "name": "bmc_current_inputcurrent_amp",
+ "description": "Current of input reported by BMC, in amp",
+ "labels": {
+ "id": "input"
+ },
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -175,7 +184,7 @@
{
"description": "Speed of fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "_1"
+ "id": "_1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -188,7 +197,7 @@
{
"description": "Speed of fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "_2"
+ "id": "_2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -201,7 +210,7 @@
{
"description": "Speed of fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "_3"
+ "id": "_3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -214,7 +223,7 @@
{
"description": "Speed of fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "_4"
+ "id": "_4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index cda1d5b6197ed9d3e1c6a4f864a39958b8b38d43..281c3770cd842f9abae62d92e28f56c45c5834b9 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -16,7 +16,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -29,7 +29,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -42,7 +42,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -55,7 +55,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -68,7 +68,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -81,7 +81,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -94,7 +94,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -107,7 +107,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -120,7 +120,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -133,7 +133,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -146,7 +146,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -160,7 +160,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index ea21962c202a6e082f918aff6843c1ad852e3b33..386fb0cea0445a0af155b1e4e501295b79b3b054 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -13,8 +13,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -34,7 +34,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -47,7 +47,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -59,7 +59,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -71,7 +71,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -84,7 +84,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -97,7 +97,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -110,7 +110,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -123,7 +123,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -136,7 +136,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -148,7 +148,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -160,7 +160,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -174,7 +174,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
index bebd504386ed408d2fc2be355d88e77d3f3eb2ab..f14cd8ed0b2745fba02931784b10009b51779d72 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
@@ -14,7 +14,7 @@
},
{
"description": "Front node ambient temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambient_celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"source": {
"id": 41,
@@ -33,7 +33,7 @@
{
"description": "Speed of BPB_FAN_1A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_1a"
+ "id": "bpb_fan_1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -46,7 +46,7 @@
{
"description": "Speed of BPB_FAN_1B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_1b"
+ "id": "bpb_fan_1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -59,7 +59,7 @@
{
"description": "Speed of BPB_FAN_2A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_2a"
+ "id": "bpb_fan_2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -72,7 +72,7 @@
{
"description": "Speed of BPB_FAN_2B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_2b"
+ "id": "bpb_fan_2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -85,7 +85,7 @@
{
"description": "Speed of BPB_FAN_3A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_3a"
+ "id": "bpb_fan_3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -98,7 +98,7 @@
{
"description": "Speed of BPB_FAN_3B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_3b"
+ "id": "bpb_fan_3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -111,7 +111,7 @@
{
"description": "Speed of BPB_FAN_4A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_4a"
+ "id": "bpb_fan_4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -124,7 +124,7 @@
{
"description": "Speed of BPB_FAN_4B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_4b"
+ "id": "bpb_fan_4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -137,7 +137,7 @@
{
"description": "Speed of BPB_FAN_5A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_5a"
+ "id": "bpb_fan_5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -150,7 +150,7 @@
{
"description": "Speed of BPB_FAN_5B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_5b"
+ "id": "bpb_fan_5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -163,7 +163,7 @@
{
"description": "Speed of BPB_FAN_6A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_6a"
+ "id": "bpb_fan_6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -176,7 +176,7 @@
{
"description": "Speed of BPB_FAN_6B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_6b"
+ "id": "bpb_fan_6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -189,7 +189,7 @@
{
"description": "Speed of BPB_FAN_7A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_7a"
+ "id": "bpb_fan_7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -202,7 +202,7 @@
{
"description": "Speed of BPB_FAN_7B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_7b"
+ "id": "bpb_fan_7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -215,7 +215,7 @@
{
"description": "Speed of BPB_FAN_8A reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_8a"
+ "id": "bpb_fan_8a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -228,7 +228,7 @@
{
"description": "Speed of BPB_FAN_8B reported by BMC, in rpm",
"labels": {
- "fan": "bpb_fan_8b"
+ "id": "bpb_fan_8b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -241,7 +241,7 @@
{
"description": "Power consumption of CPU 1 reported by BMC, in watt",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_power_watt",
"optional_period": 5000,
@@ -254,7 +254,7 @@
{
"description": "Power consumption of CPU 2 reported by BMC, in watt",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_power_watt",
"optional_period": 5000,
@@ -267,7 +267,7 @@
{
"description": "Temperature of CPU reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -280,7 +280,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -293,9 +293,9 @@
{
"description": "Temperature of DIMMG0 reported by BMC, in celsius",
"labels": {
- "dimm": "g0"
+ "id": "g0"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -306,9 +306,9 @@
{
"description": "Temperature of DIMMG1 reported by BMC, in celsius",
"labels": {
- "dimm": "g1"
+ "id": "g1"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -319,9 +319,9 @@
{
"description": "Temperature of DIMMG2 reported by BMC, in celsius",
"labels": {
- "dimm": "g2"
+ "id": "g2"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -332,9 +332,9 @@
{
"description": "Temperature of DIMMG3 reported by BMC, in celsius",
"labels": {
- "dimm": "g3"
+ "id": "g3"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -345,9 +345,9 @@
{
"description": "Temperature of CPU 1 DTS reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "cpu1_dts"
},
- "name": "bmc_cpudts_temp_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -358,9 +358,9 @@
{
"description": "Temperature of CPU 2 DTS reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "cpu2_dts"
},
- "name": "bmc_cpudts_temp_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -371,9 +371,9 @@
{
"description": "Temperature of HDD_TEMP_0 reported by BMC, in celsius",
"labels": {
- "hdd": "temp_0"
+ "id": "hdd_temp_0"
},
- "name": "bmc_temp_hdd_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -384,9 +384,9 @@
{
"description": "Temperature of HDD_TEMP_1 reported by BMC, in celsius",
"labels": {
- "hdd": "temp_1"
+ "id": "hdd_temp_1"
},
- "name": "bmc_temp_hdd_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -397,9 +397,9 @@
{
"description": "Temperature of MB_TEMP1 reported by BMC, in celsius",
"labels": {
- "temp": "1"
+ "id": "mb_temp1"
},
- "name": "bmc_temp_mb_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -410,9 +410,9 @@
{
"description": "Temperature of MB_TEMP2 reported by BMC, in celsius",
"labels": {
- "temp": "2"
+ "id": "mb_temp2"
},
- "name": "bmc_temp_mb_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -423,9 +423,9 @@
{
"description": "Temperature of PSU1_HOTSPOT reported by BMC, in celsius",
"labels": {
- "psu": "1"
+ "id": "psu1_hotspot"
},
- "name": "bmc_temp_psuhotspot_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -436,9 +436,9 @@
{
"description": "Voltage of P_0V8_VDD reported by BMC, in volt",
"labels": {
- "voltage": "p_0v8_vdd"
+ "id": "p_0v8_vdd"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -449,9 +449,9 @@
{
"description": "Voltage of P_12V reported by BMC, in volt",
"labels": {
- "voltage": "p_12v"
+ "id": "p_12v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -462,9 +462,9 @@
{
"description": "Voltage of P_12V_STBY reported by BMC, in volt",
"labels": {
- "voltage": "p_12v_stby"
+ "id": "p_12v_stby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -475,9 +475,9 @@
{
"description": "Voltage of P_1V15 reported by BMC, in volt",
"labels": {
- "voltage": "p_1v15"
+ "id": "p_1v15"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -488,9 +488,9 @@
{
"description": "Voltage of P_1V2_BMC reported by BMC, in volt",
"labels": {
- "voltage": "p_1v2_bmc"
+ "id": "p_1v2_bmc"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -501,9 +501,9 @@
{
"description": "Voltage of P_1V8_VDD reported by BMC, in volt",
"labels": {
- "voltage": "p_1v8_vdd"
+ "id": "p_1v8_vdd"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -514,9 +514,9 @@
{
"description": "Voltage of P_2V5_BMC_VPP reported by BMC, in volt",
"labels": {
- "voltage": "p_2v5_bmc_vpp"
+ "id": "p_2v5_bmc_vpp"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -527,9 +527,9 @@
{
"description": "Voltage of P_3V3 reported by BMC, in volt",
"labels": {
- "voltage": "p_3v3"
+ "id": "p_3v3"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -540,9 +540,9 @@
{
"description": "Voltage of P_3V3_C reported by BMC, in volt",
"labels": {
- "voltage": "p_3v3_c"
+ "id": "p_3v3_c"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -553,9 +553,9 @@
{
"description": "Voltage of P_5V reported by BMC, in volt",
"labels": {
- "voltage": "p_5v"
+ "id": "p_5v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -566,9 +566,9 @@
{
"description": "Voltage of P_VBAT reported by BMC, in volt",
"labels": {
- "voltage": "p_vbat"
+ "id": "p_vbat"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -579,9 +579,9 @@
{
"description": "Current of VR_P0_IOUT reported by BMC, in amp",
"labels": {
- "vr": "p0_iout"
+ "id": "vr_p0_iout"
},
- "name": "bmc_current_vr_amp",
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -592,9 +592,9 @@
{
"description": "Current of VR_P1_IOUT reported by BMC, in amp",
"labels": {
- "vr": "p1_iout"
+ "id": "vr_p1_iout"
},
- "name": "bmc_current_vr_amp",
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -605,9 +605,9 @@
{
"description": "Current of VR_DIMMG0_IOUT reported by BMC, in amp",
"labels": {
- "current": "vr_dimmg0_iout"
+ "id": "vr_dimmg0_iout"
},
- "name": "bmc_current_amp",
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -618,9 +618,9 @@
{
"description": "Current of VR_DIMMG1_IOUT reported by BMC, in amp",
"labels": {
- "current": "vr_dimmg1_iout"
+ "id": "vr_dimmg1_iout"
},
- "name": "bmc_current_amp",
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -631,9 +631,9 @@
{
"description": "Current of VR_DIMMG2_IOUT reported by BMC, in amp",
"labels": {
- "current": "vr_dimmg2_iout"
+ "id": "vr_dimmg2_iout"
},
- "name": "bmc_current_amp",
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -644,9 +644,9 @@
{
"description": "Current of VR_DIMMG3_IOUT reported by BMC, in amp",
"labels": {
- "current": "vr_dimmg3_iout"
+ "id": "vr_dimmg3_iout"
},
- "name": "bmc_current_amp",
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -657,9 +657,9 @@
{
"description": "Temperature of VR_P0_TEMP reported by BMC, in celsius",
"labels": {
- "vr": "p0"
+ "id": "vr_p0"
},
- "name": "bmc_temp_vr_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -670,9 +670,9 @@
{
"description": "Temperature of VR_P1_TEMP reported by BMC, in celsius",
"labels": {
- "vr": "p1"
+ "id": "vr_p1"
},
- "name": "bmc_temp_vr_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -683,9 +683,9 @@
{
"description": "Temperature of VR_DIMMG0_TEMP reported by BMC, in celsius",
"labels": {
- "dimm": "g0"
+ "id": "vr_dimmg0"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -696,9 +696,9 @@
{
"description": "Temperature of VR_DIMMG1_TEMP reported by BMC, in celsius",
"labels": {
- "dimm": "g1"
+ "id": "vr_dimmg1"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -709,9 +709,9 @@
{
"description": "Temperature of VR_DIMMG2_TEMP reported by BMC, in celsius",
"labels": {
- "dimm": "g2"
+ "id": "vr_dimmg2"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -722,9 +722,9 @@
{
"description": "Temperature of VR_DIMMG3_TEMP reported by BMC, in celsius",
"labels": {
- "dimm": "g3"
+ "id": "vr_dimmg3"
},
- "name": "bmc_temp_vr_dimm_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -735,9 +735,9 @@
{
"description": "Voltage of VR_DIMMG0_VIN reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg0_vin"
+ "id": "vr_dimmg0_vin"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -748,9 +748,9 @@
{
"description": "Voltage of VR_DIMMG1_VIN reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg1_vin"
+ "id": "vr_dimmg1_vin"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -761,9 +761,9 @@
{
"description": "Voltage of VR_DIMMG2_VIN reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg2_vin"
+ "id": "vr_dimmg2_vin"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -774,9 +774,9 @@
{
"description": "Voltage of VR_DIMMG3_VIN reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg3_vin"
+ "id": "vr_dimmg3_vin"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -787,9 +787,9 @@
{
"description": "Voltage of VR_P0_VOUT reported by BMC, in volt",
"labels": {
- "voltage": "vr_p0_vout"
+ "id": "vr_p0_vout"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -800,9 +800,9 @@
{
"description": "Voltage of VR_P1_VOUT reported by BMC, in volt",
"labels": {
- "voltage": "vr_p1_vout"
+ "id": "vr_p1_vout"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -813,9 +813,9 @@
{
"description": "Voltage of VR_DIMMG0_VOUT reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg0_vout"
+ "id": "vr_dimmg0_vout"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -826,9 +826,9 @@
{
"description": "Voltage of VR_DIMMG1_VOUT reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg1_vout"
+ "id": "vr_dimmg1_vout"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -839,9 +839,9 @@
{
"description": "Voltage of VR_DIMMG2_VOUT reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg2_vout"
+ "id": "vr_dimmg2_vout"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -852,9 +852,9 @@
{
"description": "Voltage of VR_DIMMG3_VOUT reported by BMC, in volt",
"labels": {
- "voltage": "vr_dimmg3_vout"
+ "id": "vr_dimmg3_vout"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index a7120163c88304a001c4750ddb301e4383ef6f57..924f7c2211673638e1ee189a779fe188009a0bbc 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -13,8 +13,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -34,7 +34,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -47,7 +47,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -59,7 +59,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -71,7 +71,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -84,7 +84,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -97,7 +97,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -110,7 +110,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -123,7 +123,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -136,7 +136,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -148,7 +148,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -160,7 +160,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -174,7 +174,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index 0c4df876e94b8bd729e64cf893fa2c3587241079..35814fe73ba6130d09a4ed7daa2cd6a1e57b695e 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Speed of Fan Ext R reported by BMC, in rpm",
"labels": {
- "fan": "extr"
+ "id": "extr"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -180,7 +180,7 @@
{
"description": "Speed of Fan Ext L reported by BMC, in rpm",
"labels": {
- "fan": "extl"
+ "id": "extl"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -193,7 +193,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -207,7 +207,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/graoully.json b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
index 86ccc3e8fda3f299d16dfa8d8893605e505273e3..7618d46eb57cab11da647508fb5efe44b3e8d667 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/graoully.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
@@ -12,8 +12,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -33,7 +33,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -46,7 +46,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -58,7 +58,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -70,7 +70,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -83,7 +83,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -96,7 +96,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -109,7 +109,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -122,7 +122,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -135,7 +135,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -148,7 +148,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -161,7 +161,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -174,7 +174,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -187,7 +187,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -200,7 +200,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -213,7 +213,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -226,7 +226,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -239,7 +239,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -251,7 +251,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -263,7 +263,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -277,7 +277,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/graphique/graphique.json b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
index 0c29100c21853f39ef7906edffeae5da833211ce..33673bea953267b18b6b2a9f852241a6ba3c59ea 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/graphique.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -166,7 +166,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -178,7 +178,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -192,7 +192,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/graphite/graphite.json b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
index dbfd0ae2fc187a73f26e0436e69acfae5fe43603..a6c2382f685ea00f36a5532952b1f00dc1365ce3 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/graphite.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -166,7 +166,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -178,7 +178,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -192,7 +192,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/grappe.json b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
index d9ab0f6da1aeeae18fe9ea0c846cd61cb4d10202..75e45c5ead4872a8f41448b0d78768f3d3c5d942 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/grappe.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -15,7 +15,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",
@@ -24,7 +24,7 @@
},
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -34,7 +34,7 @@
},
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "name": "bmc_psu_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -44,7 +44,7 @@
},
{
"description": "Current of PSU 1 reported by BMC, in amp",
- "name": "bmc_current_psu1_amp",
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -55,7 +55,7 @@
},
{
"description": "Current of PSU 2 reported by BMC, in amp",
- "name": "bmc_current_psu2_amp",
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -65,8 +65,8 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_power_node_watt_total",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
@@ -76,7 +76,7 @@
},
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -86,7 +86,7 @@
},
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan1b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -96,7 +96,7 @@
},
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -106,7 +106,7 @@
},
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan2b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -116,7 +116,7 @@
},
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -126,7 +126,7 @@
},
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan3b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -136,7 +136,7 @@
},
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -146,7 +146,7 @@
},
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan4b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -156,7 +156,7 @@
},
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -166,7 +166,7 @@
},
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan5b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -176,7 +176,7 @@
},
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -186,7 +186,7 @@
},
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan6b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -196,7 +196,7 @@
},
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -206,7 +206,7 @@
},
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan7b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -216,7 +216,7 @@
},
{
"description": "Speed of Fan 8A reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan8a_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -226,7 +226,7 @@
},
{
"description": "Speed of Fan 8B reported by BMC, in rpm",
- "name": "bmc_fanspeed_fan8b_rpm",
+ "name": "bmc_fan_speed_rpm",
"optional_period": 5000,
"period": 0,
"source": {
@@ -236,7 +236,7 @@
},
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -247,7 +247,7 @@
},
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -258,7 +258,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_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 326d0fd26676a0a74c3d9188aa4052226e1e8df1..dc52d70d7fc59c1d765f7edda031072139ea8db7 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"source": {
"id": 11,
@@ -15,9 +15,9 @@
{
"description": "Voltage of 12V Standby reported by BMC, in volt",
"labels": {
- "voltage": "12vstandby"
+ "id": "12v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -28,9 +28,9 @@
{
"description": "Voltage of 5V Standby reported by BMC, in volt",
"labels": {
- "voltage": "5vstandby"
+ "id": "5v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -41,9 +41,9 @@
{
"description": "Voltage of 5V reported by BMC, in volt",
"labels": {
- "voltage": "5v"
+ "id": "5v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -54,9 +54,9 @@
{
"description": "Voltage of 3.3V Standby reported by BMC, in volt",
"labels": {
- "voltage": "3.3vstandby"
+ "id": "3.3vstandby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -67,9 +67,9 @@
{
"description": "Voltage of 3.3V reported by BMC, in volt",
"labels": {
- "voltage": "3.3v"
+ "id": "3.3v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -80,7 +80,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -93,7 +93,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -106,9 +106,9 @@
{
"description": "Temperature of DIMM ZONE 1 reported by BMC, in celsius",
"labels": {
- "zone": "1"
+ "id": "dimm_zone_1"
},
- "name": "bmc_temp_dimmzone_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -119,9 +119,9 @@
{
"description": "Temperature of DIMM ZONE 2 reported by BMC, in celsius",
"labels": {
- "zone": "2"
+ "id": "dimm_zone_2"
},
- "name": "bmc_temp_dimmzone_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +131,10 @@
},
{
"description": "Temperature of PCH reported by BMC, in celsius",
- "name": "bmc_temp_pch_celsius",
+ "labels": {
+ "id": "pch"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -142,9 +145,9 @@
{
"description": "Voltage of Input reported by BMC, in volt",
"labels": {
- "voltage": "input"
+ "id": "input"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -153,8 +156,11 @@
}
},
{
- "description": "Input Current reported by BMC, in amp",
- "name": "bmc_current_input_amp",
+ "description": "Current of input reported by BMC, in amp",
+ "labels": {
+ "id": "input"
+ },
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -165,7 +171,7 @@
{
"description": "Speed of FAN 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -178,7 +184,7 @@
{
"description": "Speed of FAN 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -191,7 +197,7 @@
{
"description": "Speed of FAN 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -204,7 +210,7 @@
{
"description": "Speed of FAN 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index f7fe98cea378c159caf798cd9c1ee485ccb6ac22..7f34ad0ee713ad889cf8371b68677b15f61a8779 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -166,7 +166,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -178,7 +178,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -192,7 +192,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/grimani/grimani.json b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
index 59d649321f27244f1cb314b409b9d7c753bd68f9..3ba3e8845882a383b04d22976c7008b9023ef518 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/grimani.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -166,7 +166,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -178,7 +178,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -192,7 +192,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
index 8f18c69de10558579e2902546fade4b9bfb13df6..b620dfce09a00f286d56357a57e1367bc3545e8b 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
@@ -12,8 +12,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -33,7 +33,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -46,7 +46,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -58,7 +58,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -70,7 +70,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -83,7 +83,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -96,7 +96,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -109,7 +109,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -122,7 +122,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -135,7 +135,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -148,7 +148,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -161,7 +161,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -174,7 +174,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -187,7 +187,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -200,7 +200,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -213,7 +213,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -226,7 +226,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -239,7 +239,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -251,7 +251,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -263,7 +263,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -277,7 +277,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index eaa31e80315d1ac60235715391ff3a454db54f14..4accd48787bb4a5e8c901891b366b5390abc3c13 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -12,8 +12,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -33,7 +33,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -46,7 +46,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -58,7 +58,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -70,7 +70,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -83,7 +83,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -96,7 +96,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -109,7 +109,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -122,7 +122,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -135,7 +135,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -148,7 +148,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -161,7 +161,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -174,7 +174,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -187,7 +187,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -200,7 +200,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -213,7 +213,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -226,7 +226,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -239,7 +239,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -251,7 +251,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -263,7 +263,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -277,7 +277,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index d9526f8e57592e585cae8802adb38b0b01f9364b..501bc6483bd3edcde7f1a7f304f8a872daaa1d19 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -21,8 +21,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -42,7 +42,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -55,7 +55,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -67,7 +67,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -79,7 +79,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -92,7 +92,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -105,7 +105,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -118,7 +118,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -131,7 +131,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -144,7 +144,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -157,7 +157,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -170,7 +170,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -183,7 +183,7 @@
{
"description": "Speed of Fan 8A reported by BMC, in rpm",
"labels": {
- "fan": "8a"
+ "id": "8a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -196,7 +196,7 @@
{
"description": "Speed of Fan 8B reported by BMC, in rpm",
"labels": {
- "fan": "8b"
+ "id": "8b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -209,7 +209,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -222,7 +222,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
diff --git a/data/grid5000/sites/nancy/clusters/grouille/grouille.json b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
index 6421011a1c4403af2d70d4bfe1528c68840339c9..070c106b1a7b86bc66de05a3d61a8365eb1dfef7 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/grouille.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -181,7 +181,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -195,7 +195,7 @@
{
"description": "Temperature of GPU 1 reported by BMC, in celsius",
"labels": {
- "gpu": "1"
+ "id": "1"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -209,7 +209,7 @@
{
"description": "Temperature of GPU 2 reported by BMC, in celsius",
"labels": {
- "gpu": "2"
+ "id": "2"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -222,7 +222,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_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 034f347ab097322f9e7e74c7f434d0399e8b86a4..c0fa4e6828ac27b200be624352b99088f2e9047a 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5 reported by BMC, in rpm",
"labels": {
- "fan": "5"
+ "id": "5"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6 reported by BMC, in rpm",
"labels": {
- "fan": "6"
+ "id": "6"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -181,7 +181,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -195,7 +195,7 @@
{
"description": "Temperature of GPU 1 reported by BMC, in celsius",
"labels": {
- "gpu": "1"
+ "id": "1"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -209,7 +209,7 @@
{
"description": "Temperature of GPU 2 reported by BMC, in celsius",
"labels": {
- "gpu": "2"
+ "id": "2"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -223,7 +223,7 @@
{
"description": "Temperature of GPU 5 reported by BMC, in celsius",
"labels": {
- "gpu": "5"
+ "id": "5"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -237,7 +237,7 @@
{
"description": "Temperature of GPU 8 reported by BMC, in celsius",
"labels": {
- "gpu": "8"
+ "id": "8"
},
"name": "bmc_gpu_temp_celsius",
"optional_period": 5000,
@@ -250,7 +250,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_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 8f03c42f2d0baba5b9c18c37991683763e74e2f6..68aad26eaff159879705eb4c7eb13d2da06f1c56 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -180,7 +180,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -193,7 +193,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -207,7 +207,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nantes/clusters/econome/econome.json b/data/grid5000/sites/nantes/clusters/econome/econome.json
index ca87e817c8464c9a2ab6e109a0ededb962e89c4f..4135cb739b9bc6906e9753ec3730e37d0a25ee8a 100644
--- a/data/grid5000/sites/nantes/clusters/econome/econome.json
+++ b/data/grid5000/sites/nantes/clusters/econome/econome.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"source": {
"id": 11,
@@ -15,9 +15,9 @@
{
"description": "Voltage of 12V Standby reported by BMC, in volt",
"labels": {
- "voltage": "12vstandby"
+ "id": "12v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -28,9 +28,9 @@
{
"description": "Voltage of 5V Standby reported by BMC, in volt",
"labels": {
- "voltage": "5vstandby"
+ "id": "5v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -41,9 +41,9 @@
{
"description": "Voltage of 5V reported by BMC, in volt",
"labels": {
- "voltage": "5v"
+ "id": "5v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -54,9 +54,9 @@
{
"description": "Voltage of 3.3V Standby reported by BMC, in volt",
"labels": {
- "voltage": "3.3vstandby"
+ "id": "3.3v_standby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -67,9 +67,9 @@
{
"description": "Voltage of 3.3V reported by BMC, in volt",
"labels": {
- "voltage": "3.3v"
+ "id": "3.3v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -80,7 +80,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -93,7 +93,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -106,9 +106,9 @@
{
"description": "Temperature of DIMM ZONE 1 reported by BMC, in celsius",
"labels": {
- "zone": "1"
+ "id": "dimm_zone_1"
},
- "name": "bmc_temp_dimmzone_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -119,9 +119,9 @@
{
"description": "Temperature of DIMM ZONE 2 reported by BMC, in celsius",
"labels": {
- "zone": "2"
+ "id": "dimm_zone_2"
},
- "name": "bmc_temp_dimmzone_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -131,7 +131,10 @@
},
{
"description": "Temperature of PCH reported by BMC, in celsius",
- "name": "bmc_temp_pch_celsius",
+ "labels": {
+ "id": "pch"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -140,11 +143,11 @@
}
},
{
- "description": "Input voltage reported by BMC, in volt",
+ "description": "Voltage of input reported by BMC, in volt",
"labels": {
- "voltage": "input"
+ "id": "input"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -153,8 +156,11 @@
}
},
{
- "description": "Input current reported by BMC, in amp",
- "name": "bmc_current_input_amp",
+ "description": "Current of input reported by BMC, in amp",
+ "labels": {
+ "id": "input"
+ },
+ "name": "bmc_other_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -165,7 +171,7 @@
{
"description": "Speed of fan 1 reported by BMC, in rpm",
"labels": {
- "fan": "1"
+ "id": "1"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -178,7 +184,7 @@
{
"description": "Speed of fan 2 reported by BMC, in rpm",
"labels": {
- "fan": "2"
+ "id": "2"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -191,7 +197,7 @@
{
"description": "Speed of fan 3 reported by BMC, in rpm",
"labels": {
- "fan": "3"
+ "id": "3"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -204,7 +210,7 @@
{
"description": "Speed of fan 4 reported by BMC, in rpm",
"labels": {
- "fan": "4"
+ "id": "4"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index c71a4a107c5904f8f3eb2c8c01499ce252314c29..c6a10887f48747a56411a12e55d1e34632facf09 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -4,8 +4,8 @@
"kavlan": true,
"metrics": [
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -25,7 +25,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -38,7 +38,7 @@
{
"description": "Voltage of PSU 2 reported by BMC, in volt",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -51,7 +51,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -65,7 +65,7 @@
{
"description": "Current of PSU 2 reported by BMC, in amp",
"labels": {
- "psu": "2"
+ "id": "2"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -77,7 +77,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -89,7 +89,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -102,7 +102,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -115,7 +115,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -128,7 +128,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -141,7 +141,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -154,7 +154,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -167,7 +167,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -180,7 +180,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -193,7 +193,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -206,7 +206,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -219,7 +219,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -232,7 +232,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -245,7 +245,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -258,7 +258,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -270,7 +270,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -282,7 +282,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -296,7 +296,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
index 9f60295b844d2f63ce249de48f76f95e1a1e4e43..abc56ace1f4a173853388f6dc28c7b22f1e472b3 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
@@ -6,9 +6,9 @@
{
"description": "Voltage of PVCORE1 reported by BMC, in volt",
"labels": {
- "voltage": "pvcore1"
+ "id": "pvcore1"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -19,9 +19,9 @@
{
"description": "Voltage of PVNB CPU1 reported by BMC, in volt",
"labels": {
- "voltage": "pvnbcpu1"
+ "id": "pvnb_cpu1"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -32,9 +32,9 @@
{
"description": "Voltage of P1V5 DDR3 CPU1 reported by BMC, in volt",
"labels": {
- "voltage": "p1v5ddr3cpu1"
+ "id": "p1v5_ddr3_cpu1"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -45,9 +45,9 @@
{
"description": "Voltage of PVCORE2 reported by BMC, in volt",
"labels": {
- "voltage": "pvcore2"
+ "id": "pvcore2"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -58,9 +58,9 @@
{
"description": "Voltage of PVNB CPU2 reported by BMC, in volt",
"labels": {
- "voltage": "pvnbcpu2"
+ "id": "pvnb_cpu2"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -71,9 +71,9 @@
{
"description": "Voltage of P1V5 DDR3 CPU2 reported by BMC, in volt",
"labels": {
- "voltage": "p1v5ddr3cpu2"
+ "id": "p1v5_ddr3_cpu2"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -84,9 +84,9 @@
{
"description": "Voltage of P12V reported by BMC, in volt",
"labels": {
- "voltage": "p12v"
+ "id": "p12v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -97,9 +97,9 @@
{
"description": "Voltage of P5V reported by BMC, in volt",
"labels": {
- "voltage": "p5v"
+ "id": "p5v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -110,9 +110,9 @@
{
"description": "Voltage of P5V STBY reported by BMC, in volt",
"labels": {
- "voltage": "p5vstby"
+ "id": "p5v_stby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -123,9 +123,9 @@
{
"description": "Voltage of P3V3 reported by BMC, in volt",
"labels": {
- "voltage": "p3v3"
+ "id": "p3v3"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -136,9 +136,9 @@
{
"description": "Voltage of P3V3 STBY reported by BMC, in volt",
"labels": {
- "voltage": "p3v3stby"
+ "id": "p3v3_stby"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -149,9 +149,9 @@
{
"description": "Voltage of P1V1 SR5670 reported by BMC, in volt",
"labels": {
- "voltage": "p1v1sr5670"
+ "id": "p1v1_sr5670"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -162,7 +162,7 @@
{
"description": "Speed of PSU Fan 1 Inlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan1inlet"
+ "id": "psufan1inlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -175,7 +175,7 @@
{
"description": "Speed of PSU Fan 1 Outlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan1outlet"
+ "id": "psufan1outlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -188,7 +188,7 @@
{
"description": "Speed of PSU Fan 2 Inlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan2inlet"
+ "id": "psufan2inlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -201,7 +201,7 @@
{
"description": "Speed of PSU Fan 2 Outlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan2outlet"
+ "id": "psufan2outlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -214,7 +214,7 @@
{
"description": "Speed of PSU Fan 3 Inlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan3inlet"
+ "id": "psufan3inlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -227,7 +227,7 @@
{
"description": "Speed of PSU Fan 3 Outlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan3outlet"
+ "id": "psufan3outlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -240,7 +240,7 @@
{
"description": "Speed of PSU Fan 4 Inlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan4inlet"
+ "id": "psufan4inlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -253,7 +253,7 @@
{
"description": "Speed of PSU Fan 4 Outlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan4outlet"
+ "id": "psufan4outlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -266,7 +266,7 @@
{
"description": "Speed of PSU Fan 5 Inlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan5inlet"
+ "id": "psufan5inlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -279,7 +279,7 @@
{
"description": "Speed of PSU Fan 5 Outlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan5outlet"
+ "id": "psufan5outlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -292,7 +292,7 @@
{
"description": "Speed of PSU Fan 6 Inlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan6inlet"
+ "id": "psufan6inlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -305,7 +305,7 @@
{
"description": "Speed of PSU Fan 6 Outlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan6outlet"
+ "id": "psufan6outlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -318,7 +318,7 @@
{
"description": "Speed of PSU Fan 7 Inlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan7inlet"
+ "id": "psufan7inlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -331,7 +331,7 @@
{
"description": "Speed of PSU Fan 7 Outlet reported by BMC, in rpm",
"labels": {
- "fan": "psufan7outlet"
+ "id": "psufan7outlet"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -344,9 +344,9 @@
{
"description": "Temperature of CPU1 DIMM1 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm1"
+ "id": "cpu1dimm1"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -357,9 +357,9 @@
{
"description": "Temperature of CPU1 DIMM2 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm2"
+ "id": "cpu1dimm2"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -370,9 +370,9 @@
{
"description": "Temperature of CPU1 DIMM3 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm3"
+ "id": "cpu1dimm3"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -383,9 +383,9 @@
{
"description": "Temperature of CPU1 DIMM4 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm4"
+ "id": "cpu1dimm4"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -396,9 +396,9 @@
{
"description": "Temperature of CPU1 DIMM5 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm5"
+ "id": "cpu1dimm5"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -409,9 +409,9 @@
{
"description": "Temperature of CPU1 DIMM6 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm6"
+ "id": "cpu1dimm6"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -422,9 +422,9 @@
{
"description": "Temperature of CPU1 DIMM7 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm7"
+ "id": "cpu1dimm7"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -435,9 +435,9 @@
{
"description": "Temperature of CPU1 DIMM8 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm8"
+ "id": "cpu1dimm8"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -448,9 +448,9 @@
{
"description": "Temperature of CPU1 DIMM9 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm9"
+ "id": "cpu1dimm9"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -461,9 +461,9 @@
{
"description": "Temperature of CPU1 DIMM10 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm10"
+ "id": "cpu1dimm10"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -474,9 +474,9 @@
{
"description": "Temperature of CPU1 DIMM11 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm11"
+ "id": "cpu1dimm11"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -487,9 +487,9 @@
{
"description": "Temperature of CPU1 DIMM12 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu1dimm12"
+ "id": "cpu1dimm12"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -500,9 +500,9 @@
{
"description": "Temperature of CPU2 DIMM1 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm1"
+ "id": "cpu2dimm1"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -513,9 +513,9 @@
{
"description": "Temperature of CPU2 DIMM2 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm2"
+ "id": "cpu2dimm2"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -526,9 +526,9 @@
{
"description": "Temperature of CPU2 DIMM3 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm3"
+ "id": "cpu2dimm3"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -539,9 +539,9 @@
{
"description": "Temperature of CPU2 DIMM4 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm4"
+ "id": "cpu2dimm4"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -552,9 +552,9 @@
{
"description": "Temperature of CPU2 DIMM5 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm5"
+ "id": "cpu2dimm5"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -565,9 +565,9 @@
{
"description": "Temperature of CPU2 DIMM6 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm6"
+ "id": "cpu2dimm6"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -578,9 +578,9 @@
{
"description": "Temperature of CPU2 DIMM7 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm7"
+ "id": "cpu2dimm7"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -591,9 +591,9 @@
{
"description": "Temperature of CPU2 DIMM8 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm8"
+ "id": "cpu2dimm8"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -604,9 +604,9 @@
{
"description": "Temperature of CPU2 DIMM9 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm9"
+ "id": "cpu2dimm9"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -617,9 +617,9 @@
{
"description": "Temperature of CPU2 DIMM10 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm10"
+ "id": "cpu2dimm10"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -630,9 +630,9 @@
{
"description": "Temperature of CPU2 DIMM11 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm11"
+ "id": "cpu2dimm11"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -643,9 +643,9 @@
{
"description": "Temperature of CPU2 DIMM12 reported by BMC, in celsius",
"labels": {
- "dimm": "cpu2dimm12"
+ "id": "cpu2dimm12"
},
- "name": "bmc_temp_dimm_celsius",
+ "name": "bmc_dimm_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -655,7 +655,10 @@
},
{
"description": "Temperature of Inlet Ambient reported by BMC, in celsius",
- "name": "bmc_temp_inletambient_celsius",
+ "labels": {
+ "id": "inlet_ambient"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -666,7 +669,7 @@
{
"description": "Temperature of CPU1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -679,7 +682,7 @@
{
"description": "Temperature of CPU2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -691,7 +694,10 @@
},
{
"description": "Temperature of PCI Outlet reported by BMC, in celsius",
- "name": "bmc_temp_pcioutlet_celsius",
+ "labels": {
+ "id": "pci_outlet"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -701,7 +707,10 @@
},
{
"description": "Temperature of SR5670 Outlet reported by BMC, in celsius",
- "name": "bmc_temp_sr5670outlet_celsius",
+ "labels": {
+ "id": "sr5670_outlet"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -711,7 +720,10 @@
},
{
"description": "Temperature of Rear Board reported by BMC, in celsius",
- "name": "bmc_temp_rearboard_celsius",
+ "labels": {
+ "id": "rear_board"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -721,7 +733,10 @@
},
{
"description": "Temperature of PCI Mid reported by BMC, in celsius",
- "name": "bmc_temp_pcimid_celsius",
+ "labels": {
+ "id": "pci_mid"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -731,7 +746,10 @@
},
{
"description": "Temperature of PCI Inlet reported by BMC, in celsius",
- "name": "bmc_temp_pciinlet_celsius",
+ "labels": {
+ "id": "pci_inlet"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -741,7 +759,10 @@
},
{
"description": "Temperature of Rear Board2 reported by BMC, in celsius",
- "name": "bmc_temp_rearboard2_celsius",
+ "labels": {
+ "id": "rear_board2"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -751,7 +772,10 @@
},
{
"description": "Temperature of CPU Inlet reported by BMC, in celsius",
- "name": "bmc_temp_cpuinlet_celsius",
+ "labels": {
+ "id": "cpu_inlet"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -761,7 +785,10 @@
},
{
"description": "Temperature of PS Inlet Ambient reported by BMC, in celsius",
- "name": "bmc_temp_psinletambient_celsius",
+ "labels": {
+ "id": "ps_inlet_ambient"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -771,7 +798,10 @@
},
{
"description": "Temperature of IO Controller reported by BMC, in celsius",
- "name": "bmc_temp_iocontroller_celsius",
+ "labels": {
+ "id": "io_controller"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -781,7 +811,10 @@
},
{
"description": "Temperature of PCI16_RISER reported by BMC, in celsius",
- "name": "bmc_temp_pci16_riser_celsius",
+ "labels": {
+ "id": "pci16_riser"
+ },
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -791,7 +824,10 @@
},
{
"description": "Temperature of PCI4_RISER reported by BMC, in celsius",
- "name": "bmc_temp_pci4_riser_celsius",
+ "labels": {
+ "id": "pci4_riser"
+ },
+ "name": "bmc_other_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 31586562531d9cdf680affc5ae4b31710efa1c0e..6fca4caf61e3c12a1483ece655b89baa2237ce15 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -12,8 +12,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -33,7 +33,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -46,7 +46,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -58,7 +58,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -70,7 +70,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -83,7 +83,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -96,7 +96,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -109,7 +109,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -122,7 +122,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -135,7 +135,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -148,7 +148,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -161,7 +161,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -174,7 +174,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -187,7 +187,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -200,7 +200,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -213,7 +213,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -226,7 +226,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -239,7 +239,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -251,7 +251,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -263,7 +263,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -277,7 +277,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/rennes/clusters/paravance/paravance.json b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
index 017c3d1305b701aca2111ec8c7a2793458d82cb4..b57b18f56f0bcf23fe6f3ab597f4c73efd57bb1d 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/paravance.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
@@ -12,8 +12,8 @@
}
},
{
- "description": "Front node ambiant temperature reported by BMC, in celsius",
- "name": "bmc_temp_ambiant_celsius",
+ "description": "Front node ambient temperature reported by BMC, in celsius",
+ "name": "bmc_ambient_temp_celsius",
"period": 5000,
"scale_factor": 0.1,
"source": {
@@ -33,7 +33,7 @@
{
"description": "Voltage of PSU 1 reported by BMC, in volt",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_voltage_volt",
"optional_period": 5000,
@@ -46,7 +46,7 @@
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
- "psu": "1"
+ "id": "1"
},
"name": "bmc_psu_current_amp",
"optional_period": 5000,
@@ -58,7 +58,7 @@
}
},
{
- "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
"name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
@@ -70,7 +70,7 @@
{
"description": "Speed of Fan 1A reported by BMC, in rpm",
"labels": {
- "fan": "1a"
+ "id": "1a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -83,7 +83,7 @@
{
"description": "Speed of Fan 2A reported by BMC, in rpm",
"labels": {
- "fan": "2a"
+ "id": "2a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -96,7 +96,7 @@
{
"description": "Speed of Fan 3A reported by BMC, in rpm",
"labels": {
- "fan": "3a"
+ "id": "3a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -109,7 +109,7 @@
{
"description": "Speed of Fan 4A reported by BMC, in rpm",
"labels": {
- "fan": "4a"
+ "id": "4a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -122,7 +122,7 @@
{
"description": "Speed of Fan 5A reported by BMC, in rpm",
"labels": {
- "fan": "5a"
+ "id": "5a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -135,7 +135,7 @@
{
"description": "Speed of Fan 6A reported by BMC, in rpm",
"labels": {
- "fan": "6a"
+ "id": "6a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -148,7 +148,7 @@
{
"description": "Speed of Fan 7A reported by BMC, in rpm",
"labels": {
- "fan": "7a"
+ "id": "7a"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -161,7 +161,7 @@
{
"description": "Speed of Fan 1B reported by BMC, in rpm",
"labels": {
- "fan": "1b"
+ "id": "1b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -174,7 +174,7 @@
{
"description": "Speed of Fan 2B reported by BMC, in rpm",
"labels": {
- "fan": "2b"
+ "id": "2b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -187,7 +187,7 @@
{
"description": "Speed of Fan 3B reported by BMC, in rpm",
"labels": {
- "fan": "3b"
+ "id": "3b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -200,7 +200,7 @@
{
"description": "Speed of Fan 4B reported by BMC, in rpm",
"labels": {
- "fan": "4b"
+ "id": "4b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -213,7 +213,7 @@
{
"description": "Speed of Fan 5B reported by BMC, in rpm",
"labels": {
- "fan": "5b"
+ "id": "5b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -226,7 +226,7 @@
{
"description": "Speed of Fan 6B reported by BMC, in rpm",
"labels": {
- "fan": "6b"
+ "id": "6b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -239,7 +239,7 @@
{
"description": "Speed of Fan 7B reported by BMC, in rpm",
"labels": {
- "fan": "7b"
+ "id": "7b"
},
"name": "bmc_fan_speed_rpm",
"optional_period": 5000,
@@ -251,7 +251,7 @@
},
{
"description": "Temperature of exhausted air reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "name": "bmc_exhaust_temp_celsius",
"optional_period": 5000,
"period": 0,
"scale_factor": 0.1,
@@ -263,7 +263,7 @@
{
"description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -277,7 +277,7 @@
{
"description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index f99688baee6292122683cf02bf0f6e37ea66ef0c..0f2d2b7d7e5baadc9184b3e602652db3e9c36746 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -6,9 +6,9 @@
{
"description": "Voltage of PS 12V reported by BMC, in volt",
"labels": {
- "voltage": "ps12v"
+ "id": "ps_12v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -19,9 +19,9 @@
{
"description": "Voltage of PS 5V reported by BMC, in volt",
"labels": {
- "voltage": "ps5v"
+ "id": "ps_5v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -32,9 +32,9 @@
{
"description": "Temperature of MLB TEMP 2 reported by BMC, in celsius",
"labels": {
- "id": "2"
+ "id": "mlb_2"
},
- "name": "bmc_temp_mlb_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -45,9 +45,9 @@
{
"description": "Temperature of MLB TEMP 3 reported by BMC, in celsius",
"labels": {
- "id": "3"
+ "id": "mlb_3"
},
- "name": "bmc_temp_mlb_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -56,9 +56,9 @@
}
},
{
- "description": "Temperature of Processor 1 reported by BMC, in celsius",
+ "description": "Temperature of CPU 1 reported by BMC, in celsius",
"labels": {
- "cpu": "1"
+ "id": "1"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -71,9 +71,9 @@
{
"description": "Temperature of MLB TEMP 1 reported by BMC, in celsius",
"labels": {
- "id": "1"
+ "id": "mlb_1"
},
- "name": "bmc_temp_mlb_celsius",
+ "name": "bmc_other_temp_celsius",
"optional_period": 5000,
"period": 0,
"source": {
@@ -82,9 +82,9 @@
}
},
{
- "description": "Temperature of Processor 2 reported by BMC, in celsius",
+ "description": "Temperature of CPU 2 reported by BMC, in celsius",
"labels": {
- "cpu": "2"
+ "id": "2"
},
"name": "bmc_cpu_temp_celsius",
"optional_period": 5000,
@@ -97,9 +97,9 @@
{
"description": "Voltage of STBY 3.3V reported by BMC, in volt",
"labels": {
- "voltage": "stby3.3v"
+ "id": "stby_3.3v"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -108,8 +108,8 @@
}
},
{
- "description": "PS Current reported by BMC, in amp",
- "name": "bmc_current_ps_amp",
+ "description": "Current of PSU reported by BMC, in amp",
+ "name": "bmc_psu_current_amp",
"optional_period": 5000,
"period": 0,
"source": {
@@ -120,9 +120,9 @@
{
"description": "Voltage of VCORE 1 reported by BMC, in volt",
"labels": {
- "voltage": "vcore1"
+ "id": "vcore_1"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_voltage_volt",
"optional_period": 5000,
"period": 0,
"source": {
@@ -133,9 +133,9 @@
{
"description": "Voltage of VCORE 2 reported by BMC, in volt",
"labels": {
- "voltage": "vcore2"
+ "id": "vcore_2"
},
- "name": "bmc_voltage_volt",
+ "name": "bmc_other_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 e45f74cb4191e037e1769aaa3c92beaefe1e29b7..35463f64407862c9a1be74287ce357cc662ee70b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac_metrics.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac_metrics.yaml
index 8b82b86cde07e6f77a9bd285aa752842cca076a3..720e18ac00b6a31feb4322939478a1dcb6e677b4 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac_metrics.yaml
@@ -1,7 +1,7 @@
---
metrics:
- - name: bmc_temp_ambient_celsius
+ - name: bmc_ambient_temp_celsius
description: >-
Front node ambient temperature reported by BMC, in celsius
period: 5000
@@ -16,18 +16,18 @@ metrics:
protocol: ipmisensor
id: 212 #System Power
- - name: bmc_cpudiode_temp_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of CPU Diode 1 reported by BMC, in celsius
- labels: {"cpu": "1"}
+ labels: {"id": "cpu_diode_1"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 2 #CPU Diode 1
- - name: bmc_cpudiode_temp_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of CPU Diode 2 reported by BMC, in celsius
- labels: {"cpu": "2"}
+ labels: {"id": "cpu_diode_2"}
period: 0
optional_period: 5000
source:
@@ -350,7 +350,7 @@ metrics:
- name: bmc_mem_power_watt
description: Power consumption of Mem Proc1 reported by BMC, in watt
- labels: {"cpu": "1"}
+ labels: {"mem": "proc1"}
period: 0
optional_period: 5000
source:
@@ -359,23 +359,24 @@ metrics:
- name: bmc_mem_power_watt
description: Power consumption of Mem Proc2 reported by BMC, in watt
- labels: {"cpu": "2"}
+ labels: {"mem": "proc2"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 105 #Mem Proc1 Pwr
- - name: bmc_pcie_power_watt
+ - name: bmc_other_power_watt
description: Power consumption of PCIE Proc1 reported by BMC, in watt
- labels: {"cpu": "1"}
+ labels: {"id": "pcie_proc1"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 106 #PCIE Proc0 Pwr
- - name: bmc_memcache_power_watt
+ - name: bmc_other_power_watt
+ labels: {"id": "mem_cache"}
description: Power consumption of Mem Cache reported by BMC, in watt
period: 0
optional_period: 5000
@@ -384,7 +385,7 @@ metrics:
id: 107 #Mem Cache Power
- name: bmc_cpu_power_watt
- description: Power consumption of Proc1 reported by BMC, in watt
+ description: Power consumption of CPU 1 reported by BMC, in watt
labels: {"cpu": "1"}
period: 0
optional_period: 5000
@@ -392,18 +393,18 @@ metrics:
protocol: ipmisensor
id: 108 #Proc0 Power
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of CPU VDD reported by BMC, in volt
- labels: {"voltage": "cpuvdd"}
+ labels: {"id": "cpu_vdd"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 207 #CPU VDD Volt
- - name: bmc_current_amp
+ - name: bmc_other_current_amp
description: Current of CPU VDD reported by BMC, in amp
- labels: {"current": "cpuvdd"}
+ labels: {"id": "cpu_vdd"}
period: 0
optional_period: 5000
source:
@@ -411,7 +412,7 @@ metrics:
id: 208 #CPU VDD Curr
- name: bmc_cpu_power_watt
- description: Power consumption of Proc2 reported by BMC, in watt
+ description: Power consumption of CPU 2 reported by BMC, in watt
labels: {"cpu": "2"}
period: 0
optional_period: 5000
@@ -419,9 +420,9 @@ metrics:
protocol: ipmisensor
id: 210 #Proc1 Power
- - name: bmc_pcie_power_watt
+ - name: bmc_other_power_watt
description: Power consumption of PCIE Proc2 reported by BMC, in watt
- labels: {"cpu": "2"}
+ labels: {"id": "pcie_proc2"}
period: 0
optional_period: 5000
source:
@@ -508,18 +509,18 @@ metrics:
protocol: ipmisensor
id: 230 #Fan 4
- - name: bmc_vdd_temp_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of CPU 1 VDD reported by BMC, in celsius
- labels: {"cpu": "1"}
+ labels: {"id": "cpu_1_vdd"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 251 #CPU 1 VDD Temp
- - name: bmc_vdd_temp_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of CPU 2 VDD reported by BMC, in celsius
- labels: {"cpu": "2"}
+ labels: {"id": "cpu_2_vdd"}
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
index ad11f6538fd9502715ffe3b73dcb7a59fed970f3..8aa56665fae14e345da5601bce3f234212e275cd 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -41,7 +41,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -212,7 +212,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 ce7583685a434579a0b18d60c930cec60cd1fd48..698a405459c52357d81e45adb0fdd95a32b86258 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -181,7 +181,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 92d85576bc43adefc1d230fd0719e78287971823..d0f247b91bd2ebf2bb022b8877c16a56d1fbe005 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -195,7 +195,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 4f2f83b748c16fe5594035dd0c672d12ccb0a69d..292cca8551c4c614d3a347cbfa0240bdc7b3dc7f 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -143,7 +143,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 3092c41fb53460ae6da43a9edb94330e73dcbbba..a548a76dfc63195a7cd20680815e4c09519887d9 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -123,7 +123,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 ddcf104f06eb2b1c6c9f6c5b069cbf4457deaf72..ed3865b0fdde1dc4b429533631bc49056d753092 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -163,7 +163,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air reported by BMC, in celsius
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 c450fbdb111db198847f5276af21a6b56a4b038d..8e59be60431ee66e86866b6edce82966829592a7 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -20,7 +20,7 @@ metrics:
== System Board Pwr Consumption }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
index 2c591d5b9614f5ebab7167092c2c78d609d6d78d..210b89b2c9e94b3c73cb6ad7550f3c74cad538ca 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
@@ -1,9 +1,9 @@
---
metrics:
- - name: bmc_temp_ambient_celsius
+ - name: bmc_ambient_temp_celsius
description: >-
- Front node ambiant temperature reported by BMC, in celsius
+ Front node ambient temperature reported by BMC, in celsius
period: 5000
source:
protocol: ipmisensor
@@ -88,7 +88,7 @@ metrics:
protocol: ipmisensor
id: 90 # Power_GPGPU7
- - name: bmc_airflow_cfm
+ - name: bmc_other_airflow_cfm
description: Airflow reported by BMC, in CFM
period: 5000
source:
@@ -167,8 +167,8 @@ metrics:
protocol: ipmisensor
id: 25 # Fan_SYS3_2
- - name: bmc_hsc_power_watt
- labels: {"hsc": "0"}
+ - name: bmc_other_power_watt
+ labels: {"id": "hsc0"}
description: Power consumption of HSC0 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -176,8 +176,8 @@ metrics:
protocol: ipmisensor
id: 48 # HSC0 Input
- - name: bmc_hsc_power_watt
- labels: {"hsc": "1"}
+ - name: bmc_other_power_watt
+ labels: {"id": "hsc1"}
description: Power consumption of HSC1 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -185,8 +185,8 @@ metrics:
protocol: ipmisensor
id: 51 # HSC1 Input
- - name: bmc_hsc_power_watt
- labels: {"hsc": "2"}
+ - name: bmc_other_power_watt
+ labels: {"id": "hsc2"}
description: Power consumption of HSC2 reported by BMC, in watt
period: 0
optional_period: 5000
@@ -230,7 +230,8 @@ metrics:
protocol: ipmisensor
id: 80 # PSU4 Input
- - name: bmc_temp_ambient_bp0_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "bp0"}
description: Temperature of BP0 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -238,7 +239,8 @@ metrics:
protocol: ipmisensor
id: 95 # Temp_Ambient_BP0
- - name: bmc_temp_ambient_bp1_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "bp1"}
description: Temperature of BP1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -246,7 +248,8 @@ metrics:
protocol: ipmisensor
id: 96 # Temp_Ambient_BP1
- - name: bmc_temp_ambient_pci_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pci"}
description: Temperature of PCI reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -272,7 +275,7 @@ metrics:
protocol: ipmisensor
id: 100 # Temp_CPU1
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "ab"}
description: Temperature of DIMM_AB reported by BMC, in celsius
period: 0
@@ -281,7 +284,7 @@ metrics:
protocol: ipmisensor
id: 101 # Temp_DIMM_AB
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cd"}
description: Temperature of DIMM_CD reported by BMC, in celsius
period: 0
@@ -290,7 +293,7 @@ metrics:
protocol: ipmisensor
id: 102 # Temp_DIMM_CD
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "ef"}
description: Temperature of DIMM_EF reported by BMC, in celsius
period: 0
@@ -299,7 +302,7 @@ metrics:
protocol: ipmisensor
id: 103 # Temp_DIMM_EF
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "gh"}
description: Temperature of DIMM_GH reported by BMC, in celsius
period: 0
@@ -308,7 +311,8 @@ metrics:
protocol: ipmisensor
id: 104 # Temp_DIMM_GH
- - name: bmc_temp_expb_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "expb"}
description: Temperature of EXPB reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -388,8 +392,8 @@ metrics:
protocol: ipmisensor
id: 113 # Temp_GPGPU7
- - name: bmc_temp_gpub_celsius
- labels: {"id": "0"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "gpub0"}
description: Temperature of GPU B0 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -397,8 +401,8 @@ metrics:
protocol: ipmisensor
id: 114 # Temp_GPUB0
- - name: bmc_temp_gpub_celsius
- labels: {"id": "1"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "gpub1"}
description: Temperature of GPU B1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -406,7 +410,8 @@ metrics:
protocol: ipmisensor
id: 115 # Temp_GPUB1
- - name: bmc_temp_inlet_mb_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "inlet_mb"}
description: Temperature of Inlet MB reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -414,7 +419,8 @@ metrics:
protocol: ipmisensor
id: 116 # Temp_Inlet_MB
- - name: bmc_temp_ocp_mezz_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "ocp_mezz"}
description: Temperature of OCP Mezz reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -422,7 +428,8 @@ metrics:
protocol: ipmisensor
id: 117 # Temp_OCP_Mezz
- - name: bmc_temp_outlet_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "outlet"}
description: Temperature of Outlet reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -430,7 +437,8 @@ metrics:
protocol: ipmisensor
id: 118 # Temp_Outlet
- - name: bmc_temp_pch_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pch"}
description: Temperature of PCH reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -438,7 +446,8 @@ metrics:
protocol: ipmisensor
id: 119 # Temp_PCH
- - name: bmc_temp_pdb_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pdb"}
description: Temperature of PDB reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -446,7 +455,8 @@ metrics:
protocol: ipmisensor
id: 120 # Temp_PDB
- - name: bmc_temp_raidcard_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "raidcard"}
description: Temperature of Raid Card reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -454,8 +464,8 @@ metrics:
protocol: ipmisensor
id: 121 # Temp_RaidCard
- - name: bmc_cpu_temp_vr_celsius
- labels: {"cpu": "1"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "vr_cpu1"}
description: Temperature of VR CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -463,8 +473,8 @@ metrics:
protocol: ipmisensor
id: 122 # Temp_VR_CPU0
- - name: bmc_cpu_temp_vr_celsius
- labels: {"cpu": "2"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "vr_cpu2"}
description: Temperature of VR CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -472,8 +482,8 @@ metrics:
protocol: ipmisensor
id: 123 # Temp_VR_CPU1
- - name: bmc_temp_vr_dimm_celsius
- labels: {"dimm": "ab"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "vr_dimm_ab"}
description: Temperature of VR DIMM_AB reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -481,8 +491,8 @@ metrics:
protocol: ipmisensor
id: 124 # Temp_VR_DIMM_AB
- - name: bmc_temp_vr_dimm_celsius
- labels: {"dimm": "cd"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "vr_dimm_cd"}
description: Temperature of VR DIMM_CD reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -490,8 +500,8 @@ metrics:
protocol: ipmisensor
id: 125 # Temp_VR_DIMM_CD
- - name: bmc_temp_vr_dimm_celsius
- labels: {"dimm": "ef"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "vr_dimm_ef"}
description: Temperature of VR DIMM_EF reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -499,8 +509,8 @@ metrics:
protocol: ipmisensor
id: 126 # Temp_VR_DIMM_EF
- - name: bmc_temp_vr_dimm_celsius
- labels: {"dimm": "gh"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "vr_dimm_gh"}
description: Temperature of VR DIMM_GH reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -508,8 +518,8 @@ metrics:
protocol: ipmisensor
id: 127 # Temp_VR_DIMM_GH
- - name: bmc_voltage_volt
- labels: {"voltage": "p12v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p12v"}
description: Voltage of P12V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -517,8 +527,8 @@ metrics:
protocol: ipmisensor
id: 128 # Volt_P12V
- - name: bmc_voltage_volt
- labels: {"voltage": "p1v05"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p1v05"}
description: Voltage of P1V05 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -526,8 +536,8 @@ metrics:
protocol: ipmisensor
id: 129 # Volt_P1V05
- - name: bmc_voltage_volt
- labels: {"voltage": "p1v8_aux"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p1v8_aux"}
description: Voltage of P1V8_AUX reported by BMC, in volt
period: 0
optional_period: 5000
@@ -535,8 +545,8 @@ metrics:
protocol: ipmisensor
id: 130 # Volt_P1V8_AUX
- - name: bmc_voltage_volt
- labels: {"voltage": "p3v3"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p3v3"}
description: Voltage of P3V3 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -544,8 +554,8 @@ metrics:
protocol: ipmisensor
id: 131 # Volt_P3V3
- - name: bmc_voltage_volt
- labels: {"voltage": "p3v3_aux"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p3v3_aux"}
description: Voltage of P3V3_AUX reported by BMC, in volt
period: 0
optional_period: 5000
@@ -553,8 +563,8 @@ metrics:
protocol: ipmisensor
id: 132 # Volt_P3V3_AUX
- - name: bmc_voltage_volt
- labels: {"voltage": "p3v_bat"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p3v_bat"}
description: Voltage of P3V_BAT reported by BMC, in volt
period: 0
optional_period: 5000
@@ -562,8 +572,8 @@ metrics:
protocol: ipmisensor
id: 133 # Volt_P3V_BAT
- - name: bmc_voltage_volt
- labels: {"voltage": "p5v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p5v"}
description: Voltage of P5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -571,8 +581,8 @@ metrics:
protocol: ipmisensor
id: 134 # Volt_P5V
- - name: bmc_voltage_volt
- labels: {"voltage": "p5v_aux"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p5v_aux"}
description: Voltage of P5V_AUX reported by BMC, in volt
period: 0
optional_period: 5000
@@ -580,8 +590,8 @@ metrics:
protocol: ipmisensor
id: 135 # Volt_P5V_AUX
- - name: bmc_voltage_volt
- labels: {"voltage": "vr_cpu1"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "vr_cpu1"}
description: Voltage of VR CPU1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -589,8 +599,8 @@ metrics:
protocol: ipmisensor
id: 136 # Volt_VR_CPU0
- - name: bmc_voltage_volt
- labels: {"voltage": "vr_cpu2"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "vr_cpu2"}
description: Voltage of VR CPU2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -598,8 +608,8 @@ metrics:
protocol: ipmisensor
id: 137 # Volt_VR_CPU1
- - name: bmc_voltage_volt
- labels: {"voltage": "vr_dimm_ab"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "vr_dimm_ab"}
description: Voltage of VR DIMM_AB reported by BMC, in volt
period: 0
optional_period: 5000
@@ -607,8 +617,8 @@ metrics:
protocol: ipmisensor
id: 138 # Volt_VR_DIMM_AB
- - name: bmc_voltage_volt
- labels: {"voltage": "vr_dimm_cd"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "vr_dimm_cd"}
description: Voltage of VR DIMM_CD reported by BMC, in volt
period: 0
optional_period: 5000
@@ -616,8 +626,8 @@ metrics:
protocol: ipmisensor
id: 139 # Volt_VR_DIMM_CD
- - name: bmc_voltage_volt
- labels: {"voltage": "vr_dimm_ef"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "vr_dimm_ef"}
description: Voltage of VR DIMM_EF reported by BMC, in volt
period: 0
optional_period: 5000
@@ -625,8 +635,8 @@ metrics:
protocol: ipmisensor
id: 140 # Volt_VR_DIMM_EF
- - name: bmc_voltage_volt
- labels: {"voltage": "vr_dimm_gh"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "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 9716fd4b94c493281569bc376ecab6779f2706d4..d2f375e885e3845fdf3f3c307e4cb38bee83a225 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
@@ -8,59 +8,60 @@ metrics:
# source:
# protocol: wattmetre
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
source:
protocol: ipmisensor
id: 49 # Inlet Temp
- - name: bmc_voltage_volt
- labels: {"voltage": "12vstandby"}
- description: 12V Standby voltage reported by BMC, in volt
+ - name: bmc_other_voltage_volt
+ labels: {"id": "12v_standby"}
+ description: Voltage of 12V Standby reported by BMC, in volt
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 5 # 12V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "5vstandby"}
- description: 5V Standby voltage reported by BMC, in volt
+ - name: bmc_other_voltage_volt
+ labels: {"id": "5v_standby"}
+ description: Voltage of 5V Standby reported by BMC, in volt
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 6 # 5V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "5v"}
- description: 5V voltage reported by BMC, in volt
+ - name: bmc_other_voltage_volt
+ labels: {"id": "5v"}
+ description: Voltage of 5V reported by BMC, in volt
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 7 # 5V
- - name: bmc_voltage_volt
- labels: {"voltage": "3.3vstandby"}
- description: 3.3V Standby voltage reported by BMC, in volt
+ - name: bmc_other_voltage_volt
+ labels: {"id": "3.3v_standby"}
+ description: Voltage of 3.3V Standby reported by BMC, in volt
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 8 # 3.3V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "3.3v"}
- description: 3.3V voltage reported by BMC, in volt
+ - name: bmc_other_voltage_volt
+ labels: {"id": "3.3v"}
+ description: Voltage of 3.3V reported by BMC, in volt
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 9 # 3.3V
- - name: bmc_temp_mezz1_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "mezz1"}
description: Temperature of MEZZ1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -86,8 +87,8 @@ metrics:
protocol: ipmisensor
id: 13 # CPU2 Temp
- - name: bmc_temp_dimmzone_celsius
- labels: {"zone": "1"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "dimm_zone_1"}
description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -95,8 +96,8 @@ metrics:
protocol: ipmisensor
id: 14 # DIMM ZONE 1 Temp
- - name: bmc_temp_dimmzone_celsius
- labels: {"zone": "2"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "dimm_zone_2"}
description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -104,7 +105,8 @@ metrics:
protocol: ipmisensor
id: 15 # DIMM ZONE 2 Temp
- - name: bmc_temp_pch_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pch"}
description: Temperature of PCH reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -112,8 +114,8 @@ metrics:
protocol: ipmisensor
id: 18 # PCH Temp
- - name: bmc_voltage_volt
- labels: {"voltage": "inputvoltage"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "input"}
description: Voltage of input reported by BMC, in volt
period: 0
optional_period: 5000
@@ -121,8 +123,9 @@ metrics:
protocol: ipmisensor
id: 51 # Input Voltage
- - name: bmc_current_inputcurrent_amp
- description: Current of input reported by BMC, in ampere
+ - name: bmc_other_current_amp
+ labels: {"id": "input"}
+ description: Current of input reported by BMC, in amp
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 0f5c8fde4861e030212fb01c576fe4af6dbb1c8e..cde5f344dc33356727f6629fffeba369e338b7a1 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -48,7 +48,7 @@ metrics:
# Value is always 0
# - name: bmc_node_power_watthour_total
- # description: Cumulated power consumption of node reported by BMC, in watt
+ # description: Cumulated power consumption of node reported by BMC, in watt-hour
# period: 0
# optional_period: 5000
# source:
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index cc4b0ec3acace7b36a84e23976fef3b18596cda4..7db0ce37bc330e28162698d25d909b9468744715 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -64,7 +64,7 @@ metrics:
# 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -125,7 +125,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml
index e29833ba9a334ac0ad7bea8ce024e01c66bcd333..a6b6a66f7a698205a7e83e16ed5c591280ce38b9 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_metrics.yaml
@@ -1,7 +1,7 @@
---
metrics:
- - name: bmc_temp_ambient_celsius
+ - name: bmc_ambient_temp_celsius
description: >-
Front node ambient temperature reported by BMC, in celsius
period: 5000
@@ -196,7 +196,7 @@ metrics:
protocol: ipmisensor
id: 32 #CPU1_TEMP
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
description: Temperature of DIMMG0 reported by BMC, in celsius
labels: {"dimm": "g0"}
period: 0
@@ -205,7 +205,7 @@ metrics:
protocol: ipmisensor
id: 33 #DIMMG0_TEMP
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
description: Temperature of DIMMG1 reported by BMC, in celsius
labels: {"dimm": "g1"}
period: 0
@@ -214,7 +214,7 @@ metrics:
protocol: ipmisensor
id: 34 #DIMMG1_TEMP
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
description: Temperature of DIMMG2 reported by BMC, in celsius
labels: {"dimm": "g2"}
period: 0
@@ -223,7 +223,7 @@ metrics:
protocol: ipmisensor
id: 35 #DIMMG2_TEMP
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
description: Temperature of DIMMG3 reported by BMC, in celsius
labels: {"dimm": "g3"}
period: 0
@@ -232,360 +232,360 @@ metrics:
protocol: ipmisensor
id: 36 #DIMMG3_TEMP
- - name: bmc_cpudts_temp_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of CPU 1 DTS reported by BMC, in celsius
- labels: {"cpu": "1"}
+ labels: {"id": "cpu1_dts"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 37 #CPU0_DTS
- - name: bmc_cpudts_temp_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of CPU 2 DTS reported by BMC, in celsius
- labels: {"cpu": "2"}
+ labels: {"id": "cpu2_dts"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 38 #CPU1_DTS
- - name: bmc_temp_hdd_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of HDD_TEMP_0 reported by BMC, in celsius
- labels: {"hdd": "temp_0"}
+ labels: {"id": "hdd_temp_0"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 39 #HDD_TEMP_0
- - name: bmc_temp_hdd_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of HDD_TEMP_1 reported by BMC, in celsius
- labels: {"hdd": "temp_1"}
+ labels: {"id": "hdd_temp_1"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 40 #HDD_TEMP_1
- - name: bmc_temp_mb_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of MB_TEMP1 reported by BMC, in celsius
- labels: {"temp": "1"}
+ labels: {"id": "mb_temp1"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 42 #MB_TEMP1
- - name: bmc_temp_mb_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of MB_TEMP2 reported by BMC, in celsius
- labels: {"temp": "2"}
+ labels: {"id": "mb_temp2"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 43 #MB_TEMP2
- - name: bmc_temp_psuhotspot_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of PSU1_HOTSPOT reported by BMC, in celsius
- labels: {"psu": "1"}
+ labels: {"id": "psu1_hotspot"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 46 #PSU1_HOTSPOT
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_0V8_VDD reported by BMC, in volt
- labels: {"voltage": "p_0v8_vdd"}
+ labels: {"id": "p_0v8_vdd"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 48 #P_0V8_VDD
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_12V reported by BMC, in volt
- labels: {"voltage": "p_12v"}
+ labels: {"id": "p_12v"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 49 #P_12V
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_12V_STBY reported by BMC, in volt
- labels: {"voltage": "p_12v_stby"}
+ labels: {"id": "p_12v_stby"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 50 #P_12V_STBY
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_1V15 reported by BMC, in volt
- labels: {"voltage": "p_1v15"}
+ labels: {"id": "p_1v15"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 51 #P_1V15
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_1V2_BMC reported by BMC, in volt
- labels: {"voltage": "p_1v2_bmc"}
+ labels: {"id": "p_1v2_bmc"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 52 #P_1V2_BMC
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_1V8_VDD reported by BMC, in volt
- labels: {"voltage": "p_1v8_vdd"}
+ labels: {"id": "p_1v8_vdd"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 53 #P_1V8_VDD
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_2V5_BMC_VPP reported by BMC, in volt
- labels: {"voltage": "p_2v5_bmc_vpp"}
+ labels: {"id": "p_2v5_bmc_vpp"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 54 #P_2V5_BMC_VPP
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_3V3 reported by BMC, in volt
- labels: {"voltage": "p_3v3"}
+ labels: {"id": "p_3v3"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 55 #P_3V3
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_3V3_C reported by BMC, in volt
- labels: {"voltage": "p_3v3_c"}
+ labels: {"id": "p_3v3_c"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 56 #P_3V3_C
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_5V reported by BMC, in volt
- labels: {"voltage": "p_5v"}
+ labels: {"id": "p_5v"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 57 #P_5V
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of P_VBAT reported by BMC, in volt
- labels: {"voltage": "p_vbat"}
+ labels: {"id": "p_vbat"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 58 #P_VBAT
- - name: bmc_current_vr_amp
+ - name: bmc_other_current_amp
description: Current of VR_P0_IOUT reported by BMC, in amp
- labels: {"vr": "p0_iout"}
+ labels: {"id": "vr_p0_iout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 60 #VR_P0_IOUT
- - name: bmc_current_vr_amp
+ - name: bmc_other_current_amp
description: Current of VR_P1_IOUT reported by BMC, in amp
- labels: {"vr": "p1_iout"}
+ labels: {"id": "vr_p1_iout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 61 #VR_P1_IOUT
- - name: bmc_current_amp
+ - name: bmc_other_current_amp
description: Current of VR_DIMMG0_IOUT reported by BMC, in amp
- labels: {"current": "vr_dimmg0_iout"}
+ labels: {"id": "vr_dimmg0_iout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 62 #VR_DIMMG0_IOUT
- - name: bmc_current_amp
+ - name: bmc_other_current_amp
description: Current of VR_DIMMG1_IOUT reported by BMC, in amp
- labels: {"current": "vr_dimmg1_iout"}
+ labels: {"id": "vr_dimmg1_iout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 63 #VR_DIMMG1_IOUT
- - name: bmc_current_amp
+ - name: bmc_other_current_amp
description: Current of VR_DIMMG2_IOUT reported by BMC, in amp
- labels: {"current": "vr_dimmg2_iout"}
+ labels: {"id": "vr_dimmg2_iout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 64 #VR_DIMMG2_IOUT
- - name: bmc_current_amp
+ - name: bmc_other_current_amp
description: Current of VR_DIMMG3_IOUT reported by BMC, in amp
- labels: {"current": "vr_dimmg3_iout"}
+ labels: {"id": "vr_dimmg3_iout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 65 #VR_DIMMG3_IOUT
- - name: bmc_temp_vr_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of VR_P0_TEMP reported by BMC, in celsius
- labels: {"vr": "p0"}
+ labels: {"id": "vr_p0"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 66 #VR_P0_TEMP
- - name: bmc_temp_vr_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of VR_P1_TEMP reported by BMC, in celsius
- labels: {"vr": "p1"}
+ labels: {"id": "vr_p1"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 67 #VR_P1_TEMP
- - name: bmc_temp_vr_dimm_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of VR_DIMMG0_TEMP reported by BMC, in celsius
- labels: {"dimm": "g0"}
+ labels: {"id": "vr_dimmg0"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 68 #VR_DIMMG0_TEMP
- - name: bmc_temp_vr_dimm_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of VR_DIMMG1_TEMP reported by BMC, in celsius
- labels: {"dimm": "g1"}
+ labels: {"id": "vr_dimmg1"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 69 #VR_DIMMG1_TEMP
- - name: bmc_temp_vr_dimm_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of VR_DIMMG2_TEMP reported by BMC, in celsius
- labels: {"dimm": "g2"}
+ labels: {"id": "vr_dimmg2"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 70 #VR_DIMMG2_TEMP
- - name: bmc_temp_vr_dimm_celsius
+ - name: bmc_other_temp_celsius
description: Temperature of VR_DIMMG3_TEMP reported by BMC, in celsius
- labels: {"dimm": "g3"}
+ labels: {"id": "vr_dimmg3"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 71 #VR_DIMMG3_TEMP
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG0_VIN reported by BMC, in volt
- labels: {"voltage": "vr_dimmg0_vin"}
+ labels: {"id": "vr_dimmg0_vin"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 72 #VR_DIMMG0_VIN
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG1_VIN reported by BMC, in volt
- labels: {"voltage": "vr_dimmg1_vin"}
+ labels: {"id": "vr_dimmg1_vin"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 73 #VR_DIMMG1_VIN
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG2_VIN reported by BMC, in volt
- labels: {"voltage": "vr_dimmg2_vin"}
+ labels: {"id": "vr_dimmg2_vin"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 74 #VR_DIMMG2_VIN
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG3_VIN reported by BMC, in volt
- labels: {"voltage": "vr_dimmg3_vin"}
+ labels: {"id": "vr_dimmg3_vin"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 75 #VR_DIMMG3_VIN
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_P0_VOUT reported by BMC, in volt
- labels: {"voltage": "vr_p0_vout"}
+ labels: {"id": "vr_p0_vout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 76 #VR_P0_VOUT
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_P1_VOUT reported by BMC, in volt
- labels: {"voltage": "vr_p1_vout"}
+ labels: {"id": "vr_p1_vout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 77 #VR_P1_VOUT
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG0_VOUT reported by BMC, in volt
- labels: {"voltage": "vr_dimmg0_vout"}
+ labels: {"id": "vr_dimmg0_vout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 78 #VR_DIMMG0_VOUT
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG1_VOUT reported by BMC, in volt
- labels: {"voltage": "vr_dimmg1_vout"}
+ labels: {"id": "vr_dimmg1_vout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 79 #VR_DIMMG1_VOUT
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG2_VOUT reported by BMC, in volt
- labels: {"voltage": "vr_dimmg2_vout"}
+ labels: {"id": "vr_dimmg2_vout"}
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 80 #VR_DIMMG2_VOUT
- - name: bmc_voltage_volt
+ - name: bmc_other_voltage_volt
description: Voltage of VR_DIMMG3_VOUT reported by BMC, in volt
- labels: {"voltage": "vr_dimmg3_vout"}
+ labels: {"id": "vr_dimmg3_vout"}
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index cc4b0ec3acace7b36a84e23976fef3b18596cda4..7db0ce37bc330e28162698d25d909b9468744715 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -64,7 +64,7 @@ metrics:
# 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -125,7 +125,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 ec7e9752c72d472611e344c2ca3917f051f8f32b..4925c41deefff64c9929fa7e2094d8d55678e67e 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
index 57c47f54b355d4787fec3804d0eb01eace60a819..70b5257fb989587400a857e520ef1e11881a5878 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -41,7 +41,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -174,7 +174,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 3092c41fb53460ae6da43a9edb94330e73dcbbba..a548a76dfc63195a7cd20680815e4c09519887d9 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -123,7 +123,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 d3932497e84167cacb5372cc53f3fa7a9dbf4d11..f7cd18bbc5614ee97922e07494a99852d60d7965 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -123,7 +123,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe_metrics.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe_metrics.yaml
index 9c7a5ec12217836e8b6a3c2b415f075388b13b26..bf28702323ea90758917b07cf5e401eadc0d5c46 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe_metrics.yaml
@@ -1,22 +1,22 @@
---
metrics:
-- name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+- name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
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
description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -24,7 +24,7 @@ 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
description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -32,7 +32,7 @@ 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
description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -41,7 +41,7 @@ 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
description: Current of PSU 2 reported by BMC, in amp
period: 0
optional_period: 5000
@@ -50,15 +50,15 @@ 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
- description: Cumulated power consumption of node reported by BMC, in watt
+- name: bmc_node_power_watthour_total
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
protocol: 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
description: Speed of Fan 1A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -66,7 +66,7 @@ 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
description: Speed of Fan 1B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -74,7 +74,7 @@ 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
description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -82,7 +82,7 @@ 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
description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -90,7 +90,7 @@ 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
description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -98,7 +98,7 @@ 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
description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -106,7 +106,7 @@ 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
description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -114,7 +114,7 @@ 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
description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -122,7 +122,7 @@ 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
description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -130,7 +130,7 @@ 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
description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -138,7 +138,7 @@ 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
description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -146,7 +146,7 @@ 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
description: Speed of Fan 6B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -154,7 +154,7 @@ 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
description: Speed of Fan 7A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -162,7 +162,7 @@ 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
description: Speed of Fan 7B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -170,7 +170,7 @@ 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
description: Speed of Fan 8A reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -178,7 +178,7 @@ 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
description: Speed of Fan 8B reported by BMC, in rpm
period: 0
optional_period: 5000
@@ -186,7 +186,7 @@ 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
description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -195,7 +195,7 @@ 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
description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -204,7 +204,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_temp_exhaust_celsius
+- name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 93b274fbe5d283dc35bc8b5123835c2eb2d784b2..464b3fd0e9ccf82a65264cc4e45a93cd0690c087 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
@@ -1,15 +1,15 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
source:
protocol: ipmisensor
id: 11 # Inlet Temp
- - name: bmc_voltage_volt
- labels: {"voltage": "12vstandby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "12v_standby"}
description: Voltage of 12V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -17,8 +17,8 @@ metrics:
protocol: ipmisensor
id: 5 # 12V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "5vstandby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "5v_standby"}
description: Voltage of 5V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -26,8 +26,8 @@ metrics:
protocol: ipmisensor
id: 6 # 5V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "5v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "5v"}
description: Voltage of 5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -35,8 +35,8 @@ metrics:
protocol: ipmisensor
id: 7 # 5V
- - name: bmc_voltage_volt
- labels: {"voltage": "3.3vstandby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "3.3vstandby"}
description: Voltage of 3.3V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,8 +44,8 @@ metrics:
protocol: ipmisensor
id: 8 # 3.3V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "3.3v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "3.3v"}
description: Voltage of 3.3V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -71,8 +71,8 @@ metrics:
protocol: ipmisensor
id: 13 # CPU2 Temp
- - name: bmc_temp_dimmzone_celsius
- labels: {"zone": "1"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "dimm_zone_1"}
description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -80,8 +80,8 @@ metrics:
protocol: ipmisensor
id: 14 # DIMM ZONE 1 Temp
- - name: bmc_temp_dimmzone_celsius
- labels: {"zone": "2"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "dimm_zone_2"}
description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -89,7 +89,8 @@ metrics:
protocol: ipmisensor
id: 15 # DIMM ZONE 2 Temp
- - name: bmc_temp_pch_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pch"}
description: Temperature of PCH reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -97,8 +98,8 @@ metrics:
protocol: ipmisensor
id: 18 # PCH Temp
- - name: bmc_voltage_volt
- labels: {"voltage": "input"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "input"}
description: Voltage of Input reported by BMC, in volt
period: 0
optional_period: 5000
@@ -106,8 +107,9 @@ metrics:
protocol: ipmisensor
id: 16 # Input Voltage
- - name: bmc_current_input_amp
- description: Input Current reported by BMC, in amp
+ - name: bmc_other_current_amp
+ labels: {"id": "input"}
+ description: Current of input reported by BMC, in amp
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
index 3092c41fb53460ae6da43a9edb94330e73dcbbba..a548a76dfc63195a7cd20680815e4c09519887d9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -123,7 +123,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 3092c41fb53460ae6da43a9edb94330e73dcbbba..a548a76dfc63195a7cd20680815e4c09519887d9 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -123,7 +123,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 57c47f54b355d4787fec3804d0eb01eace60a819..70b5257fb989587400a857e520ef1e11881a5878 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -41,7 +41,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -174,7 +174,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 57c47f54b355d4787fec3804d0eb01eace60a819..70b5257fb989587400a857e520ef1e11881a5878 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -41,7 +41,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -174,7 +174,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 bd8783ebbfd0cf63b7006fe58ebef5730443f36d..2df7256aba9ded46b4fce7e4de9b041abbf64b9f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -41,7 +41,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -148,7 +148,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air reported by BMC, in celsius
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grouille/grouille_metrics.yaml b/input/grid5000/sites/nancy/clusters/grouille/grouille_metrics.yaml
index 602dc16ccb2b232de798288b6269f2ff89140b54..d8c618259eb3b13a6416ee89d75c4ccb5f5fb864 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/grouille_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/grouille_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -163,7 +163,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 3f254e2971c578fcdfe43c77cadd7f589b3bf5de..1f9d3c2cf0595cce86fbacdabf5cb2e9709142e4 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -183,7 +183,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.7
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 e45f74cb4191e037e1769aaa3c92beaefe1e29b7..35463f64407862c9a1be74287ce357cc662ee70b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml b/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
index 5a2175bb85e7b5c3992eb0ddcb0cde2e9ddbe63b..7cb938419190dfd5b72d2995f78bd949a6e8e26d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
@@ -1,15 +1,15 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
source:
protocol: ipmisensor
id: 11 # Inlet Temp
- - name: bmc_voltage_volt
- labels: {"voltage": "12vstandby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "12v_standby"}
description: Voltage of 12V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -17,8 +17,8 @@ metrics:
protocol: ipmisensor
id: 5 # 12V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "5vstandby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "5v_standby"}
description: Voltage of 5V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -26,8 +26,8 @@ metrics:
protocol: ipmisensor
id: 6 # 5V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "5v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "5v"}
description: Voltage of 5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -35,8 +35,8 @@ metrics:
protocol: ipmisensor
id: 7 # 5V
- - name: bmc_voltage_volt
- labels: {"voltage": "3.3vstandby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "3.3v_standby"}
description: Voltage of 3.3V Standby reported by BMC, in volt
period: 0
optional_period: 5000
@@ -44,8 +44,8 @@ metrics:
protocol: ipmisensor
id: 8 # 3.3V Standby
- - name: bmc_voltage_volt
- labels: {"voltage": "3.3v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "3.3v"}
description: Voltage of 3.3V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -71,8 +71,8 @@ metrics:
protocol: ipmisensor
id: 13 # CPU2 Temp
- - name: bmc_temp_dimmzone_celsius
- labels: {"zone": "1"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "dimm_zone_1"}
description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -80,8 +80,8 @@ metrics:
protocol: ipmisensor
id: 14 # DIMM ZONE 1 Temp
- - name: bmc_temp_dimmzone_celsius
- labels: {"zone": "2"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "dimm_zone_2"}
description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -89,7 +89,8 @@ metrics:
protocol: ipmisensor
id: 15 # DIMM ZONE 2 Temp
- - name: bmc_temp_pch_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pch"}
description: Temperature of PCH reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -97,17 +98,18 @@ metrics:
protocol: ipmisensor
id: 18 # PCH Temp
- - name: bmc_voltage_volt
- labels: {"voltage": "input"}
- description: Input voltage reported by BMC, in volt
+ - name: bmc_other_voltage_volt
+ labels: {"id": "input"}
+ description: Voltage of input reported by BMC, in volt
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 16 # Input Voltage
- - name: bmc_current_input_amp
- description: Input current reported by BMC, in amp
+ - name: bmc_other_current_amp
+ labels: {"id": "input"}
+ description: Current of input reported by BMC, in amp
period: 0
optional_period: 5000
source:
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
index 92d85576bc43adefc1d230fd0719e78287971823..d0f247b91bd2ebf2bb022b8877c16a56d1fbe005 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -62,7 +62,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -195,7 +195,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 4b311718a8acb3c88354b0337c2e256415415afd..0297fd10d5acd9c3c09e1d785f620d8ca2c81f58 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_voltage_volt
- labels: {"voltage": "pvcore1"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "pvcore1"}
description: Voltage of PVCORE1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -10,8 +10,8 @@ metrics:
protocol: ipmisensor
id: 2720 # PVCORE1
- - name: bmc_voltage_volt
- labels: {"voltage": "pvnbcpu1"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "pvnb_cpu1"}
description: Voltage of PVNB CPU1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -19,8 +19,8 @@ metrics:
protocol: ipmisensor
id: 2784 # PVNB CPU1
- - name: bmc_voltage_volt
- labels: {"voltage": "p1v5ddr3cpu1"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p1v5_ddr3_cpu1"}
description: Voltage of P1V5 DDR3 CPU1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -28,8 +28,8 @@ metrics:
protocol: ipmisensor
id: 2848 # P1V5 DDR3 CPU1
- - name: bmc_voltage_volt
- labels: {"voltage": "pvcore2"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "pvcore2"}
description: Voltage of PVCORE2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -37,8 +37,8 @@ metrics:
protocol: ipmisensor
id: 2912 # PVCORE2
- - name: bmc_voltage_volt
- labels: {"voltage": "pvnbcpu2"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "pvnb_cpu2"}
description: Voltage of PVNB CPU2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -46,8 +46,8 @@ metrics:
protocol: ipmisensor
id: 2976 # PVNB CPU2
- - name: bmc_voltage_volt
- labels: {"voltage": "p1v5ddr3cpu2"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p1v5_ddr3_cpu2"}
description: Voltage of P1V5 DDR3 CPU2 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -55,8 +55,8 @@ metrics:
protocol: ipmisensor
id: 3040 # P1V5 DDR3 CPU2
- - name: bmc_voltage_volt
- labels: {"voltage": "p12v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p12v"}
description: Voltage of P12V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -64,8 +64,8 @@ metrics:
protocol: ipmisensor
id: 3104 # P12V
- - name: bmc_voltage_volt
- labels: {"voltage": "p5v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p5v"}
description: Voltage of P5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -73,8 +73,8 @@ metrics:
protocol: ipmisensor
id: 3168 # P5V
- - name: bmc_voltage_volt
- labels: {"voltage": "p5vstby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p5v_stby"}
description: Voltage of P5V STBY reported by BMC, in volt
period: 0
optional_period: 5000
@@ -82,8 +82,8 @@ metrics:
protocol: ipmisensor
id: 3232 # P5V STBY
- - name: bmc_voltage_volt
- labels: {"voltage": "p3v3"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p3v3"}
description: Voltage of P3V3 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -91,8 +91,8 @@ metrics:
protocol: ipmisensor
id: 3296 # P3V3
- - name: bmc_voltage_volt
- labels: {"voltage": "p3v3stby"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p3v3_stby"}
description: Voltage of P3V3 STBY reported by BMC, in volt
period: 0
optional_period: 5000
@@ -100,8 +100,8 @@ metrics:
protocol: ipmisensor
id: 3360 # P3V3 STBY
- - name: bmc_voltage_volt
- labels: {"voltage": "p1v1sr5670"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "p1v1_sr5670"}
description: Voltage of P1V1 SR5670 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -235,7 +235,7 @@ metrics:
protocol: ipmisensor
id: 4704 # Fan7 Outlet
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm1"}
description: Temperature of CPU1 DIMM1 reported by BMC, in celsius
period: 0
@@ -244,7 +244,7 @@ metrics:
protocol: ipmisensor
id: 4816 # CPU1 DIMM1
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm2"}
description: Temperature of CPU1 DIMM2 reported by BMC, in celsius
period: 0
@@ -253,7 +253,7 @@ metrics:
protocol: ipmisensor
id: 4880 # CPU1 DIMM2
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm3"}
description: Temperature of CPU1 DIMM3 reported by BMC, in celsius
period: 0
@@ -262,7 +262,7 @@ metrics:
protocol: ipmisensor
id: 4944 # CPU1 DIMM3
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm4"}
description: Temperature of CPU1 DIMM4 reported by BMC, in celsius
period: 0
@@ -271,7 +271,7 @@ metrics:
protocol: ipmisensor
id: 5008 # CPU1 DIMM4
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm5"}
description: Temperature of CPU1 DIMM5 reported by BMC, in celsius
period: 0
@@ -280,7 +280,7 @@ metrics:
protocol: ipmisensor
id: 5072 # CPU1 DIMM5
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm6"}
description: Temperature of CPU1 DIMM6 reported by BMC, in celsius
period: 0
@@ -289,7 +289,7 @@ metrics:
protocol: ipmisensor
id: 5136 # CPU1 DIMM6
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm7"}
description: Temperature of CPU1 DIMM7 reported by BMC, in celsius
period: 0
@@ -298,7 +298,7 @@ metrics:
protocol: ipmisensor
id: 5200 # CPU1 DIMM7
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm8"}
description: Temperature of CPU1 DIMM8 reported by BMC, in celsius
period: 0
@@ -307,7 +307,7 @@ metrics:
protocol: ipmisensor
id: 5264 # CPU1 DIMM8
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm9"}
description: Temperature of CPU1 DIMM9 reported by BMC, in celsius
period: 0
@@ -316,7 +316,7 @@ metrics:
protocol: ipmisensor
id: 5328 # CPU1 DIMM9
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm10"}
description: Temperature of CPU1 DIMM10 reported by BMC, in celsius
period: 0
@@ -325,7 +325,7 @@ metrics:
protocol: ipmisensor
id: 5392 # CPU1 DIMM10
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm11"}
description: Temperature of CPU1 DIMM11 reported by BMC, in celsius
period: 0
@@ -334,7 +334,7 @@ metrics:
protocol: ipmisensor
id: 5456 # CPU1 DIMM11
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu1dimm12"}
description: Temperature of CPU1 DIMM12 reported by BMC, in celsius
period: 0
@@ -343,7 +343,7 @@ metrics:
protocol: ipmisensor
id: 5520 # CPU1 DIMM12
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm1"}
description: Temperature of CPU2 DIMM1 reported by BMC, in celsius
period: 0
@@ -352,7 +352,7 @@ metrics:
protocol: ipmisensor
id: 5584 # CPU2 DIMM1
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm2"}
description: Temperature of CPU2 DIMM2 reported by BMC, in celsius
period: 0
@@ -361,7 +361,7 @@ metrics:
protocol: ipmisensor
id: 5648 # CPU2 DIMM2
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm3"}
description: Temperature of CPU2 DIMM3 reported by BMC, in celsius
period: 0
@@ -370,7 +370,7 @@ metrics:
protocol: ipmisensor
id: 5712 # CPU2 DIMM3
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm4"}
description: Temperature of CPU2 DIMM4 reported by BMC, in celsius
period: 0
@@ -379,7 +379,7 @@ metrics:
protocol: ipmisensor
id: 5776 # CPU2 DIMM4
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm5"}
description: Temperature of CPU2 DIMM5 reported by BMC, in celsius
period: 0
@@ -388,7 +388,7 @@ metrics:
protocol: ipmisensor
id: 5840 # CPU2 DIMM5
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm6"}
description: Temperature of CPU2 DIMM6 reported by BMC, in celsius
period: 0
@@ -397,7 +397,7 @@ metrics:
protocol: ipmisensor
id: 5904 # CPU2 DIMM6
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm7"}
description: Temperature of CPU2 DIMM7 reported by BMC, in celsius
period: 0
@@ -406,7 +406,7 @@ metrics:
protocol: ipmisensor
id: 5968 # CPU2 DIMM7
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm8"}
description: Temperature of CPU2 DIMM8 reported by BMC, in celsius
period: 0
@@ -415,7 +415,7 @@ metrics:
protocol: ipmisensor
id: 6032 # CPU2 DIMM8
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm9"}
description: Temperature of CPU2 DIMM9 reported by BMC, in celsius
period: 0
@@ -424,7 +424,7 @@ metrics:
protocol: ipmisensor
id: 6096 # CPU2 DIMM9
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm10"}
description: Temperature of CPU2 DIMM10 reported by BMC, in celsius
period: 0
@@ -433,7 +433,7 @@ metrics:
protocol: ipmisensor
id: 6160 # CPU2 DIMM10
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm11"}
description: Temperature of CPU2 DIMM11 reported by BMC, in celsius
period: 0
@@ -442,7 +442,7 @@ metrics:
protocol: ipmisensor
id: 6224 # CPU2 DIMM11
- - name: bmc_temp_dimm_celsius
+ - name: bmc_dimm_temp_celsius
labels: {"dimm": "cpu2dimm12"}
description: Temperature of CPU2 DIMM12 reported by BMC, in celsius
period: 0
@@ -451,7 +451,8 @@ metrics:
protocol: ipmisensor
id: 6288 # CPU2 DIMM12
- - name: bmc_temp_inletambient_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "inlet_ambient"}
description: Temperature of Inlet Ambient reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -477,7 +478,8 @@ metrics:
protocol: ipmisensor
id: 6528 # CPU2
- - name: bmc_temp_pcioutlet_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pci_outlet"}
description: Temperature of PCI Outlet reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -485,7 +487,8 @@ metrics:
protocol: ipmisensor
id: 6592 # PCI Outlet
- - name: bmc_temp_sr5670outlet_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "sr5670_outlet"}
description: Temperature of SR5670 Outlet reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -493,7 +496,8 @@ metrics:
protocol: ipmisensor
id: 6656 # SR5670 Outlet
- - name: bmc_temp_rearboard_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "rear_board"}
description: Temperature of Rear Board reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -501,7 +505,8 @@ metrics:
protocol: ipmisensor
id: 6720 # Rear Board
- - name: bmc_temp_pcimid_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pci_mid"}
description: Temperature of PCI Mid reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -509,7 +514,8 @@ metrics:
protocol: ipmisensor
id: 6784 # PCI Mid
- - name: bmc_temp_pciinlet_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pci_inlet"}
description: Temperature of PCI Inlet reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -517,7 +523,8 @@ metrics:
protocol: ipmisensor
id: 6848 # PCI Inlet
- - name: bmc_temp_rearboard2_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "rear_board2"}
description: Temperature of Rear Board2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -525,7 +532,8 @@ metrics:
protocol: ipmisensor
id: 6912 # Rear Board2
- - name: bmc_temp_cpuinlet_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "cpu_inlet"}
description: Temperature of CPU Inlet reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -533,7 +541,8 @@ metrics:
protocol: ipmisensor
id: 6976 # CPU Inlet
- - name: bmc_temp_psinletambient_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "ps_inlet_ambient"}
description: Temperature of PS Inlet Ambient reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -541,7 +550,8 @@ metrics:
protocol: ipmisensor
id: 7040 # PS Inlet Ambient
- - name: bmc_temp_iocontroller_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "io_controller"}
description: Temperature of IO Controller reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -549,7 +559,8 @@ metrics:
protocol: ipmisensor
id: 7104 # IO Controller
- - name: bmc_temp_pci16_riser_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pci16_riser"}
description: Temperature of PCI16_RISER reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -557,7 +568,8 @@ metrics:
protocol: ipmisensor
id: 7168 # PCI16_RISER
- - name: bmc_temp_pci4_riser_celsius
+ - name: bmc_other_temp_celsius
+ labels: {"id": "pci4_riser"}
description: Temperature of PCI4_RISER 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 57c47f54b355d4787fec3804d0eb01eace60a819..70b5257fb989587400a857e520ef1e11881a5878 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -41,7 +41,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -174,7 +174,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air 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 57c47f54b355d4787fec3804d0eb01eace60a819..70b5257fb989587400a857e520ef1e11881a5878 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_temp_ambiant_celsius
- description: Front node ambiant temperature reported by BMC, in celsius
+ - name: bmc_ambient_temp_celsius
+ description: Front node ambient temperature reported by BMC, in celsius
period: 5000
scale_factor: 0.1
source:
@@ -41,7 +41,7 @@ metrics:
1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
- name: bmc_node_power_watthour_total
- description: Cumulated power consumption of node reported by BMC, in watt
+ description: Cumulated power consumption of node reported by BMC, in watt-hour
period: 0
optional_period: 5000
source:
@@ -174,7 +174,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
- - name: bmc_temp_exhaust_celsius
+ - name: bmc_exhaust_temp_celsius
description: Temperature of exhausted air reported by BMC, in celsius
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 8e8299b9f3caf8bbeb70c524754d28ce07e5ca60..a86f0affd710d3e3bdfb8c8a7761b6756bf89a7a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
@@ -1,8 +1,8 @@
---
metrics:
- - name: bmc_voltage_volt
- labels: {"voltage": "ps12v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "ps_12v"}
description: Voltage of PS 12V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -10,8 +10,8 @@ metrics:
protocol: ipmisensor
id: 14 # PS 12V
- - name: bmc_voltage_volt
- labels: {"voltage": "ps5v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "ps_5v"}
description: Voltage of PS 5V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -19,8 +19,8 @@ metrics:
protocol: ipmisensor
id: 15 # PS 5V
- - name: bmc_temp_mlb_celsius
- labels: {"id": "2"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "mlb_2"}
description: Temperature of MLB TEMP 2 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -28,8 +28,8 @@ metrics:
protocol: ipmisensor
id: 16 # MLB TEMP 2
- - name: bmc_temp_mlb_celsius
- labels: {"id": "3"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "mlb_3"}
description: Temperature of MLB TEMP 3 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -39,15 +39,15 @@ metrics:
- name: bmc_cpu_temp_celsius
labels: {"cpu": "1"}
- description: Temperature of Processor 1 reported by BMC, in celsius
+ description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 18 # Processor 1 Temp
- - name: bmc_temp_mlb_celsius
- labels: {"id": "1"}
+ - name: bmc_other_temp_celsius
+ labels: {"id": "mlb_1"}
description: Temperature of MLB TEMP 1 reported by BMC, in celsius
period: 0
optional_period: 5000
@@ -57,15 +57,15 @@ metrics:
- name: bmc_cpu_temp_celsius
labels: {"cpu": "2"}
- description: Temperature of Processor 2 reported by BMC, in celsius
+ description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 20 # Processor 2 Temp
- - name: bmc_voltage_volt
- labels: {"voltage": "stby3.3v"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "stby_3.3v"}
description: Voltage of STBY 3.3V reported by BMC, in volt
period: 0
optional_period: 5000
@@ -73,16 +73,16 @@ metrics:
protocol: ipmisensor
id: 21 # STBY 3.3V
- - name: bmc_current_ps_amp
- description: PS Current reported by BMC, in amp
+ - name: bmc_psu_current_amp
+ description: Current of PSU reported by BMC, in amp
period: 0
optional_period: 5000
source:
protocol: ipmisensor
id: 22 # PS Current
- - name: bmc_voltage_volt
- labels: {"voltage": "vcore1"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "vcore_1"}
description: Voltage of VCORE 1 reported by BMC, in volt
period: 0
optional_period: 5000
@@ -90,8 +90,8 @@ metrics:
protocol: ipmisensor
id: 26 # VCORE 1
- - name: bmc_voltage_volt
- labels: {"voltage": "vcore2"}
+ - name: bmc_other_voltage_volt
+ labels: {"id": "vcore_2"}
description: Voltage of VCORE 2 reported by BMC, in volt
period: 0
optional_period: 5000