From 78913423dba699bb9379c64f4177dbc374cc5b14 Mon Sep 17 00:00:00 2001
From: Pierre JACQUOT <pierre.jacquot@inria.fr>
Date: Tue, 12 Dec 2023 14:53:36 +0100
Subject: [PATCH] [toulouse][montcalm] Enable metrics that should be enabled by
 default.

---
 .../toulouse/clusters/montcalm/montcalm.json  | 75 +++++++++----------
 .../clusters/montcalm/montcalm_metrics.yaml   | 55 +++++++-------
 2 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
index c607fe1a1dc..03d76b995e7 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
@@ -4,11 +4,43 @@
   "exotic": false,
   "kavlan": true,
   "metrics": [
+    {
+      "description": "Power consumption reported by BMC, in watt",
+      "name": "bmc_node_power_watt",
+      "period": 5000,
+      "source": {
+        "id": 71,
+        "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",
-      "optional_period": 5000,
-      "period": 0,
+      "period": 5000,
       "source": {
         "id": 2,
         "protocol": "ipmisensor"
@@ -664,42 +696,6 @@
         "protocol": "ipmisensor"
       }
     },
-    {
-      "description": "Power consumption of Psu 1 reported by BMC, in watt",
-      "labels": {
-        "psu": "1"
-      },
-      "name": "bmc_psu_power_watt",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 68,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Power consumption of Psu 2 reported by BMC, in watt",
-      "labels": {
-        "psu": "2"
-      },
-      "name": "bmc_psu_power_watt",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 70,
-        "protocol": "ipmisensor"
-      }
-    },
-    {
-      "description": "Power consumption reported by BMC, in watt",
-      "name": "bmc_node_power_watt",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": 71,
-        "protocol": "ipmisensor"
-      }
-    },
     {
       "description": "Power consumption of PS 1 Output reported by BMC, in watt",
       "labels": {
@@ -846,8 +842,7 @@
     {
       "description": "Default subset of metrics from Prometheus Node Exporter",
       "name": "prom_default_metrics",
-      "optional_period": 15000,
-      "period": 0,
+      "period": 15000,
       "source": {
         "id": [
           "node_boot_time_seconds",
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml
index 21cae49167e..d60f2903c6d 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm_metrics.yaml
@@ -1,10 +1,32 @@
 ---
 metrics:
 
+  - name: bmc_node_power_watt
+    description: Power consumption reported by BMC, in watt
+    period: 5000
+    source:
+      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
+
   - name: bmc_ambient_temp_celsius
     description: Temperature reported by BMC, in celsius
-    period: 0
-    optional_period: 5000
+    period: 5000
     source:
       protocol: ipmisensor
       id: 2 #01-Inlet Ambient
@@ -459,32 +481,6 @@ 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: 0
-    optional_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: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 70 #PS 2 Input
-
-  - name: bmc_node_power_watt
-    description: Power consumption reported by BMC, in watt
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: ipmisensor
-      id: 71 #Power Meter
-
   - name: bmc_other_power_watt
     labels: {"id": "ps1output"}
     description: Power consumption of PS 1 Output reported by BMC, in watt
@@ -586,8 +582,7 @@ metrics:
 
   - name: prom_default_metrics
     description: Default subset of metrics from Prometheus Node Exporter
-    period: 0
-    optional_period: 15000
+    period: 15000
     source:
       protocol: prometheus
       port: 9100
-- 
GitLab