From b1f0a65310bf2ce0014f53483c070374cf53b5ed Mon Sep 17 00:00:00 2001 From: Simon Delamare <simon.delamare@ens-lyon.fr> Date: Tue, 19 Jan 2021 10:31:34 +0100 Subject: [PATCH] [lyon] ... and other monitoring related fields --- .../sites/lyon/clusters/nova/nodes/nova-1.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-10.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-11.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-12.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-13.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-14.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-15.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-16.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-17.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-18.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-19.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-2.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-20.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-21.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-22.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-23.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-3.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-4.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-5.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-6.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-7.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-8.json | 14 +++----------- .../sites/lyon/clusters/nova/nodes/nova-9.json | 14 +++----------- input/grid5000/sites/lyon/clusters/nova/nova.yaml | 11 +++-------- 24 files changed, 72 insertions(+), 261 deletions(-) diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json index a300093494..51c9b3e20d 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json index 2049104043..e292faae86 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json index 2f8b6b7067..245651bd55 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json index 52ab6057f0..3a6566c4d1 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json index b27f355572..4d2bbbe98e 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json index f2f3c55b51..2b91a65c8a 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json index e9c1f17bc0..1dbdb25a67 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json index c1a8b4679b..11c04a8365 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json index 6ff7cc467f..ae3b20b83b 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json index 2623e7742e..3a5b4ed22b 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json index 684465ce42..3b5ef424b2 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json index 79de7995b3..d05a456707 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json index 15f976f92e..2b3d1b10a7 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json index b2866d4564..664ac58353 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json index bd560f752e..f093d46c8c 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json index a57999b2ef..818a7d79b5 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json index 9a8df9cda1..07d4981cf4 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json index 0edfe814bd..72d9efb69e 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json index daf03670c3..249370b1b6 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json index 8995ca585d..996ad65fee 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json index 9054f1c0be..1337ad7a9f 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json index a9f193771d..907bfa56be 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json index 33fb0a2133..1a4838c81c 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json @@ -64,7 +64,7 @@ "ram_size": 68719476736 }, "monitoring": { - "wattmeter": "true" + "wattmeter": "false" }, "network_adapters": [ { @@ -213,16 +213,8 @@ }, "sensors": { "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } + "available": false, + "per_outlets": false } }, "software": { diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yaml b/input/grid5000/sites/lyon/clusters/nova/nova.yaml index ab7fe071ca..f3ee1e334f 100644 --- a/input/grid5000/sites/lyon/clusters/nova/nova.yaml +++ b/input/grid5000/sites/lyon/clusters/nova/nova.yaml @@ -60,13 +60,8 @@ nodes: mounted: false mountable: false monitoring: - wattmeter: true + wattmeter: false sensors: power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php + available: false + per_outlets: false -- GitLab