From 2ffca118ed06aaeb192f2e3fe9bc75863d98b507 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Wed, 8 Jul 2020 17:05:35 +0200
Subject: [PATCH] [lyon] Remove non functionnal metrics on nova

---
 .../sites/lyon/clusters/nova/nova.json        | 19 -----------
 .../lyon/clusters/nova/nova_metrics.yaml      | 34 ++++++++++---------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 1c545b9b5b..74b35bc6db 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -22,25 +22,6 @@
         "protocol": "snmp"
       }
     },
-    {
-      "description": "Power consumption of node reported by BMC, in watt",
-      "name": "bmc_node_power_watt",
-      "period": 5000,
-      "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
-        "protocol": "snmp"
-      }
-    },
-    {
-      "description": "Cumulated power consumption of node reported by BMC, in watt",
-      "name": "bmc_node_power_watthour_total",
-      "optional_period": 5000,
-      "period": 0,
-      "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
-        "protocol": "snmp"
-      }
-    },
     {
       "description": "Speed of Fan 2A reported by BMC, in rpm",
       "labels": {
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 167820805d..65c4957d6b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -30,15 +30,16 @@ metrics:
       protocol: snmp
       id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
 
-  - name: bmc_node_power_watt
-    description: Power consumption of node reported by BMC, in watt
-    period: 5000
-    source:
-      protocol: snmp
-      id: >-
-        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
-        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
-        == System Board Pwr Consumption }}
+  # Value is always 0
+  # - name: bmc_node_power_watt
+  #   description: Power consumption of node reported by BMC, in watt
+  #   period: 5000
+  #   source:
+  #     protocol: snmp
+  #     id: >-
+  #       1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+  #       1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+  #       == System Board Pwr Consumption }}
 
   # SNMP error: No Such Instance currently exists at this OID
   # - name: bmc_psu_current_amp
@@ -66,13 +67,14 @@ metrics:
   #       1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
   #       1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
-  - name: bmc_node_power_watthour_total
-    description: Cumulated power consumption of node reported by BMC, in watt
-    period: 0
-    optional_period: 5000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+  # Value is always 0
+  # - name: bmc_node_power_watthour_total
+  #   description: Cumulated power consumption of node reported by BMC, in watt
+  #   period: 0
+  #   optional_period: 5000
+  #   source:
+  #     protocol: snmp
+  #     id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
 
   - name: bmc_fan_speed_rpm
     labels: {"fan": "2a"}
-- 
GitLab