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 1c85385e7a09e4df58f3b1b60c73c73d161b04a2..a300093494417c6018c3a53e7347a0ba638c0c85 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 0,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 1a39566af15cf9bad1477877b119d595b1935535..204910404372af895df4793766c89c18cabc0d39 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 9,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 6a1aba6f9e255529943064fefe55d2edb347322c..2f8b6b70672717b517e8abe87e93c27c38f220fb 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 10,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 bbe7cf77de3cf34bebe8c0db2758492e904b15d5..52ab6057f0140965b9bd26ff8ec6939789e8852b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 11,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 6140422a857192fda167bfec4930d5800b48e311..b27f355572fc02dc3b25e2ee61eac29f40482381 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 12,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 e0d63d99cc67143c31f462997f6563a096e2df31..f2f3c55b517c7e0c9d75b746074173fe1db6242e 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 13,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 28147b78e91ee72af8b2828a638d5f77baf6ad30..e9c1f17bc01aff48b282c4c8ba80cc7bce990a71 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 14,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 bf6a83693b1ab43490a8f5efa3258b8813dc462c..c1a8b4679bc6274c01b74fbc5a8d467b55c80c40 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 15,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 19ada49266d14126f683224dcd23fa510548a6f1..6ff7cc467f4671f710d1c1cd35d0926b1c65a8f4 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 16,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 3e42527b6422bfdf1ed73e8119f81db3d81ecbcc..2623e7742eb284e792d826ad73c2423fa827b2ff 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 17,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 b1c8a3b6a9ee68ab3b976d4905d327d01df7db19..684465ce424dc1725ab7cd0fa261cbdc050a532f 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 18,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 9f234e021a395fbab4d9a84f7178420f4eff9e50..79de7995b3f8d9d732e4bff7132eca833c1110df 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 1,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 bbb10a694997e1d49082dc218d6a777628d24ffb..15f976f92e1ccccb577f3a215c606d36e1d9a1c3 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 19,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 ca90ec1fb592198c1153c88bda0cf1d6b9c8231e..b2866d4564254496be8a1a6a9915fb5ab7f9fc69 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 20,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 53aa8ce609a55982e721c28a21952ff3f414cae7..bd560f752efde5d06a33d57292e2e92918a92e31 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 21,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 8478bc879d7e20d20f5ab960482e0b93664b735e..a57999b2efabf000ea6197b74e0dcba6969cfaa7 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 22,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 e10fc8f894a44602d81fbf4eb872d8df39195fae..9a8df9cda19290868ee3f4f2b8cfecede4d88e39 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 2,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 a72560e96a3ba1110812bdb538b9d5352bb4e7b8..0edfe814bdea3dc714b1d1461feaf883757d59d3 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 3,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 54d1e65776b92c2b9adbe5b9807c36e1b04dfd62..daf03670c3b6bec59c72b80b038e3c9e66ef3456 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 4,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 08cbd05489a3943b59d9597a80be709177e0b576..8995ca585dba33d751654ff15ab3305a0f529fea 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 5,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 9da1ee91e65c931a1686c5a349e79cf1cce8e98f..9054f1c0be819e9e11820e6a0ad6eb08c7e27e2e 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 6,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 c493bb64ba75aff11fded0f5459974e78dd9ce07..a9f193771d5a2f06f9f26a470eb6c9edbd330d3e 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 7,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
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 8160cfd64a8f8260ba3f14b5d4ac2ea583695e3b..33fb0a213399966cc2ca58baba07b2f201788858 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json
@@ -219,12 +219,6 @@
"api": {
"metric": "power"
},
- "pdu": [
- {
- "port": 8,
- "uid": "wattmetre3"
- }
- ],
"www": {
"url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
}
diff --git a/data/grid5000/sites/lyon/pdus/wattmetre3.json b/data/grid5000/sites/lyon/pdus/wattmetre3.json
deleted file mode 100644
index d1e9b801003c60d2e878c0217ce9a65bab679319..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/pdus/wattmetre3.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "ip": "172.16.63.8",
- "metrics": [
- {
- "description": "Power consumption per outlet reported by wattmetre, in watt",
- "name": "wattmetre_power_watt",
- "optional_period": 20,
- "period": 1000,
- "source": {
- "protocol": "wattmetre"
- }
- }
- ],
- "model": "",
- "ports": {
- "0": "nova-1",
- "1": "nova-2",
- "10": "nova-11",
- "11": "nova-12",
- "12": "nova-13",
- "13": "nova-14",
- "14": "nova-15",
- "15": "nova-16",
- "16": "nova-17",
- "17": "nova-18",
- "18": "nova-19",
- "19": "nova-20",
- "2": "nova-3",
- "20": "nova-21",
- "21": "nova-22",
- "22": "nova-23",
- "3": "nova-4",
- "4": "nova-5",
- "5": "nova-6",
- "6": "nova-7",
- "7": "nova-8",
- "8": "nova-9",
- "9": "nova-10"
- },
- "sensors": [
- {
- "power": {
- "per_outlets": true,
- "resolution": 1,
- "wattmetre": {
- "available": true,
- "unit": "W",
- "www": {
- "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
- }
- }
- }
- }
- ],
- "type": "pdu",
- "uid": "wattmetre3",
- "vendor": "OmegaWatt"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 304423fa8760794942c3a25a061e2d21ae2a8033..13ab94adb44c333df9aaca726672c7e4f3e2859c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -1,13 +1,6 @@
---
metrics:
- - name: wattmetre_power_watt
- description: Power consumption reported by wattmetre, in watt
- period: 1000
- optional_period: 20
- source:
- protocol: wattmetre
-
- name: network_ifacein_bytes_total
description: >-
Input byte counter for the network device port connected to the node
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_pdus.yaml.erb b/input/grid5000/sites/lyon/clusters/nova/nova_pdus.yaml.erb
deleted file mode 100644
index aab2d2966106d694a8c18117a42bcee71158a7f7..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/lyon/clusters/nova/nova_pdus.yaml.erb
+++ /dev/null
@@ -1,8 +0,0 @@
----
-nodes:
-<% (1..23).each { |i| %>
- nova-<%= i %>:
- pdu:
- - uid: wattmetre3
- port: <%= i-1 %>
-<% } %>
diff --git a/input/grid5000/sites/lyon/pdus.yaml b/input/grid5000/sites/lyon/pdus.yaml
index 002f1595d620f68b0a5d260554e8d5c8620e7a14..5c99a52444d59feb16e3a488eeb23b02a8ad2ad3 100644
--- a/input/grid5000/sites/lyon/pdus.yaml
+++ b/input/grid5000/sites/lyon/pdus.yaml
@@ -21,27 +21,6 @@ pdus:
source:
protocol: wattmetre
- wattmetre3:
- vendor: OmegaWatt
- model: ''
- ip: 172.16.63.8
- sensors:
- - power:
- resolution: 1
- per_outlets: true
- wattmetre:
- available: true
- unit: W
- www:
- url: "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
- metrics:
- - name: wattmetre_power_watt
- description: Power consumption per outlet reported by wattmetre, in watt
- period: 1000
- optional_period: 20
- source:
- protocol: wattmetre
-
wattmetre4:
vendor: OmegaWatt
model: ''