Skip to content

GitLab

Commit 56e5b0f4 authored by Elodie Bertoncello's avatar Elodie Bertoncello
Browse files

[grenoble] add pdus and sensors

parent 2f2e1075
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2285 additions and 35 deletions
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
View file @ 56e5b0f4
......@@ -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",
......
data/grid5000/sites/grenoble/pdus/adonis-pdu-1.json 0 → 100644
View file @ 56e5b0f4
This diff is collapsed.
data/grid5000/sites/grenoble/pdus/adonis-pdu-2.json 0 → 100644
View file @ 56e5b0f4
This diff is collapsed.
generators/input/sites/grenoble/clusters/adonis.rb
View file @ 56e5b0f4
......@@ -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
......
generators/input/sites/grenoble/clusters/adonis.yaml
View file @ 56e5b0f4
......@@ -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
generators/input/sites/grenoble/pdus.rb
View file @ 56e5b0f4
......@@ -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"
......
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