diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index 736b939af0b41fd8873df63880e865cb093baaac..5ade2fc509af398423e8d7f9d535b27e7c2e4452 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 5,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
@@ -286,4 +272,4 @@
},
"type": "node",
"uid": "parasilo-16"
-}
\ No newline at end of file
+}
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 94f8a22dfad756dc1a6d1d38157ca64a177aadda..1f6b0082125fae2686d9fcaf533064112db4e872 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 4,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index 0caf8ab3acc90b9a4ce08222b343bbf3fdf0669b..b67453fd7c5171360c11d6a51ecefca98caa21af 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 3,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index 1cd29c67a2a338156d1744c92d76a2096942a73c..5c91b23f46703a2995b51355176155d2bb60cc87 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 2,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index cc538f14f5e3a0decbb6d122f43e8808ea50c668..be0a730e1468dbc48efd256f26b15bb593dee907 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -62,7 +62,7 @@
"ram_size": 137438953472
},
"monitoring": {
- "wattmeter": "true"
+ "wattmeter": "false"
},
"network_adapters": [
{
@@ -180,20 +180,6 @@
"version": "E5-2630 v3"
},
"sensors": {
- "power": {
- "available": true,
- "via": {
- "api": {
- "metric": "power"
- },
- "pdu": [
- {
- "port": 1,
- "uid": "parasilo-pdu-1"
- }
- ]
- }
- }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json b/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json
index 2c6fe2b9151b338cbcdd94fd3304b4f8c8cf8a9f..77400ac754efa0c9e87aefa0e42d0f99b599a833 100644
--- a/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json
+++ b/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json
@@ -1,32 +1,9 @@
{
"ip": "172.17.97.201",
- "model": "AP8659",
"ports": {
- "1": "parasilo-9",
- "2": "parasilo-8",
- "3": "parasilo-20",
- "4": "parasilo-18",
- "5": "parasilo-16",
"6": "paravance-1",
"7": "paravance-2"
},
- "sensors": [
- {
- "power": {
- "per_outlets": false,
- "resolution": 1,
- "snmp": {
- "available": true,
- "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7",
- "total_oids": [
- "iso.3.6.1.4.1.318.1.1.12.1.16.0"
- ],
- "unit": "W"
- }
- }
- }
- ],
"type": "pdu",
- "uid": "parasilo-pdu-1",
- "vendor": "APC"
+ "uid": "parasilo-pdu-1"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index 176c516b9ae159f46dd93f111a5d29f87bdb5cb5..ffd05505e8d5947ac480d5ae054b72a00da64e2a 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -8,9 +8,6 @@ queues:
nodes:
parasilo-[1-28]:
- monitoring:
- wattmeter: true
- metric: power
processor:
microarchitecture: Haswell
performance:
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb
new file mode 100644
index 0000000000000000000000000000000000000000..c170ffd1fd0ae16b80ffd89d55ee3970fd318d2b
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb
@@ -0,0 +1,7 @@
+nodes:
+<% [1,2,3,4,5,6,7,10,11,12,13,14,15,17,19,21,22,23,24,25,26,27,28].each { |i| %>
+ parasilo-<%= i %>:
+ monitoring:
+ wattmeter: true
+ metric: power
+<% } %>
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml
index 6ca4f524ba60c42fb6979167712b63ce46b8f990..b0ede79358303015d3a91845e7e0e97a3b718ba8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_pdu.yaml
@@ -28,14 +28,14 @@ nodes:
pdu:
- uid: parasilo-pdu-2
port: 1
- parasilo-8:
- pdu:
- - uid: parasilo-pdu-1
- port: 2
- parasilo-9:
- pdu:
- - uid: parasilo-pdu-1
- port: 1
+# parasilo-8:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 2
+# parasilo-9:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 1
parasilo-10:
pdu:
- uid: parasilo-pdu-2
@@ -60,26 +60,26 @@ nodes:
pdu:
- uid: parasilo-pdu-4
port: 3
- parasilo-16:
- pdu:
- - uid: parasilo-pdu-1
- port: 5
+# parasilo-16:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 5
parasilo-17:
pdu:
- uid: parasilo-pdu-2
port: 5
- parasilo-18:
- pdu:
- - uid: parasilo-pdu-1
- port: 4
+# parasilo-18:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 4
parasilo-19:
pdu:
- uid: parasilo-pdu-2
port: 4
- parasilo-20:
- pdu:
- - uid: parasilo-pdu-1
- port: 3
+# parasilo-20:
+# pdu:
+# - uid: parasilo-pdu-1
+# port: 3
parasilo-21:
pdu:
- uid: parasilo-pdu-4
diff --git a/input/grid5000/sites/rennes/pdus.yaml b/input/grid5000/sites/rennes/pdus.yaml
index 728def195586bf90b9e92ef71256c2a74874eb5c..1fe906f2ff71c16870b6571b6b5d33572b89a9c4 100644
--- a/input/grid5000/sites/rennes/pdus.yaml
+++ b/input/grid5000/sites/rennes/pdus.yaml
@@ -42,19 +42,8 @@ pdus:
outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
resolution: 1
- parasilo-pdu-[1-1]:
+ parasilo-pdu-1:
vendor: APC
- model: AP8659
- sensors:
- - power:
- per_outlets: false
- snmp:
- available: true
- total_oids:
- - iso.3.6.1.4.1.318.1.1.12.1.16.0
- unit: W
- outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
- resolution: 1
parasilo-pdu-[2-4]:
vendor: APC