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 c6825d51f1c02844c5ba26204f91135fb0feb198..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 c83fc62bcd481cdf58bf8fe6cd4ba708821429e4..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 32500317336bed0a213bb08d47d49b3b529b6b8d..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 8e4e689e7ae2b60589964e87b36a9e6faa61f0b7..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 86519c4ae1441cf3c7831179fbba99237637e0aa..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 045e8c262cc762f665dbf55858ff449679c0dd15..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 52f7ea92d79a6ab6aa89defbed9a7c23079ecb58..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 ebacde563a5189a24f9602876ad1d17ec80201fa..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 cc1a4b1afd36d5bc1545bf0bc5e617f4e8d83b59..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 186e17a6bde98a754680ca65dd27549ee5e0c9bb..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 965d20b13c776cabe8f824f4655554dd4afe8fea..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 2a1aab8a209e4e2591f85fa5535d74218ea3fc56..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 32f11a9fb2099e0ade521ec2afc942d72e433dcb..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 06981a43b6b7d2d54f9b6e9fcc743028b6260980..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 0bba490e60d2e27999df49bcfc1b208553cc99fd..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { 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 423ce7a078faba6327230584be27e009c6a04502..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": "true" + "wattmeter": "multiple" }, "network_adapters": [ { diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml index 6bc81e77faa5d3531964e254729c82d7010bf38b..8ac0af2a3d20e05f19d6d008b56408d2665b70c2 100644 --- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml +++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml @@ -60,8 +60,6 @@ nodes: storage: HDD #model: PERC H330 Mini reservation: true - monitoring: - wattmeter: true sensors: power: available: true