diff --git a/data/grid5000/sites/nancy/servers/srv-data.json b/data/grid5000/sites/nancy/servers/srv-data.json index 72b96fb6a7fa5845a23b655b91e82bd753917bd7..fabef9b7c72f40b2b332b850b22618b448ea19a7 100644 --- a/data/grid5000/sites/nancy/servers/srv-data.json +++ b/data/grid5000/sites/nancy/servers/srv-data.json @@ -5,14 +5,42 @@ "public" ], "kind": "physical", + "monitoring": { + "metric": "power", + "wattmeter": "multiple" + }, "network_adapters": { "bmc": { "ip": "172.17.79.16", - "mac": "F0:1F:AF:E1:99:E4" + "mac": "F0:1F:AF:E1:99:E4", + "mounted": true }, "default": { "ip": "172.16.79.16", - "mac": "A0:36:9F:2C:5D:B8" + "mac": "A0:36:9F:2C:5D:B8", + "mounted": true + } + }, + "sensors": { + "network": { + "available": true, + "resolution": 1 + }, + "power": { + "available": true, + "resolution": 1, + "via": { + "pdu": [ + { + "port": 20, + "uid": "grisou-pdu1" + }, + { + "port": 20, + "uid": "grisou-pdu2" + } + ] + } } }, "serial": "GCQ7NZ1", diff --git a/grid5000-all.json b/grid5000-all.json index ff639d522a52b0febca878ff506f72d0fed9f77b..5421443afa735224fe7204c7d9c87e93cb2bc2c4 100644 --- a/grid5000-all.json +++ b/grid5000-all.json @@ -157027,14 +157027,42 @@ "public" ], "kind": "physical", + "monitoring": { + "metric": "power", + "wattmeter": "multiple" + }, "network_adapters": { "bmc": { "ip": "172.17.79.16", - "mac": "F0:1F:AF:E1:99:E4" + "mac": "F0:1F:AF:E1:99:E4", + "mounted": true }, "default": { "ip": "172.16.79.16", - "mac": "A0:36:9F:2C:5D:B8" + "mac": "A0:36:9F:2C:5D:B8", + "mounted": true + } + }, + "sensors": { + "network": { + "available": true, + "resolution": 1 + }, + "power": { + "available": true, + "resolution": 1, + "via": { + "pdu": [ + { + "port": 20, + "uid": "grisou-pdu1" + }, + { + "port": 20, + "uid": "grisou-pdu2" + } + ] + } } }, "serial": "GCQ7NZ1", diff --git a/input/grid5000/sites/nancy/servers/servers.yaml b/input/grid5000/sites/nancy/servers/servers.yaml index 09d8733c0af6109b97d395327c701e38c887834d..1cbbb7da53f2174a53d3d1e3ff86c629efb8f49b 100644 --- a/input/grid5000/sites/nancy/servers/servers.yaml +++ b/input/grid5000/sites/nancy/servers/servers.yaml @@ -230,18 +230,6 @@ gras: mac: 00:0D:60:55:16:68 ip: 172.16.79.14 -srv-data: - kind: physical - alias: [nfs,home-g5k,public] - warranty: 11.2018 - serial: GCQ7NZ1 - network_adapters: - default: - ip: 172.16.79.16 - mac: A0:36:9F:2C:5D:B8 - bmc: - ip: 172.17.79.16 - mac: F0:1F:AF:E1:99:E4 opensm: kind: physical alias: []