[grenoble,lille,luxembourg,lyon,nancy,reims,rennes,sophia] Rework the...

[grenoble,lille,luxembourg,lyon,nancy,reims,rennes,sophia] Rework the [monitoring][wattmeter] entry for all nodes so that it is derived from the data in [sensors][power][via][pdu] or [sensors][power][via][ipmi]

[grenoble,lille,luxembourg,lyon,nancy,reims,rennes,sophia] Rework the...
[grenoble,lille,luxembourg,lyon,nancy,reims,rennes,sophia] Rework the [monitoring][wattmeter] entry for all nodes so that it is derived from the data in [sensors][power][via][pdu] or [sensors][power][via][ipmi]
b541c093 · MARGERY David · ce3bc3d4 · b541c093 · b541c093 · b541c093
Commit b541c093 authored Jan 25, 2016 by MARGERY David
75 changed files
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -24,6 +24,9 @@
    "ram_size": 25769803776,
    "virtual_size": null
  },
+  "monitoring": {
+    "wattmeter": "shared"
+  },
  "network_adapters": [
    {
      "bridged": true,

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -22,7 +22,7 @@
    "virtual_size": null
  },
  "monitoring": {
-    "wattmeter": true
+    "wattmeter": "outofband"
  },
  "network_adapters": [
    {

--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json