Commit ea99a726 authored by MARGERY David's avatar MARGERY David

[grenoble] Rename measure to port for pdu description, cleanup spurious pdus...

[grenoble] Rename measure to port for pdu description, cleanup spurious pdus in site description, referenced properly the block measure available for clarity
parent f0eaf9c4
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-11",
"port": "outlet-11",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
},
{
"measure": "outlet-12",
"port": "outlet-12",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"port": "outlet-13",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
},
{
"measure": "outlet-14",
"port": "outlet-14",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-2"
"measure": "block-2",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-11",
"port": "outlet-11",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
},
{
"measure": "outlet-12",
"port": "outlet-12",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"port": "outlet-13",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
},
{
"measure": "outlet-14",
"port": "outlet-14",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-2"
"measure": "block-2",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"port": "outlet-13",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
},
{
"measure": "outlet-14",
"port": "outlet-14",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-2"
"measure": "block-2",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-5",
"port": "outlet-5",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
},
{
"measure": "outlet-6",
"port": "outlet-6",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-5",
"port": "outlet-5",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
},
{
"measure": "outlet-6",
"port": "outlet-6",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-1.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-1",
"port": "outlet-1",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
},
{
"measure": "outlet-2",
"port": "outlet-2",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-1",
"port": "outlet-1",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
},
{
"measure": "outlet-2",
"port": "outlet-2",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-1"
"measure": "block-1",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
]
]
......
......@@ -119,18 +119,18 @@
"pdu": [
[
{
"measure": "outlet-13",
"port": "outlet-13",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
},
{
"measure": "outlet-14",
"port": "outlet-14",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
],
[
{
"measure": "global",
"uid": "block-2"
"measure": "block-2",
"uid": "adonis-pdu-2.grenoble.grid5000.fr"
}
]
]
......
{
"model": "eMAA12",
"sensors": [
{
"power": {
"per_outlets": true,
"snmp": {
"available": true,
"outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
"total_oids": [
"iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
"iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
],
"unit": "W"
}
}
}
],
"type": "pdu",
"uid": "pdu-1",
"vendor": "Eaton Corporation"
}
\ No newline at end of file
{
"model": "eMAA12",
"sensors": [
{
"power": {
"per_outlets": true,
"snmp": {
"available": true,
"outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0",
"total_oids": [
"iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1",
"iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"
],
"unit": "W"
}
}
}
],
"type": "pdu",
"uid": "pdu-2",
"vendor": "Eaton Corporation"
}
\ No newline at end of file
......@@ -151,13 +151,13 @@ site :grenoble do |site_uid|
:available => true,
:via => {
:pdu => [
[ { :measure => lookup('adonis_manual', node_uid, 'sensors', 'measure1'),
[ { :port => lookup('adonis_manual', node_uid, 'sensors', 'measure1'),
:uid => lookup('adonis_manual', node_uid, 'sensors', 'pdu')},
{ :measure => lookup('adonis_manual', node_uid, 'sensors', 'measure2'),
{ :port => lookup('adonis_manual', node_uid, 'sensors', 'measure2'),
:uid => lookup('adonis_manual', node_uid, 'sensors', 'pdu')}
],
[ { :measure => "global",
:uid => lookup('adonis_manual', node_uid, 'sensors', 'block')}
[ { :measure => lookup('adonis_manual', node_uid, 'sensors', 'block'),
:uid => lookup('adonis_manual', node_uid, 'sensors', 'pdu')}
]
]
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment