diff --git a/data/grid5000/sites/nancy/clusters/grappe/grappe.json b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
index f6da287f00b9220f3b2bfbb89097ad55507a4a8e..54f4e503451c0c44cb6d946d0b516976cb264a47 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/grappe.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
@@ -3,7 +3,292 @@
"exotic": false,
"kavlan": true,
"metrics": [
-
+ {
+ "description": "Front node ambiant temperature reported by BMC, in celsius",
+ "name": "bmc_temp_ambiant_celsius",
+ "period": 5000,
+ "scale_factor": 0.1,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "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": "Voltage of PSU 1 reported by BMC, in volt",
+ "name": "bmc_voltage_psu1_volt",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Voltage of PSU 2 reported by BMC, in volt",
+ "name": "bmc_voltage_psu2_volt",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
+ "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": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "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": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 1A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan1a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 1B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan1b_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 2A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan2a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 2B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan2b_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 3A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan3a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 3B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan3b_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 4A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan4a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 4B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan4b_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 5A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan5a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 5B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan5b_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": "Speed of Fan 6A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan6a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "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.12",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 7A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan7a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 7B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan7b_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 8A reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan8a_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Speed of Fan 8B reported by BMC, in rpm",
+ "name": "bmc_fanspeed_fan8b_rpm",
+ "optional_period": 5000,
+ "period": 0,
+ "source": {
+ "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16",
+ "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.1",
+ "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": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "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": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 1000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 1000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ }
],
"model": "Dell PowerEdge R640",
"queues": [
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
index 237a2a05423ac4abafbd90547f8e3730489bca4e..85646ca1f3bd30bee83dda2de46708718a23654c 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 4,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 4,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
index 2e20eeb354cac5dd00ff773dc4f872725a960992..4fa732d589467cdf42fe89e7e644fa3b8a5b0dbc 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 15,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 15,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
index b40c37c7eeb1f4937572e656c15f98f5d82789b2..47af027eca302e29a37c256e12ad7fc80458af45 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 16,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 16,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
index df60325d83da56633d5aada8f8483317fa8a25cd..582c3b7bcde12d060f7a79a65230136a851808c3 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 17,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 17,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
index 44aa45083c076296296a6e6a79362dde4cdc200c..de52db63792abfc8c9d6cf119979a588e2d7f3ee 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 18,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 18,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
index 62039ad863c2bb096e092be3a868f51f44275cf8..20b4a9215af8bf73644a425c211fae96ed15194e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 19,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 19,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
index 33e08cc8827f9a1baf80a5a24bdb857faf81e855..c07a5a86b4d6a01054ae65d6c16552e851845c39 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 20,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 20,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
index 76aee68829b622843826c1d5bb6dfec52879478e..af71dfdc8f8edfb7b194e4b500ee55b473b4b96b 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 21,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 22,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
index b6f12ec5e68261b13d4411cbdb3e1ae0b53c1d3b..10fb3a026e93c8386599df6d052147ba2eccd786 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 5,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 5,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
index 7392b4464504ec0e03f7ceef5ccdc64987d8b9b0..d0696faa421b68c63dfc01c60614e4c296b06d14 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 7,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 7,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
index 81aa34e6016d95ab3ea325563015fb5b342a4cbc..ee348e9627cb916764c5ec0b45f0757a02c14924 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 8,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 8,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
index fac63e2e750b3d5b19efa8d5f0d8e88a8dd6637c..e514c04e5d7d28deda8f8815fdd8e037441235ce 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 9,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 9,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
index e6bd459142a1c22cfa1c53facb5d8cc261767e13..913c8455a22876bf84b2c568a4d5f9ad6a417788 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 10,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 10,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
index be06d9b74774125dab747b7dd5499d2c6d229fbd..7197737981efafe8110d4c370a3b6eb0b1ec1ddc 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 11,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 11,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
index 3df7193a3aa3a8203637ff86bc3280fea866ee88..7759282fb6d4dc0f9a296dff4498dbf51b773d5a 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 12,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 12,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
index 22b724c95631d47be0f76915639b2cd6d0984787..b4f30cf16ca9ebd69791f2f53bdf6cc822bd237b 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
@@ -64,7 +64,7 @@
"ram_size": 103079215104
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "multiple"
},
"network_adapters": [
{
@@ -205,6 +205,28 @@
"version": "Gold 5218R"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 14,
+ "uid": "grappe-pdu1"
+ },
+ {
+ "port": 14,
+ "uid": "grappe-pdu2"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"software": {
"forced-deployment-timestamp": 202007300948,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 0f9ca66487e5ea0823d534958e9964c59f6a6a69..d12a5955c667a90d1601c900fe3aa9ba48787b2c 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -146,6 +146,26 @@
"snmp_pattern": "Ethernet1/%LINECARD%/%PORT%"
}
],
+ "metrics": [
+ {
+ "description": "Input byte counter for the network device port",
+ "name": "network_ifacein_bytes_total",
+ "period": 1000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "name": "network_ifaceout_bytes_total",
+ "period": 1000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+ "protocol": "snmp"
+ }
+ }
+ ],
"model": "Dell S5224F-ON",
"role": "production",
"site": "nancy",
diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json b/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
index d0633257845c24255a4a2b17a6eaad20e6aea9e9..e2edd7be59c26bd09104f63257cfed71b697bd03 100644
--- a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
+++ b/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
@@ -14,6 +14,22 @@
],
"model": "AP8653",
"ports": {
+ "10": "grappe-6",
+ "11": "grappe-7",
+ "12": "grappe-8",
+ "14": "grappe-9",
+ "15": "grappe-10",
+ "16": "grappe-11",
+ "17": "grappe-12",
+ "18": "grappe-13",
+ "19": "grappe-14",
+ "20": "grappe-15",
+ "21": "grappe-16",
+ "4": "grappe-1",
+ "5": "grappe-2",
+ "7": "grappe-3",
+ "8": "grappe-4",
+ "9": "grappe-5"
},
"sensors": [
{
diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json b/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
index 2e6f9e683d11aeeed1412b620d76858e25134963..ea4a039fb0be05527910a551baf3165b01667ced 100644
--- a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
+++ b/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
@@ -14,6 +14,22 @@
],
"model": "AP8653",
"ports": {
+ "10": "grappe-6",
+ "11": "grappe-7",
+ "12": "grappe-8",
+ "14": "grappe-9",
+ "15": "grappe-10",
+ "16": "grappe-11",
+ "17": "grappe-12",
+ "18": "grappe-13",
+ "19": "grappe-14",
+ "20": "grappe-15",
+ "22": "grappe-16",
+ "4": "grappe-1",
+ "5": "grappe-2",
+ "7": "grappe-3",
+ "8": "grappe-4",
+ "9": "grappe-5"
},
"sensors": [
{
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
index db738833d15876bf828c9ee5b4e01bec925a1b27..8ac0af2a3d20e05f19d6d008b56408d2665b70c2 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
@@ -60,3 +60,12 @@ nodes:
storage: HDD
#model: PERC H330 Mini
reservation: true
+ sensors:
+ power:
+ available: true
+ per_outlets: true
+ via:
+ api:
+ metric: power
+ www:
+ url: http://wattmetre.nancy.grid5000.fr/GetWatts-json.php
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe_metrics.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7abe4692dee9600efae68177c08cecea29997998
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe_metrics.yaml
@@ -0,0 +1,226 @@
+---
+metrics:
+
+- name: network_ifacein_bytes_total
+ description: Input byte counter for the network device port connected to the node
+ period: 1000
+ source:
+ protocol: network_equipment
+
+- name: network_ifaceout_bytes_total
+ description: Output byte counter for the network device port connected to the node
+ period: 1000
+ source:
+ protocol: network_equipment
+
+- name: bmc_temp_ambiant_celsius
+ description: Front node ambiant 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
+ 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
+ description: Voltage of PSU 1 reported by BMC, in volt
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+- name: bmc_voltage_psu2_volt
+ description: Voltage of PSU 2 reported by BMC, in volt
+ period: 0
+ optional_period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+- 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: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+
+- 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: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+- name: bmc_fanspeed_fan1a_rpm
+ description: Speed of Fan 1A 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.1
+
+- name: bmc_fanspeed_fan1b_rpm
+ description: Speed of Fan 1B 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.2
+
+- name: bmc_fanspeed_fan2a_rpm
+ description: Speed of Fan 2A 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.3
+
+- name: bmc_fanspeed_fan2b_rpm
+ description: Speed of Fan 2B 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.4
+
+- name: bmc_fanspeed_fan3a_rpm
+ description: Speed of Fan 3A 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.5
+
+- name: bmc_fanspeed_fan3b_rpm
+ description: Speed of Fan 3B 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.6
+
+- name: bmc_fanspeed_fan4a_rpm
+ description: Speed of Fan 4A 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.7
+
+- name: bmc_fanspeed_fan4b_rpm
+ description: Speed of Fan 4B 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.8
+
+- name: bmc_fanspeed_fan5a_rpm
+ description: Speed of Fan 5A 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.9
+
+- name: bmc_fanspeed_fan5b_rpm
+ description: Speed of Fan 5B 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_fanspeed_fan6a_rpm
+ description: Speed of Fan 6A 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.11
+
+- 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.12
+
+- name: bmc_fanspeed_fan7a_rpm
+ description: Speed of Fan 7A 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.13
+
+- name: bmc_fanspeed_fan7b_rpm
+ description: Speed of Fan 7B 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.14
+
+- name: bmc_fanspeed_fan8a_rpm
+ description: Speed of Fan 8A 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.15
+
+- name: bmc_fanspeed_fan8b_rpm
+ description: Speed of Fan 8B 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.16
+
+- 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.1
+
+- 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: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+- 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: snmp
+ id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e7969808190c5dd17a24a892a4d9a474ea5911d6
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml
@@ -0,0 +1,108 @@
+nodes:
+ grappe-[1-16]:
+ monitoring:
+ wattmeter: multiple
+ metric: power
+
+ grappe-1:
+ pdu:
+ - uid: grappe-pdu1
+ port: 4
+ - uid: grappe-pdu2
+ port: 4
+ grappe-2:
+ pdu:
+ - uid: grappe-pdu1
+ port: 5
+ - uid: grappe-pdu2
+ port: 5
+ grappe-3:
+ pdu:
+ - uid: grappe-pdu1
+ port: 6
+ - uid: grappe-pdu2
+ port: 6
+ grappe-3:
+ pdu:
+ - uid: grappe-pdu1
+ port: 7
+ - uid: grappe-pdu2
+ port: 7
+ grappe-4:
+ pdu:
+ - uid: grappe-pdu1
+ port: 8
+ - uid: grappe-pdu2
+ port: 8
+ grappe-5:
+ pdu:
+ - uid: grappe-pdu1
+ port: 9
+ - uid: grappe-pdu2
+ port: 9
+ grappe-6:
+ pdu:
+ - uid: grappe-pdu1
+ port: 10
+ - uid: grappe-pdu2
+ port: 10
+ grappe-7:
+ pdu:
+ - uid: grappe-pdu1
+ port: 11
+ - uid: grappe-pdu2
+ port: 11
+ grappe-8:
+ pdu:
+ - uid: grappe-pdu1
+ port: 12
+ - uid: grappe-pdu2
+ port: 12
+ grappe-9:
+ pdu:
+ - uid: grappe-pdu1
+ port: 14
+ - uid: grappe-pdu2
+ port: 14
+ grappe-10:
+ pdu:
+ - uid: grappe-pdu1
+ port: 15
+ - uid: grappe-pdu2
+ port: 15
+ grappe-11:
+ pdu:
+ - uid: grappe-pdu1
+ port: 16
+ - uid: grappe-pdu2
+ port: 16
+ grappe-12:
+ pdu:
+ - uid: grappe-pdu1
+ port: 17
+ - uid: grappe-pdu2
+ port: 17
+ grappe-13:
+ pdu:
+ - uid: grappe-pdu1
+ port: 18
+ - uid: grappe-pdu2
+ port: 18
+ grappe-14:
+ pdu:
+ - uid: grappe-pdu1
+ port: 19
+ - uid: grappe-pdu2
+ port: 19
+ grappe-15:
+ pdu:
+ - uid: grappe-pdu1
+ port: 20
+ - uid: grappe-pdu2
+ port: 20
+ grappe-16:
+ pdu:
+ - uid: grappe-pdu1
+ port: 21
+ - uid: grappe-pdu2
+ port: 22
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index e55cc334b6ace9f6deb2c3bf58fbc23e40fb2b67..252b7fc10f9e41c6e1f79bb8d6d526b5f9c57143 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -6,6 +6,19 @@ sgrappe:
kind: switch
site: nancy
snmp_community: public
+ metrics:
+ - name: network_ifacein_bytes_total
+ description: Input byte counter for the network device port
+ period: 1000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+ - name: network_ifaceout_bytes_total
+ description: Output byte counter for the network device port
+ period: 1000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%
ip: 172.17.79.205
backplane_bps: 2160000000000
linecards: