diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index 477b0d7a4819bea770c7de07a9744a6449d006f2..fcb4e88bdf5dd2c8604cd937596928f9e5da86ec 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-11",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-12",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-1"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index bb0bb199b3e893d0ceab4feda5344717a74137df..2f07b2e7b9ecf5febb678be75f9c6d2e067c4a83 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-13",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-14",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-2"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index 3ec2cca65cf556e56f7e268ac81d9714c28fa159..39047a00c95c596b0e5d746b4f9e7c8bd826c997 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-11",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-12",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-1"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 73c143ba5b02a63cf9f062d64f2411992a5c806f..fba9937645d308dd25aa7524729fc21575cd254d 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-13",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-14",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-2"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index 6fd8123ad6fb88ab5b9a8b4d8c5cde7bad4ab1ed..7550c5f66cb1b7ecad9b9b6e212681e2c4115785 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-13",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-14",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-2"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index aa443dd56b60ed5467d2abe596408432e3e4ac44..6e9e5fdea6fdca27bc8c8d108c579f93b9c8b7b2 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-5",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-6",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-1"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index 237af8b6bfa0a43ac61f0d9b5d55941c9b02fbc4..7ce3bf0e915b446a29d816d24d937b6f5f1ee256 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-5",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-6",
+ "uid": "adonis-pdu-1.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-1"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 874448f1ce06443759cde58766bd592b1566f6e8..b8fc26a2535f76a8d2f51483dcdee7b595e36b9c 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-1",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-2",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-1"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index bdd539a9c2d71e3aa9b6e24e6bf21c985a83c6eb..8de882335d1b7183ee7590f540c89e1ee8959c6e 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-1",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-2",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-1"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index f16f37b07c20bedb8745b3090cd7f51bb43ace66..2e9c29a3271232e7bdc057acb5c4e4afac5f178c 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -23,9 +23,6 @@
"ram_size": 25330180096,
"virtual_size": null
},
- "monitoring": {
- "wattmeter": false
- },
"network_adapters": [
{
"bridged": true,
@@ -114,6 +111,31 @@
"vendor": "Intel",
"version": "E5520"
},
+ "sensors": {
+ "power": {
+ "available": true,
+ "via": {
+ "pdu": [
+ [
+ {
+ "measure": "outlet-13",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ },
+ {
+ "measure": "outlet-14",
+ "uid": "adonis-pdu-2.grenoble.grid5000.fr"
+ }
+ ],
+ [
+ {
+ "measure": "global",
+ "uid": "block-2"
+ }
+ ]
+ ]
+ }
+ }
+ },
"storage_devices": [
{
"device": "sda",
diff --git a/data/grid5000/sites/grenoble/pdus/adonis-pdu-1.json b/data/grid5000/sites/grenoble/pdus/adonis-pdu-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d5d541f19d6d14241c62e8020bbdceda1fc0779
--- /dev/null
+++ b/data/grid5000/sites/grenoble/pdus/adonis-pdu-1.json
@@ -0,0 +1,983 @@
+{
+ "model": "ePDU C20 16A",
+ "sensors": [
+ {
+ "power": [
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "uid": "global"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "block-1-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "block-1-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "block-1-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "global",
+ "uid": "block-1"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "block-2-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "block-2-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "block-2-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "global",
+ "uid": "block-2"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-1-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-1-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-1-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-1"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-2-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-2-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-2-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-2"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-3-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.3"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-3-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.3"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-3-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.3"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-3"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-4-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.4"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-4-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.4"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-4-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.4"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-4"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-5-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.5"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-5-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.5"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-5-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.5"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-5"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-6-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.6"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-6-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.6"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-6-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.6"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-6"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-7-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.7"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-7-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.7"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-7-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.7"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-7"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-8-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.8"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-8-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.8"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-8-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.8"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-8"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-9-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.9"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-9-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.9"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-9-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.9"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-9"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-10-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.10"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-10-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.10"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-10-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.10"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-10"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-11-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.11"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-11-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.11"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-11-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.11"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-11"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-12-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.12"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-12-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.12"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-12-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.12"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-12"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-13-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.13"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-13-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.13"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-13-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.13"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-13"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-14-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.14"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-14-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.14"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-14-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.14"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-14"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-15-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.15"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-15-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.15"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-15-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.15"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-15"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-16-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.16"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-16-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.16"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-16-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.16"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-16"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-17-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.17"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-17-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.17"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-17-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.17"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-17"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-18-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.18"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-18-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.18"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-18-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.18"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-18"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-19-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.19"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-19-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.19"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-19-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.19"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-19"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-20-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.20"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-20-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.20"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-20-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.20"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-20"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-21-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.21"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-21-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.21"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-21-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.21"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-21"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-22-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.22"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-22-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.22"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-22-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.22"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-22"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-23-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.23"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-23-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.23"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-23-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.23"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-23"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-24-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.24"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-24-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.24"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-24-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.24"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-24"
+ }
+ ]
+ }
+ ],
+ "type": "pdu",
+ "uid": "adonis-pdu-1",
+ "vendor": "Eaton Corporation"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/pdus/adonis-pdu-2.json b/data/grid5000/sites/grenoble/pdus/adonis-pdu-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..692074360349025e136112ff1637ebba4f0b3cc3
--- /dev/null
+++ b/data/grid5000/sites/grenoble/pdus/adonis-pdu-2.json
@@ -0,0 +1,983 @@
+{
+ "model": "ePDU C20 16A",
+ "sensors": [
+ {
+ "power": [
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "uid": "global"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "block-1-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "block-1-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "block-1-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "global",
+ "uid": "block-1"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "block-2-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "block-2-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "block-2-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "global",
+ "uid": "block-2"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-1-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-1-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-1-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-1"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-2-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-2-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-2-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-2"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-3-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.3"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-3-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.3"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-3-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.3"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-3"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-4-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.4"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-4-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.4"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-4-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.4"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-4"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-5-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.5"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-5-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.5"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-5-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.5"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-5"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-6-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.6"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-6-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.6"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-6-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.6"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-6"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-7-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.7"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-7-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.7"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-7-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.7"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-7"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-8-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.8"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-8-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.8"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-8-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.8"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-8"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-9-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.9"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-9-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.9"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-9-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.9"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-9"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-10-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.10"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-10-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.10"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-10-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.10"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-10"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-11-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.11"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-11-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.11"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-11-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.11"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-11"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-12-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.12"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-12-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.12"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-12-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.12"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-1",
+ "uid": "outlet-12"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-13-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.13"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-13-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.13"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-13-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.13"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-13"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-14-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.14"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-14-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.14"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-14-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.14"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-14"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-15-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.15"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-15-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.15"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-15-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.15"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-15"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-16-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.16"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-16-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.16"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-16-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.16"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-16"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-17-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.17"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-17-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.17"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-17-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.17"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-17"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-18-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.18"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-18-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.18"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-18-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.18"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-18"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-19-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.19"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-19-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.19"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-19-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.19"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-19"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-20-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.20"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-20-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.20"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-20-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.20"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-20"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-21-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.21"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-21-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.21"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-21-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.21"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-21"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-22-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.22"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-22-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.22"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-22-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.22"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-22"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-23-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.23"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-23-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.23"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-23-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.23"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-23"
+ },
+ {
+ "measures": [
+ {
+ "currentW": {
+ "api": "outlet-24-currentW",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.24"
+ ],
+ "shared": true,
+ "unit": "W"
+ }
+ },
+ {
+ "current": {
+ "api": "outlet-24-current",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.24"
+ ],
+ "shared": "true",
+ "unit": "VA"
+ }
+ },
+ {
+ "total": {
+ "api": "outlet-24-total",
+ "oid": [
+ "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.24"
+ ],
+ "shared": "true",
+ "unit": "Wh"
+ }
+ }
+ ],
+ "parent": "block-2",
+ "uid": "outlet-24"
+ }
+ ]
+ }
+ ],
+ "type": "pdu",
+ "uid": "adonis-pdu-2",
+ "vendor": "Eaton Corporation"
+}
\ No newline at end of file
diff --git a/generators/input/sites/grenoble/clusters/adonis.rb b/generators/input/sites/grenoble/clusters/adonis.rb
index 4b3360a1d4adfb3aa8c4b67366f724ec18d2d024..e129eb54bc849df167bf8277d001a3e5141f920b 100644
--- a/generators/input/sites/grenoble/clusters/adonis.rb
+++ b/generators/input/sites/grenoble/clusters/adonis.rb
@@ -143,8 +143,22 @@ site :grenoble do |site_uid|
:gpu_model => lookup('adonis', node_uid, 'gpu', 'gpu_model'),
})
- monitoring({
- :wattmeter => false
+ sensors({
+ :power => {
+ :available => true,
+ :via => {
+ :pdu => [
+ [ { :measure => lookup('adonis', node_uid, 'sensors', 'measure1'),
+ :uid => lookup('adonis', node_uid, 'sensors', 'pdu')},
+ { :measure => lookup('adonis', node_uid, 'sensors', 'measure2'),
+ :uid => lookup('adonis', node_uid, 'sensors', 'pdu')}
+ ],
+ [ { :measure => "global",
+ :uid => lookup('adonis', node_uid, 'sensors', 'block')}
+ ]
+ ]
+ }
+ }
})
end
diff --git a/generators/input/sites/grenoble/clusters/adonis.yaml b/generators/input/sites/grenoble/clusters/adonis.yaml
index 251f96aa579199e1d517d0d755ad6531ff40e4bd..02d7c682cb6d0450a7c5729d253d551ffc85198b 100644
--- a/generators/input/sites/grenoble/clusters/adonis.yaml
+++ b/generators/input/sites/grenoble/clusters/adonis.yaml
@@ -78,6 +78,11 @@ adonis-1:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-11
+ measure2: outlet-12
+ pdu: adonis-pdu-1.grenoble.grid5000.fr
+ block: block-1
adonis-2:
bios:
version: R4222X52
@@ -157,6 +162,11 @@ adonis-2:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-11
+ measure2: outlet-12
+ pdu: adonis-pdu-1.grenoble.grid5000.fr
+ block: block-1
adonis-3:
bios:
version: R4222X52
@@ -236,6 +246,11 @@ adonis-3:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-13
+ measure2: outlet-14
+ pdu: adonis-pdu-1.grenoble.grid5000.fr
+ block: block-2
adonis-4:
bios:
version: R4222X52
@@ -314,6 +329,11 @@ adonis-4:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-13
+ measure2: outlet-14
+ pdu: adonis-pdu-1.grenoble.grid5000.fr
+ block: block-2
adonis-5:
bios:
version: R4222X52
@@ -393,6 +413,11 @@ adonis-5:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-5
+ measure2: outlet-6
+ pdu: adonis-pdu-1.grenoble.grid5000.fr
+ block: block-1
adonis-6:
bios:
version: R4222X52
@@ -472,6 +497,11 @@ adonis-6:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-5
+ measure2: outlet-6
+ pdu: adonis-pdu-1.grenoble.grid5000.fr
+ block: block-1
adonis-7:
bios:
version: R4222X52
@@ -551,6 +581,11 @@ adonis-7:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-1
+ measure2: outlet-2
+ pdu: adonis-pdu-2.grenoble.grid5000.fr
+ block: block-1
adonis-8:
bios:
version: R4222X52
@@ -630,6 +665,11 @@ adonis-8:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-1
+ measure2: outlet-2
+ pdu: adonis-pdu-2.grenoble.grid5000.fr
+ block: block-1
adonis-9:
bios:
version: R4222X52
@@ -709,6 +749,11 @@ adonis-9:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-13
+ measure2: outlet-14
+ pdu: adonis-pdu-2.grenoble.grid5000.fr
+ block: block-2
adonis-10:
bios:
version: R4222X52
@@ -788,3 +833,8 @@ adonis-10:
gpu:
gpu_count: 2
gpu_model: Tesla-C1060
+ sensors:
+ measure1: outlet-13
+ measure2: outlet-14
+ pdu: adonis-pdu-2.grenoble.grid5000.fr
+ block: block-2
diff --git a/generators/input/sites/grenoble/pdus.rb b/generators/input/sites/grenoble/pdus.rb
index e6db3751527d9b07668d3af9c982034b57038eef..c88ead399b91a276fe7a8e38cb79349a2d228c1c 100644
--- a/generators/input/sites/grenoble/pdus.rb
+++ b/generators/input/sites/grenoble/pdus.rb
@@ -27,7 +27,7 @@ site :grenoble do |site_uid|
},
{
:total => {
- :unit => "W.h",
+ :unit => "Wh",
:shared => "true",
:oid => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1"],
:api => "total"
@@ -58,7 +58,7 @@ site :grenoble do |site_uid|
},
{
:total => {
- :unit => "W.h",
+ :unit => "Wh",
:shared => "true",
:oid => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.#{j}",],
:api => "block-#{j}-total"
@@ -92,7 +92,7 @@ site :grenoble do |site_uid|
},
{
:total => {
- :unit => "W.h",
+ :unit => "Wh",
:shared => "true",
:oid => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.#{k*12+j}"],
:api => "outlet-#{k*12+j}-total"