Merge branch 'montcalm-metrics' into 'master'

[toulouse][kwollect] Re-enable bmc_psu_other_watt metric

See merge request !687

data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json

@@ -478,6 +478,30 @@
         "protocol": "ipmisensor"
       }
     },
+    {
+      "description": "Power consumption of Psu 1 reported by BMC, in watt",
+      "labels": {
+        "psu": "1"
+      },
+      "name": "bmc_psu_power_watt",
+      "period": 5000,
+      "source": {
+        "id": 68,
+        "protocol": "ipmisensor"
+      }
+    },
+    {
+      "description": "Power consumption of Psu 2 reported by BMC, in watt",
+      "labels": {
+        "psu": "2"
+      },
+      "name": "bmc_psu_power_watt",
+      "period": 5000,
+      "source": {
+        "id": 70,
+        "protocol": "ipmisensor"
+      }
+    },
     {
       "description": "Power consumption of PS 1 Output reported by BMC, in watt",
       "labels": {

input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml

@@ -8,28 +8,6 @@ metrics:
       protocol: ipmisensor
       id: 71 #Power Meter
 
-# Theses two metrics are not consistently returned by the BMC.
-# Sometimes, the BMC returns nothing for theses metrics when queried.
-# It causes the test_metrics to fail for montcalm.
-# As long we can't find a way to properly retrieve them, they will
-# stay commented.
-#
-#  - name: bmc_psu_power_watt
-#    labels: {"psu": "1"}
-#    description: Power consumption of Psu 1 reported by BMC, in watt
-#    period: 5000
-#    source:
-#      protocol: ipmisensor
-#      id: 68 #PS 1 Input
-#
-#  - name: bmc_psu_power_watt
-#    labels: {"psu": "2"}
-#    description: Power consumption of Psu 2 reported by BMC, in watt
-#    period: 5000
-#    source:
-#      protocol: ipmisensor
-#      id: 70 #PS 2 Input
-
   - name: bmc_ambient_temp_celsius
     description: Temperature reported by BMC, in celsius
     period: 5000
@@ -352,6 +330,22 @@ metrics:
       protocol: ipmisensor
       id: 65 #Fan 7 DutyCycle
 
+  - name: bmc_psu_power_watt
+    labels: {"psu": "1"}
+    description: Power consumption of Psu 1 reported by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 68 #PS 1 Input
+
+  - name: bmc_psu_power_watt
+    labels: {"psu": "2"}
+    description: Power consumption of Psu 2 reported by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 70 #PS 2 Input
+
   - name: bmc_other_power_watt
     labels: {"id": "ps1output"}
     description: Power consumption of PS 1 Output reported by BMC, in watt