[wattm_servan] Add wattmetre2 for servan monitoring

data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json

@@ -334,6 +334,16 @@
       "vendor": "Xilinx"
     }
   },
+  "pdu": [
+    {
+      "port": 1,
+      "uid": "wattmetre2"
+    },
+    {
+      "port": 2,
+      "uid": "wattmetre2"
+    }
+  ],
   "performance": {
     "core_flops": 36800000000,
     "node_flops": 1766400000000

data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json

@@ -334,6 +334,16 @@
       "vendor": "Xilinx"
     }
   },
+  "pdu": [
+    {
+      "port": 3,
+      "uid": "wattmetre2"
+    },
+    {
+      "port": 4,
+      "uid": "wattmetre2"
+    }
+  ],
   "performance": {
     "core_flops": 36800000000,
     "node_flops": 1766400000000

data/grid5000/sites/grenoble/clusters/servan/servan.json

@@ -4,6 +4,15 @@
   "exotic": true,
   "kavlan": true,
   "metrics": [
+    {
+      "description": "Power consumption of node reported by wattmetre, in watt",
+      "name": "wattmetre_power_watt",
+      "optional_period": 20,
+      "period": 1000,
+      "source": {
+        "protocol": "wattmetre"
+      }
+    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_ambient_temp_celsius",

data/grid5000/sites/grenoble/pdus/wattmetre2.json

+{
+  "ip": "172.16.31.9",
+  "metrics": [
+    {
+      "description": "Power consumption per outlet reported by wattmetre, in watt",
+      "name": "wattmetre_power_watt",
+      "optional_period": 20,
+      "period": 1000,
+      "source": {
+        "protocol": "wattmetre"
+      }
+    }
+  ],
+  "model": "",
+  "ports": {
+    "1": "servan-1",
+    "2": "servan-1",
+    "3": "servan-2",
+    "4": "servan-2"
+  },
+  "type": "pdu",
+  "uid": "wattmetre2",
+  "vendor": "OmegaWatt"
+}
\ No newline at end of file

input/grid5000/sites/grenoble/clusters/servan/servan_pdu.yaml

+---
+nodes:
+  servan-1:
+    pdu:
+      - uid: wattmetre2
+        port: 1
+      - uid: wattmetre2
+        port: 2
+  servan-2:
+    pdu:
+      - uid: wattmetre2
+        port: 3
+      - uid: wattmetre2
+        port: 4

input/grid5000/sites/grenoble/pdus.yaml

@@ -11,3 +11,14 @@ pdus:
         optional_period: 20
         source:
           protocol: wattmetre
+  wattmetre2:
+    vendor: OmegaWatt
+    model: ''
+    ip: 172.16.31.9
+    metrics:
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre