[toulouse][montcalm] Remove PSU metrics since we can't monitor them

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

@@ -13,30 +13,6 @@
         "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": "Temperature reported by BMC, in celsius",
       "name": "bmc_ambient_temp_celsius",

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

@@ -8,21 +8,27 @@ metrics:
       protocol: ipmisensor
       id: 71 #Power Meter
 
-  - 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
+# 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