From 6e6baddfcd2f7c142a0bb8236b6bbba97f64efea Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Mon, 18 Jan 2021 15:09:11 +0100
Subject: [PATCH] [lyon] Removing wattmetre3
---
.../lyon/clusters/nova/nodes/nova-1.json | 6 --
.../lyon/clusters/nova/nodes/nova-10.json | 6 --
.../lyon/clusters/nova/nodes/nova-11.json | 6 --
.../lyon/clusters/nova/nodes/nova-12.json | 6 --
.../lyon/clusters/nova/nodes/nova-13.json | 6 --
.../lyon/clusters/nova/nodes/nova-14.json | 6 --
.../lyon/clusters/nova/nodes/nova-15.json | 6 --
.../lyon/clusters/nova/nodes/nova-16.json | 6 --
.../lyon/clusters/nova/nodes/nova-17.json | 6 --
.../lyon/clusters/nova/nodes/nova-18.json | 6 --
.../lyon/clusters/nova/nodes/nova-19.json | 6 --
.../lyon/clusters/nova/nodes/nova-2.json | 6 --
.../lyon/clusters/nova/nodes/nova-20.json | 6 --
.../lyon/clusters/nova/nodes/nova-21.json | 6 --
.../lyon/clusters/nova/nodes/nova-22.json | 6 --
.../lyon/clusters/nova/nodes/nova-23.json | 6 --
.../lyon/clusters/nova/nodes/nova-3.json | 6 --
.../lyon/clusters/nova/nodes/nova-4.json | 6 --
.../lyon/clusters/nova/nodes/nova-5.json | 6 --
.../lyon/clusters/nova/nodes/nova-6.json | 6 --
.../lyon/clusters/nova/nodes/nova-7.json | 6 --
.../lyon/clusters/nova/nodes/nova-8.json | 6 --
.../lyon/clusters/nova/nodes/nova-9.json | 6 --
data/grid5000/sites/lyon/pdus/wattmetre3.json | 58 -------------------
.../lyon/clusters/nova/nova_metrics.yaml | 7 ---
.../lyon/clusters/nova/nova_pdus.yaml.erb | 8 ---
input/grid5000/sites/lyon/pdus.yaml | 21 -------
27 files changed, 232 deletions(-)
delete mode 100644 data/grid5000/sites/lyon/pdus/wattmetre3.json
delete mode 100644 input/grid5000/sites/lyon/clusters/nova/nova_pdus.yaml.erb
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 1c85385e7a..a300093494 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 1a39566af1..2049104043 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 6a1aba6f9e..2f8b6b7067 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 bbe7cf77de..52ab6057f0 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 6140422a85..b27f355572 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 e0d63d99cc..f2f3c55b51 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 28147b78e9..e9c1f17bc0 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 bf6a83693b..c1a8b4679b 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 19ada49266..6ff7cc467f 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 3e42527b64..2623e7742e 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 b1c8a3b6a9..684465ce42 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 9f234e021a..79de7995b3 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 bbb10a6949..15f976f92e 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 ca90ec1fb5..b2866d4564 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 53aa8ce609..bd560f752e 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 8478bc879d..a57999b2ef 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 e10fc8f894..9a8df9cda1 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 a72560e96a..0edfe814bd 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 54d1e65776..daf03670c3 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 08cbd05489..8995ca585d 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 9da1ee91e6..9054f1c0be 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 c493bb64ba..a9f193771d 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 8160cfd64a..33fb0a2133 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 d1e9b80100..0000000000
--- 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 304423fa87..13ab94adb4 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 aab2d29661..0000000000
--- 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 002f1595d6..5c99a52444 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: ''
--
GitLab