diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json index 8ab0e896e662ae46e4bf4bb410417f0a05605ce5..28def830ffc63600c195993a0ef7d53285b179d3 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 1, "uid": "parapluie-pdu-2" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json index 5f2e21672172de83bd4bf2024e22013e11aa3283..c7b058d5534c6f717baa83bd39bbcad4af8ca2de 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 5, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json index 2c33ee2101be170a21f3c1364b70c142eddd8a8e..b83ff3da559ea0594276372aa86cb7b790df28c3 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 1, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json index 4ee0f99fdf38258e9540a3a47ddc3c1c9df6be1e..348a690f6e5b1ca6ce32780c666757b584ac849d 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 24, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json index a8f5f3a3d9daf4f9f9d1c4e7c154eb4921be6731..160f8141ed25774dc0b429a7cabdea39b67a22fc 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 22, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json index 9ac8eb7cdc5a56dfab77e33830902acd29cc599f..ac6cc8128e594148ae8edc8e5373dcbd6a7942b6 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 23, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json index b8a42bce542b8cf24f7e30071dfd70863b82c898..c1b2b0ac1f90f3928694f963affe634bb351da54 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 20, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json index d7cd1b445e8c504b18bc1d60547b9fdbb80abac9..5772797ac2351ff89048820e1fb54ab0e348dfd0 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 21, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json index 8dca4807c7b320ab65a5440cecd2bee89a60c7ba..e4a7374c7e978aa3eb6c590f0dd4bb4f4329084b 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 5, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json index a29bc1e548d994f4252e8fae13e1b8f9d0a28fc9..f692411d726a2462c63f64acfb04c6f5002d3566 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 22, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json index 9d550c6154a04db435ab7a9db1c203501b2ca887..f2561997642b77f5cc9d4572d514afe9a4b40884 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 3, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json index 0b7075378850a66cd23b54f945b2fa070a6e811b..c68959f846922ffbb3a4063a49690a4deefe7eee 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 1, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json index b21ec9b5425a54e97a5350bfdb1b8cf81f65ee26..4c9426eb063d9bebb376a67e3bf565fa78b2315d 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 2, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json index 2c110a31c0f92c88e17fdeeaad581e7d7ff5a802..b6a35ac0e9200f3636d443a56474f0df23efae85 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 4, "uid": "parapluie-pdu-4" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json index d43f4c461f63aac17c3da640e64ecaa4a27aa8ee..927d20e51f5a42a49737d31565a09dca7aa6b1aa 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 24, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json index 561aaa646b6031d12d8d6d7a399b1facb1e73393..1fe855f3b30cb3807f83016ab93c0c1318c0aad5 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 23, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json index 5e4e400fed96b421d4234d39b7c4738a4769054d..db5a28fef799cfcbe36061333329f85258c18e8e 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 21, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json index 6e328f468798f1eff45acfa02c922ab8cd6021ef..5bec66237815b1ef0e8f6b2c562a76ff0033e950 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 20, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json index 1e19ccafa3b4401da711bf7ab676b497d0a1b7e2..7c1354367f50c2ba6afadfa4f62c342943075a9e 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 2, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json index 7762f5f19b9d061f0fa9c4f907356a06c5c00f04..de0dff5a99d4af6ed2d3c462bf4d95422f122f26 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 3, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json index a219e390f48201a90effb15f0729d2a91505931c..02186c0af02f52184f0235de878ef22e9d808269 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json @@ -44,7 +44,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -164,12 +164,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 4, "uid": "parapluie-pdu-3" } ] diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json index 965438626340209c0c65b6a407038cab570cc3e5..e5a9005c781b783dbd3fcb8511d318a55aeda4f7 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json index 55e293fedcb0f412ddbab047086a31632cf4c3c1..b9f18c8a3dd9662886c9955365c5db5414dbe757 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json index fdfb91f282032c80c45cda5545f6137e80b40a55..7b2e354aa14886f07fe2b6e460e917dfa70121d3 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json index 711e6e9c22d271d90c6f77b862e19a096cd8fa71..d73c49b63fb31e4e17a2541e8da66e217017b18d 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json index 954096e6522dd3153f768f1ad19e464dcd990b8e..7e33e24abb2e564b66648f4ebc6509bf01150f1f 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json index 3205ff1240aa70abbcc41a1c073582c6cd989d9c..6b3bb2356bd870fdd5b23f99d008215e73fa6dc1 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json index d340e7ff3a643435f4cc2dbe8d3a059ae34a8b6a..b220a0553cd20103eac1f8bba339993115b00d82 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json index 8edfb38c1480df548dc1e2c011435d7cc0f38db6..9119f43998f131bac82d8591ef7994d699e8a19e 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json index 91fba0260866aa4db0d9f326d6500df72411944c..85a4ef9f6295de39a801c60def281a8c3582fff7 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json index 19437d7504164a221d94bd9e31f91d05661f528b..54542cffce485c9c901eb9886821f1f1a4870461 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json index 6455e4e6fd3625399726812e4a51aea6a585f117..996250bec9eaa12cb653bda019e12ffb975ab305 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json index bc86f2f1bca27a0659e355249e5d7a0a67afb410..6a99ab9a147ff45227061389cf805b5303ed4652 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json index fa1ce37ef8fe635f4ab30fbc5a4bf7c4bea55e18..eabbe99e7e87e4dce8259e884d0346359c4a4b3a 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json index 708e1d63d3aa5c254ea9929caee709b65bb7bda8..8b541d131cbfca6b180c52e467728abc62343b21 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json index 66111d962b63e9016b384db98c26f5230bdff2af..c971d4f110a160393921c31c83e5f9a9be76eef7 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json index 75f514be6652b0b14d3aa8364ed7f1dc6bd8462b..e2b0663b720d8b949f5453e6ccae758ea549c48f 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json index cc8004f4bf0870cf042d482eebc8b3942b562ec8..fa42ee053077ac2a72e7b90e0d52b0586b0470db 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json index f2b24596ecad81d04efdee78e00f3fdb19fbb458..2a4794213f5172925cf16cf89a180a7d09a9f941 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json @@ -198,6 +198,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/grid5000-all.json b/grid5000-all.json index aefeb8923056a66546f8b80d07be5c669129f6ed..51794d9753a67b70595be83d5bab5a555a5fef65 100644 --- a/grid5000-all.json +++ b/grid5000-all.json @@ -158186,7 +158186,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -158306,12 +158306,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 1, "uid": "parapluie-pdu-2" } ] @@ -158404,7 +158406,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -158524,12 +158526,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 5, "uid": "parapluie-pdu-3" } ] @@ -158622,7 +158626,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -158742,12 +158746,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 1, "uid": "parapluie-pdu-3" } ] @@ -158840,7 +158846,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -158960,12 +158966,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 24, "uid": "parapluie-pdu-4" } ] @@ -159058,7 +159066,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -159178,12 +159186,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 22, "uid": "parapluie-pdu-4" } ] @@ -159277,7 +159287,7 @@ "monitoring": { "metric": "power", "temperature": true, - "wattmeter": "shared" + "wattmeter": true }, "network_adapters": { "bmc": { @@ -159372,6 +159382,10 @@ "version": "X5570" }, "sensors": { + "power": { + "available": true, + "per_outlets": true + }, "temperature": { "available": true, "via": { @@ -159456,7 +159470,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -159576,12 +159590,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 23, "uid": "parapluie-pdu-4" } ] @@ -159674,7 +159690,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -159794,12 +159810,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 20, "uid": "parapluie-pdu-4" } ] @@ -159893,7 +159911,7 @@ "monitoring": { "metric": "power", "temperature": true, - "wattmeter": "shared" + "wattmeter": true }, "network_adapters": { "bmc": { @@ -159987,6 +160005,10 @@ "version": "X5570" }, "sensors": { + "power": { + "available": true, + "per_outlets": true + }, "temperature": { "available": true, "via": { @@ -160071,7 +160093,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -160191,12 +160213,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 21, "uid": "parapluie-pdu-4" } ] @@ -160289,7 +160313,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -160409,12 +160433,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 5, "uid": "parapluie-pdu-4" } ] @@ -160507,7 +160533,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -160627,12 +160653,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 22, "uid": "parapluie-pdu-3" } ] @@ -160725,7 +160753,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -160845,12 +160873,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 3, "uid": "parapluie-pdu-4" } ] @@ -160943,7 +160973,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -161063,12 +161093,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 1, "uid": "parapluie-pdu-4" } ] @@ -161162,7 +161194,7 @@ "monitoring": { "metric": "power", "temperature": true, - "wattmeter": "shared" + "wattmeter": true }, "network_adapters": { "bmc": { @@ -161257,6 +161289,10 @@ "version": "X5570" }, "sensors": { + "power": { + "available": true, + "per_outlets": true + }, "temperature": { "available": true, "via": { @@ -161342,7 +161378,7 @@ "monitoring": { "metric": "power", "temperature": true, - "wattmeter": "shared" + "wattmeter": true }, "network_adapters": { "bmc": { @@ -161436,6 +161472,10 @@ "version": "X5570" }, "sensors": { + "power": { + "available": true, + "per_outlets": true + }, "temperature": { "available": true, "via": { @@ -161520,7 +161560,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -161640,12 +161680,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 2, "uid": "parapluie-pdu-4" } ] @@ -161738,7 +161780,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -161858,12 +161900,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 4, "uid": "parapluie-pdu-4" } ] @@ -161956,7 +162000,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -162076,12 +162120,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 24, "uid": "parapluie-pdu-3" } ] @@ -162174,7 +162220,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -162294,12 +162340,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 23, "uid": "parapluie-pdu-3" } ] @@ -162392,7 +162440,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -162512,12 +162560,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 21, "uid": "parapluie-pdu-3" } ] @@ -162610,7 +162660,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -162730,12 +162780,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 20, "uid": "parapluie-pdu-3" } ] @@ -162828,7 +162880,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -162948,12 +163000,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 2, "uid": "parapluie-pdu-3" } ] @@ -163046,7 +163100,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -163166,12 +163220,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 3, "uid": "parapluie-pdu-3" } ] @@ -163264,7 +163320,7 @@ }, "monitoring": { "temperature": true, - "wattmeter": "shared" + "wattmeter": "true" }, "network_adapters": [ { @@ -163384,12 +163440,14 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" }, "pdu": [ { + "port": 4, "uid": "parapluie-pdu-3" } ] @@ -163649,6 +163707,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -163871,6 +163930,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -164115,6 +164175,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -164368,6 +164429,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -164621,6 +164683,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -164843,6 +164906,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -165087,6 +165151,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -165321,6 +165386,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -165534,6 +165600,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -165747,6 +165814,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -165991,6 +166059,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -166244,6 +166313,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -166497,6 +166567,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -166750,6 +166821,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -167003,6 +167075,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -167225,6 +167298,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -167438,6 +167512,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -167682,6 +167757,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -167904,6 +167980,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -168117,6 +168194,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -168361,6 +168439,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -168583,6 +168662,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -168796,6 +168876,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -169009,6 +169090,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -169253,6 +169335,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -169506,6 +169589,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -169728,6 +169812,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -169941,6 +170026,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -170185,6 +170271,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -170407,6 +170494,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -170620,6 +170708,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -170864,6 +170953,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -171086,6 +171176,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -171299,6 +171390,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -171512,6 +171604,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -171725,6 +171818,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -171938,6 +172032,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -172151,6 +172246,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -172395,6 +172491,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" @@ -172648,6 +172745,7 @@ "sensors": { "power": { "available": true, + "per_outlets": true, "via": { "api": { "metric": "power" diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml index 8bde9060542368e9bd1827829aae7b35e63aced5..e10818a12bf61c3897098d82b8b951bd3c443c90 100644 --- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml +++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml @@ -10,9 +10,12 @@ nodes: parapide-[1-25]: monitoring: temperature: true - wattmeter: shared + wattmeter: true metric: power sensors: + power: + available: true + per_outlets: true temperature: available: true via: diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml index 833121f56a6ca02f840f4f75307b4f78568101e5..b8fdea498ee2bf151d14cecc4d8693099d13ca14 100644 --- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml +++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml @@ -93,6 +93,7 @@ nodes: sensors: power: available: true + per_outlets: true via: api: metric: power