Merge branch 'montcalm' into 'master'

[toulouse][kwollect] Remove fan metrics which are not reported by BMC

See merge request grid5000/reference-repository!689

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

@@ -387,97 +387,6 @@
         "protocol": "ipmisensor"
       }
     },
-    {
-      "description": "Usage of Fan 1 reported by BMC, in percent",
-      "labels": {
-        "fan": "1"
-      },
-      "name": "bmc_fan_usage_percent",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 47,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Usage of Fan 2 reported by BMC, in percent",
-      "labels": {
-        "fan": "2"
-      },
-      "name": "bmc_fan_usage_percent",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 50,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Usage of Fan 3 reported by BMC, in percent",
-      "labels": {
-        "fan": "3"
-      },
-      "name": "bmc_fan_usage_percent",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 53,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Usage of Fan 4 reported by BMC, in percent",
-      "labels": {
-        "fan": "4"
-      },
-      "name": "bmc_fan_usage_percent",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 56,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Usage of Fan 5 reported by BMC, in percent",
-      "labels": {
-        "fan": "5"
-      },
-      "name": "bmc_fan_usage_percent",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 59,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Usage of Fan 6 reported by BMC, in percent",
-      "labels": {
-        "fan": "6"
-      },
-      "name": "bmc_fan_usage_percent",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 62,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Usage of Fan 7 reported by BMC, in percent",
-      "labels": {
-        "fan": "7"
-      },
-      "name": "bmc_fan_usage_percent",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 65,
-        "protocol": "ipmisensor"
-      }
-    },
     {
       "description": "Power consumption of Psu 1 reported by BMC, in watt",
       "labels": {

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

@@ -267,69 +267,6 @@ metrics:
       protocol: ipmisensor
       id: 45 #51-CPU 2 PkgTmp
 
-  - name: bmc_fan_usage_percent
-    labels: {"fan": "1"}
-    description: Usage of Fan 1 reported by BMC, in percent
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 47 #Fan 1 DutyCycle
-
-  - name: bmc_fan_usage_percent
-    labels: {"fan": "2"}
-    description: Usage of Fan 2 reported by BMC, in percent
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 50 #Fan 2 DutyCycle
-
-  - name: bmc_fan_usage_percent
-    labels: {"fan": "3"}
-    description: Usage of Fan 3 reported by BMC, in percent
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 53 #Fan 3 DutyCycle
-
-  - name: bmc_fan_usage_percent
-    labels: {"fan": "4"}
-    description: Usage of Fan 4 reported by BMC, in percent
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 56 #Fan 4 DutyCycle
-
-  - name: bmc_fan_usage_percent
-    labels: {"fan": "5"}
-    description: Usage of Fan 5 reported by BMC, in percent
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 59 #Fan 5 DutyCycle
-
-  - name: bmc_fan_usage_percent
-    labels: {"fan": "6"}
-    description: Usage of Fan 6 reported by BMC, in percent
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 62 #Fan 6 DutyCycle
-
-  - name: bmc_fan_usage_percent
-    labels: {"fan": "7"}
-    description: Usage of Fan 7 reported by BMC, in percent
-    period: 0
-    optional_period: 5000
-    source:
-      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