From ca907e43caf156c7eeb79c5619a008b6a96a5f20 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Wed, 27 May 2020 15:49:32 +0200
Subject: [PATCH] [lyon] Remove missing metrics
---
.../sites/lyon/clusters/nova/nova.json | 28 -------------
.../sites/lyon/clusters/orion/orion.json | 27 -------------
.../sites/lyon/clusters/taurus/taurus.json | 27 -------------
.../lyon/clusters/nova/nova_metrics.yaml | 40 ++++++++++---------
.../lyon/clusters/orion/orion_metrics.yaml | 36 +++++++++--------
.../lyon/clusters/taurus/taurus_metrics.yaml | 36 +++++++++--------
6 files changed, 59 insertions(+), 135 deletions(-)
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index a173b1ceabd..bf64530a9ff 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -30,34 +30,6 @@
"protocol": "snmp"
}
},
- {
- "description": "Current of PSU 1 reported by BMC, in amp",
- "labels": {
- "psu": "1"
- },
- "name": "bmc_psu_current_amp",
- "optional_period": 5000,
- "period": 0,
- "scale_factor": 0.1,
- "source": {
- "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
- "protocol": "snmp"
- }
- },
- {
- "description": "Current of PSU 2 reported by BMC, in amp",
- "labels": {
- "psu": "2"
- },
- "name": "bmc_psu_current_amp",
- "optional_period": 5000,
- "period": 0,
- "scale_factor": 0.1,
- "source": {
- "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
- "protocol": "snmp"
- }
- },
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
"name": "bmc_node_power_watt_total",
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index 2fdfe8684ed..558dad38b4a 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -43,19 +43,6 @@
"protocol": "snmp"
}
},
- {
- "description": "Voltage of PSU 2 reported by BMC, in volt",
- "labels": {
- "psu": "2"
- },
- "name": "bmc_psu_voltage_volt",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
- "protocol": "snmp"
- }
- },
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
@@ -70,20 +57,6 @@
"protocol": "snmp"
}
},
- {
- "description": "Current of PSU 2 reported by BMC, in amp",
- "labels": {
- "psu": "2"
- },
- "name": "bmc_psu_current_amp",
- "optional_period": 5000,
- "period": 0,
- "scale_factor": 0.1,
- "source": {
- "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
- "protocol": "snmp"
- }
- },
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
"name": "bmc_node_power_watt_total",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index a7b518a5fc3..06b0ae29b46 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -43,19 +43,6 @@
"protocol": "snmp"
}
},
- {
- "description": "Voltage of PSU 2 reported by BMC, in volt",
- "labels": {
- "psu": "2"
- },
- "name": "bmc_psu_voltage_volt",
- "optional_period": 5000,
- "period": 0,
- "source": {
- "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
- "protocol": "snmp"
- }
- },
{
"description": "Current of PSU 1 reported by BMC, in amp",
"labels": {
@@ -70,20 +57,6 @@
"protocol": "snmp"
}
},
- {
- "description": "Current of PSU 2 reported by BMC, in amp",
- "labels": {
- "psu": "2"
- },
- "name": "bmc_psu_current_amp",
- "optional_period": 5000,
- "period": 0,
- "scale_factor": 0.1,
- "source": {
- "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
- "protocol": "snmp"
- }
- },
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
"name": "bmc_node_power_watt_total",
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 63c3551e776..e6bef925768 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -35,25 +35,27 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
-- name: bmc_psu_current_amp
- labels: {"psu": "1"}
- description: Current of PSU 1 reported by BMC, in amp
- period: 0
- optional_period: 5000
- scale_factor: 0.1
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-
-- name: bmc_psu_current_amp
- labels: {"psu": "2"}
- description: Current of PSU 2 reported by BMC, in amp
- period: 0
- optional_period: 5000
- scale_factor: 0.1
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+# SNMP error: No Such Instance currently exists at this OID
+# - name: bmc_psu_current_amp
+# labels: {"psu": "1"}
+# description: Current of PSU 1 reported by BMC, in amp
+# period: 0
+# optional_period: 5000
+# scale_factor: 0.1
+# source:
+# protocol: snmp
+# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+
+# SNMP error: No Such Instance currently exists at this OID
+# - name: bmc_psu_current_amp
+# labels: {"psu": "2"}
+# description: Current of PSU 2 reported by BMC, in amp
+# period: 0
+# optional_period: 5000
+# scale_factor: 0.1
+# source:
+# protocol: snmp
+# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index e3286f724fb..c8944d9716f 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -43,14 +43,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_psu_voltage_volt
- labels: {"psu": "2"}
- description: Voltage of PSU 2 reported by BMC, in volt
- period: 0
- optional_period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+# PSU2 not plugged
+# - name: bmc_psu_voltage_volt
+# labels: {"psu": "2"}
+# description: Voltage of PSU 2 reported by BMC, in volt
+# period: 0
+# optional_period: 5000
+# source:
+# protocol: snmp
+# id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
- name: bmc_psu_current_amp
labels: {"psu": "1"}
@@ -62,15 +63,16 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_psu_current_amp
- labels: {"psu": "2"}
- description: Current of PSU 2 reported by BMC, in amp
- period: 0
- optional_period: 5000
- scale_factor: 0.1
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+# PSU2 not plugged
+# - name: bmc_psu_current_amp
+# labels: {"psu": "2"}
+# description: Current of PSU 2 reported by BMC, in amp
+# period: 0
+# optional_period: 5000
+# scale_factor: 0.1
+# source:
+# protocol: snmp
+# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index 69b364ce41d..5b57fbfe423 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -44,14 +44,15 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-- name: bmc_psu_voltage_volt
- labels: {"psu": "2"}
- description: Voltage of PSU 2 reported by BMC, in volt
- period: 0
- optional_period: 5000
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+# PSU2 not plugged
+# - name: bmc_psu_voltage_volt
+# labels: {"psu": "2"}
+# description: Voltage of PSU 2 reported by BMC, in volt
+# period: 0
+# optional_period: 5000
+# source:
+# protocol: snmp
+# id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
- name: bmc_psu_current_amp
labels: {"psu": "1"}
@@ -63,15 +64,16 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
-- name: bmc_psu_current_amp
- labels: {"psu": "2"}
- description: Current of PSU 2 reported by BMC, in amp
- period: 0
- optional_period: 5000
- scale_factor: 0.1
- source:
- protocol: snmp
- id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+# PSU2 not plugged
+# - name: bmc_psu_current_amp
+# labels: {"psu": "2"}
+# description: Current of PSU 2 reported by BMC, in amp
+# period: 0
+# optional_period: 5000
+# scale_factor: 0.1
+# source:
+# protocol: snmp
+# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
- name: bmc_node_power_watt_total
description: Cumulated power consumption of node reported by BMC, in watt
--
GitLab