diff --git a/data/grid5000/sites/lille/servers/gardin.json b/data/grid5000/sites/lille/servers/gardin.json index ae0fa85f676540faf06c980967e0d8bc5f140991..9e5a801d83a1b718ac541e5f86ea5f94b0f769ce 100644 --- a/data/grid5000/sites/lille/servers/gardin.json +++ b/data/grid5000/sites/lille/servers/gardin.json @@ -1,5 +1,9 @@ { "kind": "physical", + "monitoring": { + "metric": "power", + "wattmeter": "multiple" + }, "network_adapters": { "bmc": { "ip": "172.17.46.9", @@ -10,10 +14,6 @@ "ip": "172.16.47.9", "mac": "24:6E:96:DC:F4:2C", "mounted": true - }, - "monitoring": { - "metric": "power", - "wattmeter": "multiple" } }, "sensors": { diff --git a/data/grid5000/sites/lille/servers/granche-srv1.json b/data/grid5000/sites/lille/servers/granche-srv1.json index 76b25601eabb9eb083cbcdc658fde24eddf2da10..a45e5b278ad269fa1993f5086191535313ab2be8 100644 --- a/data/grid5000/sites/lille/servers/granche-srv1.json +++ b/data/grid5000/sites/lille/servers/granche-srv1.json @@ -1,5 +1,9 @@ { "kind": "physical", + "monitoring": { + "metric": "power", + "wattmeter": "multiple" + }, "network_adapters": { "bmc": { "ip": "172.17.46.14", @@ -10,10 +14,6 @@ "ip": "172.16.47.14", "mac": "3C:FD:FE:B9:91:30", "mounted": true - }, - "monitoring": { - "metric": "power", - "wattmeter": "multiple" } }, "sensors": { diff --git a/data/grid5000/sites/lille/servers/granche-srv2.json b/data/grid5000/sites/lille/servers/granche-srv2.json index a17e7c1f73da15b89f06dd71c7dad2444b3a79c0..102952061da756028274796df1834d55af130d52 100644 --- a/data/grid5000/sites/lille/servers/granche-srv2.json +++ b/data/grid5000/sites/lille/servers/granche-srv2.json @@ -1,5 +1,9 @@ { "kind": "physical", + "monitoring": { + "metric": "power", + "wattmeter": "multiple" + }, "network_adapters": { "bmc": { "ip": "172.17.46.15", @@ -10,10 +14,6 @@ "ip": "172.16.47.15", "mac": "3C:FD:FE:B9:9A:10", "mounted": true - }, - "monitoring": { - "metric": "power", - "wattmeter": "multiple" } }, "sensors": { diff --git a/data/grid5000/sites/lille/servers/gwol-north.json b/data/grid5000/sites/lille/servers/gwol-north.json index 077ecb70eb17ccf684c70b47a18dab94dc5c91e9..29e589a781e8ce6f55b5bc390919d0c27d6bb2b1 100644 --- a/data/grid5000/sites/lille/servers/gwol-north.json +++ b/data/grid5000/sites/lille/servers/gwol-north.json @@ -1,5 +1,9 @@ { "kind": "physical", + "monitoring": { + "metric": "power", + "wattmeter": "multiple" + }, "network_adapters": { "bmc": { "ip": "172.17.46.4", @@ -10,10 +14,6 @@ "ip": "172.16.47.4", "mac": "24:6E:96:DD:1F:56", "mounted": true - }, - "monitoring": { - "metric": "power", - "wattmeter": "multiple" } }, "sensors": { diff --git a/input/grid5000/sites/lille/servers/physical.yaml b/input/grid5000/sites/lille/servers/physical.yaml index 02cdbadf3e2278093c0fd89e910fc0b88ff1e796..2c00abcf968e8b35a572418e79df3d4c74588785 100644 --- a/input/grid5000/sites/lille/servers/physical.yaml +++ b/input/grid5000/sites/lille/servers/physical.yaml @@ -274,9 +274,9 @@ gardin: mounted: true ip: 172.17.46.9 mac: 54:48:10:f4:f9:0c - monitoring: - wattmeter: multiple - metric: power + monitoring: + wattmeter: multiple + metric: power sensors: network: available: true @@ -304,9 +304,9 @@ gwol-north: mounted: true ip: 172.17.46.4 mac: 54:48:10:f4:f5:ca - monitoring: - wattmeter: multiple - metric: power + monitoring: + wattmeter: multiple + metric: power sensors: network: available: true @@ -334,9 +334,9 @@ granche-srv1: mounted: true ip: 172.17.46.14 mac: 54:48:10:f2:e9:78 - monitoring: - wattmeter: multiple - metric: power + monitoring: + wattmeter: multiple + metric: power sensors: network: available: true @@ -364,9 +364,9 @@ granche-srv2: mounted: true ip: 172.17.46.15 mac: 54:48:10:f2:d3:7c - monitoring: - wattmeter: multiple - metric: power + monitoring: + wattmeter: multiple + metric: power sensors: network: available: true