diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 584794576b2ca028f73d463b8e3065936b09be1a..2815093cea3df03b8d540b81aea6c5dc0f1ee50b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -31,129 +31,173 @@
"description": "Front node ambiant temperature reported by BMC, in celsius",
"name": "bmc_temp_ambiant_celsius",
"period": 5000,
+ "scale_factor": 0.1,
"source": {
- "id": 23,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "description": "Power consumption of node reported by BMC, in watt",
+ "name": "bmc_power_node_watt",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Current of PSU 1 reported by BMC, in amp",
+ "name": "bmc_current_psu1_amp",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 155,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "description": "Current of PSU 2 reported by BMC, in amp",
+ "name": "bmc_current_psu2_amp",
+ "optional_period": 5000,
+ "period": 0,
+ "scale_factor": 0.1,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "name": "bmc_power_node_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 156,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 2A reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan2a_rpm",
+ "description": "Speed of Fan 2A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan2a_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 13,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 2B reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan2b_rpm",
+ "description": "Speed of Fan 2B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan2b_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 14,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 3A reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan3a_rpm",
+ "description": "Speed of Fan 3A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan3a_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 15,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 3B reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan3b_rpm",
+ "description": "Speed of Fan 3B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan3b_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 16,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 4A reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan4a_rpm",
+ "description": "Speed of Fan 4A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan4a_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 17,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 4B reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan4b_rpm",
+ "description": "Speed of Fan 4B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan4b_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 18,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 5A reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan5a_rpm",
+ "description": "Speed of Fan 5A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan5a_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 19,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 5B reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan5b_rpm",
+ "description": "Speed of Fan 5B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan5b_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 20,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 6A reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan6a_rpm",
+ "description": "Speed of Fan 6A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan6a_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 21,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 6B reported by BMC, in RPM",
- "name": "bmc_fanspeed_psufan6b_rpm",
+ "description": "Speed of Fan 6B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan6b_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Temperature of CPU 1 reported by BMC, in celsius",
+ "name": "bmc_temp_cpu1_celsius",
+ "optional_period": 5000,
+ "period": 0,
+ "scale_factor": 0.1,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Temperature of CPU 2 reported by BMC, in celsius",
+ "name": "bmc_temp_cpu2_celsius",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 22,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
+ "protocol": "snmp"
}
}
],
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index f050c1f8e9d29c501c1c8379fc725e6f9cc07d76..b2da00e8fd14bf35dee91d7ec93c25fe20e4b292 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -31,9 +31,10 @@
"description": "Front node ambiant temperature reported by BMC, in celsius",
"name": "bmc_temp_ambiant_celsius",
"period": 5000,
+ "scale_factor": 0.1,
"source": {
- "id": 20,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1",
+ "protocol": "snmp"
}
},
{
@@ -41,138 +42,142 @@
"name": "bmc_power_node_watt",
"period": 5000,
"source": {
- "id": 95,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+ "protocol": "snmp"
}
},
{
- "description": "Current of PSU 1 reported by BMC, in ampere",
- "name": "bmc_current_psu1_amp",
+ "description": "Voltage of PSU 1 reported by BMC, in volt",
+ "name": "bmc_voltage_psu1_volt",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 88,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Current of PSU 2 reported by BMC, in ampere",
- "name": "bmc_current_psu2_amp",
+ "description": "Voltage of PSU 2 reported by BMC, in volt",
+ "name": "bmc_voltage_psu2_volt",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 89,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
+ "protocol": "snmp"
}
},
{
- "description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "description": "Current of PSU 1 reported by BMC, in amp",
+ "name": "bmc_current_psu1_amp",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 90,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "name": "bmc_power_node_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 91,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Exhausted air temperature reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "description": "Speed of Fan 1 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan1_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 21,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "description": "Speed of Fan 2 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan2_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 22,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2",
+ "protocol": "snmp"
}
},
{
- "description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "description": "Speed of Fan 3 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan3_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 23,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan1_rpm",
+ "description": "Speed of Fan 4 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan4_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 14,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan2_rpm",
+ "description": "Speed of Fan 5 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan5_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 15,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan3_rpm",
+ "description": "Speed of Fan 6 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan6_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 16,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan4_rpm",
+ "description": "Temperature of exhausted air reported by BMC, in celsius",
+ "name": "bmc_temp_exhaust_celsius",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 17,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan5_rpm",
+ "description": "Temperature of CPU 1 reported by BMC, in celsius",
+ "name": "bmc_temp_cpu1_celsius",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 18,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan6_rpm",
+ "description": "Temperature of CPU 2 reported by BMC, in celsius",
+ "name": "bmc_temp_cpu2_celsius",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 19,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
+ "protocol": "snmp"
}
}
],
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index c486f39b7092db87cf3ce5e97259ed9bea614ebb..4f76d6ebfac3e054e0c4f2d90521e46515a638f0 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -31,148 +31,153 @@
"description": "Front node ambiant temperature reported by BMC, in celsius",
"name": "bmc_temp_ambiant_celsius",
"period": 5000,
+ "scale_factor": 0.1,
"source": {
- "id": 20,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Power consumption reported by BMC, in watt",
+ "description": "Power consumption of node reported by BMC, in watt",
"name": "bmc_power_node_watt",
"period": 5000,
"source": {
- "id": 95,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+ "protocol": "snmp"
}
},
{
- "description": "Current of PSU 1 reported by BMC, in ampere",
- "name": "bmc_current_psu1_amp",
+ "description": "Voltage of PSU 1 reported by BMC, in volt",
+ "name": "bmc_voltage_psu1_volt",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 88,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Current of PSU 2 reported by BMC, in ampere",
- "name": "bmc_current_psu2_amp",
+ "description": "Voltage of PSU 2 reported by BMC, in volt",
+ "name": "bmc_voltage_psu2_volt",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 89,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
+ "protocol": "snmp"
}
},
{
- "description": "Voltage of PSU 1 reported by BMC, in volt",
- "name": "bmc_voltage_psu1_volt",
+ "description": "Current of PSU 1 reported by BMC, in amp",
+ "name": "bmc_current_psu1_amp",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 90,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Voltage of PSU 2 reported by BMC, in volt",
- "name": "bmc_voltage_psu2_volt",
+ "description": "Cumulated power consumption of node reported by BMC, in watt",
+ "name": "bmc_power_node_watt_total",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 91,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Exhausted air temperature reported by BMC, in celsius",
- "name": "bmc_temp_exhaust_celsius",
+ "description": "Speed of Fan 1 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan1_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 21,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1",
+ "protocol": "snmp"
}
},
{
- "description": "Temperature of CPU 1 reported by BMC, in celsius",
- "name": "bmc_temp_cpu1_celsius",
+ "description": "Speed of Fan 2 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan2_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 22,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2",
+ "protocol": "snmp"
}
},
{
- "description": "Temperature of CPU 2 reported by BMC, in celsius",
- "name": "bmc_temp_cpu2_celsius",
+ "description": "Speed of Fan 3 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan3_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 23,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 1 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan1_rpm",
+ "description": "Speed of Fan 4 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan4_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 14,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 2 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan2_rpm",
+ "description": "Speed of Fan 5 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan5_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 15,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 3 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan3_rpm",
+ "description": "Speed of Fan 6 reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan6_rpm",
"optional_period": 5000,
"period": 0,
"source": {
- "id": 16,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 4 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan4_rpm",
+ "description": "Temperature of exhausted air reported by BMC, in celsius",
+ "name": "bmc_temp_exhaust_celsius",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 17,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 5 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan5_rpm",
+ "description": "Temperature of CPU 1 reported by BMC, in celsius",
+ "name": "bmc_temp_cpu1_celsius",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 18,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
+ "protocol": "snmp"
}
},
{
- "description": "Speed of PSU fan 6 reported by BMC, in rpm",
- "name": "bmc_fanspeed_psufan6_rpm",
+ "description": "Temperature of CPU 2 reported by BMC, in celsius",
+ "name": "bmc_temp_cpu2_celsius",
"optional_period": 5000,
"period": 0,
+ "scale_factor": 0.1,
"source": {
- "id": 19,
- "protocol": "ipmisensor"
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
+ "protocol": "snmp"
}
}
],
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 07ebc5ef301077eacddc40e2090c7227c556849b..07237e384294e38d36247d5965f1d70a9b223116 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -23,102 +23,138 @@ metrics:
- name: bmc_temp_ambiant_celsius
description: Front node ambiant temperature reported by BMC, in celsius
period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 23 #Inlet Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-- name: bmc_temp_cpu1_celsius
- description: Temperature of CPU 1 reported by BMC, in celsius
+- name: bmc_power_node_watt
+ description: Power consumption of node reported by BMC, in watt
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+
+- name: bmc_current_psu1_amp
+ description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 155 #Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_temp_cpu2_celsius
- description: Temperature of CPU 2 reported by BMC, in celsius
+- name: bmc_current_psu2_amp
+ description: Current of PSU 2 reported by BMC, in amp
+ period: 0
+ optional_period: 5000
+ scale_factor: 0.1
+ source:
+ 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
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 156 #Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_fanspeed_psufan2a_rpm
- description: Speed of PSU fan 2A reported by BMC, in RPM
+- name: bmc_fanspeed_fan2a_rpm
+ description: Speed of Fan 2A reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 13 #Fan2A
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_fanspeed_psufan2b_rpm
- description: Speed of PSU fan 2B reported by BMC, in RPM
+- name: bmc_fanspeed_fan2b_rpm
+ description: Speed of Fan 2B reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 14 #Fan2B
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_fanspeed_psufan3a_rpm
- description: Speed of PSU fan 3A reported by BMC, in RPM
+- name: bmc_fanspeed_fan3a_rpm
+ description: Speed of Fan 3A reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 15 #Fan3A
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_psufan3b_rpm
- description: Speed of PSU fan 3B reported by BMC, in RPM
+- name: bmc_fanspeed_fan3b_rpm
+ description: Speed of Fan 3B reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 16 #Fan3B
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_psufan4a_rpm
- description: Speed of PSU fan 4A reported by BMC, in RPM
+- name: bmc_fanspeed_fan4a_rpm
+ description: Speed of Fan 4A reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 17 #Fan4A
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_psufan4b_rpm
- description: Speed of PSU fan 4B reported by BMC, in RPM
+- name: bmc_fanspeed_fan4b_rpm
+ description: Speed of Fan 4B reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 18 #Fan4B
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_psufan5a_rpm
- description: Speed of PSU fan 5A reported by BMC, in RPM
+- name: bmc_fanspeed_fan5a_rpm
+ description: Speed of Fan 5A reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 19 #Fan5A
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-- name: bmc_fanspeed_psufan5b_rpm
- description: Speed of PSU fan 5B reported by BMC, in RPM
+- name: bmc_fanspeed_fan5b_rpm
+ description: Speed of Fan 5B reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 20 #Fan5B
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-- name: bmc_fanspeed_psufan6a_rpm
- description: Speed of PSU fan 6A reported by BMC, in RPM
+- name: bmc_fanspeed_fan6a_rpm
+ description: Speed of Fan 6A reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 21 #Fan6A
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-- name: bmc_fanspeed_psufan6b_rpm
- description: Speed of PSU fan 6B reported by BMC, in RPM
+- name: bmc_fanspeed_fan6b_rpm
+ description: Speed of Fan 6B reported by BMC, in rpm
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+- name: bmc_temp_cpu1_celsius
+ description: Temperature of CPU 1 reported by BMC, in celsius
+ period: 0
+ optional_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.2
+
+- name: bmc_temp_cpu2_celsius
+ description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 22 #Fan6B
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index 9b14c79c4cd2d55ef931a1cf522d937048b0e89d..6ac0613981c8ec507841a3f4b9452c206c84a6e4 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -22,118 +22,122 @@ metrics:
- name: bmc_temp_ambiant_celsius
description: Front node ambiant temperature reported by BMC, in celsius
period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 20 #Inlet Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
- name: bmc_power_node_watt
description: Power consumption of node reported by BMC, in watt
period: 5000
source:
- protocol: ipmisensor
- id: 95 #Pwr Consumption
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_current_psu1_amp
- description: Current of PSU 1 reported by BMC, in ampere
+- name: bmc_voltage_psu1_volt
+ description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 88 #Current 1
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu2_amp
- description: Current of PSU 2 reported by BMC, in ampere
+- name: bmc_voltage_psu2_volt
+ description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 89 #Current 2
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_voltage_psu1_volt
- description: Voltage of PSU 1 reported by BMC, in volt
+- name: bmc_current_psu1_amp
+ description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 90 #Voltage 1
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu2_volt
- description: Voltage of PSU 2 reported by BMC, in volt
+- name: bmc_power_node_watt_total
+ description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 91 #Voltage 2
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_temp_exhaust_celsius
- description: Exhausted air temperature reported by BMC, in celsius
+- name: bmc_fanspeed_fan1_rpm
+ description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 21 #Exhaust Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_temp_cpu1_celsius
- description: Temperature of CPU 1 reported by BMC, in celsius
+- name: bmc_fanspeed_fan2_rpm
+ description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 22 #Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_temp_cpu2_celsius
- description: Temperature of CPU 2 reported by BMC, in celsius
+- name: bmc_fanspeed_fan3_rpm
+ description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 23 #Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_psufan1_rpm
- description: Speed of PSU fan 1 reported by BMC, in rpm
+- name: bmc_fanspeed_fan4_rpm
+ description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 14 #Fan1
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_psufan2_rpm
- description: Speed of PSU fan 2 reported by BMC, in rpm
+- name: bmc_fanspeed_fan5_rpm
+ description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 15 #Fan2
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_psufan3_rpm
- description: Speed of PSU fan 3 reported by BMC, in rpm
+- name: bmc_fanspeed_fan6_rpm
+ description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 16 #Fan3
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_psufan4_rpm
- description: Speed of PSU fan 4 reported by BMC, in rpm
+- name: bmc_temp_exhaust_celsius
+ description: Temperature of exhausted air reported by BMC, in celsius
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 17 #Fan4
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_fanspeed_psufan5_rpm
- description: Speed of PSU fan 5 reported by BMC, in rpm
+- name: bmc_temp_cpu1_celsius
+ description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 18 #Fan5
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_fanspeed_psufan6_rpm
- description: Speed of PSU fan 6 reported by BMC, in rpm
+- name: bmc_temp_cpu2_celsius
+ description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 19 #Fan6
-
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index 1e6be9413878aed748649ae5b9acd187139d391a..ecdaeb7cc6e545caac5bfd7a4fd62b47d17249e6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -23,117 +23,122 @@ metrics:
- name: bmc_temp_ambiant_celsius
description: Front node ambiant temperature reported by BMC, in celsius
period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 20 #Inlet Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
- name: bmc_power_node_watt
- description: Power consumption reported by BMC, in watt
+ description: Power consumption of node reported by BMC, in watt
period: 5000
source:
- protocol: ipmisensor
- id: 95 #Pwr Consumption
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_current_psu1_amp
- description: Current of PSU 1 reported by BMC, in ampere
+- name: bmc_voltage_psu1_volt
+ description: Voltage of PSU 1 reported by BMC, in volt
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 88 #Current 1
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_current_psu2_amp
- description: Current of PSU 2 reported by BMC, in ampere
+- name: bmc_voltage_psu2_volt
+ description: Voltage of PSU 2 reported by BMC, in volt
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 89 #Current 2
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-- name: bmc_voltage_psu1_volt
- description: Voltage of PSU 1 reported by BMC, in volt
+- name: bmc_current_psu1_amp
+ description: Current of PSU 1 reported by BMC, in amp
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 90 #Voltage 1
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_voltage_psu2_volt
- description: Voltage of PSU 2 reported by BMC, in volt
+- name: bmc_power_node_watt_total
+ description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 91 #Voltage 2
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-- name: bmc_temp_exhaust_celsius
- description: Exhausted air temperature reported by BMC, in celsius
+- name: bmc_fanspeed_fan1_rpm
+ description: Speed of Fan 1 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 21 #Exhaust Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-- name: bmc_temp_cpu1_celsius
- description: Temperature of CPU 1 reported by BMC, in celsius
+- name: bmc_fanspeed_fan2_rpm
+ description: Speed of Fan 2 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 22 #Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-- name: bmc_temp_cpu2_celsius
- description: Temperature of CPU 2 reported by BMC, in celsius
+- name: bmc_fanspeed_fan3_rpm
+ description: Speed of Fan 3 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 23 #Temp
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-- name: bmc_fanspeed_psufan1_rpm
- description: Speed of PSU fan 1 reported by BMC, in rpm
+- name: bmc_fanspeed_fan4_rpm
+ description: Speed of Fan 4 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 14 #Fan1
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-- name: bmc_fanspeed_psufan2_rpm
- description: Speed of PSU fan 2 reported by BMC, in rpm
+- name: bmc_fanspeed_fan5_rpm
+ description: Speed of Fan 5 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 15 #Fan2
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-- name: bmc_fanspeed_psufan3_rpm
- description: Speed of PSU fan 3 reported by BMC, in rpm
+- name: bmc_fanspeed_fan6_rpm
+ description: Speed of Fan 6 reported by BMC, in rpm
period: 0
optional_period: 5000
source:
- protocol: ipmisensor
- id: 16 #Fan3
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-- name: bmc_fanspeed_psufan4_rpm
- description: Speed of PSU fan 4 reported by BMC, in rpm
+- name: bmc_temp_exhaust_celsius
+ description: Temperature of exhausted air reported by BMC, in celsius
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 17 #Fan4
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-- name: bmc_fanspeed_psufan5_rpm
- description: Speed of PSU fan 5 reported by BMC, in rpm
+- name: bmc_temp_cpu1_celsius
+ description: Temperature of CPU 1 reported by BMC, in celsius
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 18 #Fan5
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-- name: bmc_fanspeed_psufan6_rpm
- description: Speed of PSU fan 6 reported by BMC, in rpm
+- name: bmc_temp_cpu2_celsius
+ description: Temperature of CPU 2 reported by BMC, in celsius
period: 0
optional_period: 5000
+ scale_factor: 0.1
source:
- protocol: ipmisensor
- id: 19 #Fan6
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4