Skip to content

Commit ca907e4

Browse files
committed
[lyon] Remove missing metrics
1 parent f57456d commit ca907e4

File tree

6 files changed

+59
-135
lines changed

6 files changed

+59
-135
lines changed

data/grid5000/sites/lyon/clusters/nova/nova.json

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,6 @@
3030
"protocol": "snmp"
3131
}
3232
},
33-
{
34-
"description": "Current of PSU 1 reported by BMC, in amp",
35-
"labels": {
36-
"psu": "1"
37-
},
38-
"name": "bmc_psu_current_amp",
39-
"optional_period": 5000,
40-
"period": 0,
41-
"scale_factor": 0.1,
42-
"source": {
43-
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
44-
"protocol": "snmp"
45-
}
46-
},
47-
{
48-
"description": "Current of PSU 2 reported by BMC, in amp",
49-
"labels": {
50-
"psu": "2"
51-
},
52-
"name": "bmc_psu_current_amp",
53-
"optional_period": 5000,
54-
"period": 0,
55-
"scale_factor": 0.1,
56-
"source": {
57-
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
58-
"protocol": "snmp"
59-
}
60-
},
6133
{
6234
"description": "Cumulated power consumption of node reported by BMC, in watt",
6335
"name": "bmc_node_power_watt_total",

data/grid5000/sites/lyon/clusters/orion/orion.json

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,6 @@
4343
"protocol": "snmp"
4444
}
4545
},
46-
{
47-
"description": "Voltage of PSU 2 reported by BMC, in volt",
48-
"labels": {
49-
"psu": "2"
50-
},
51-
"name": "bmc_psu_voltage_volt",
52-
"optional_period": 5000,
53-
"period": 0,
54-
"source": {
55-
"id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
56-
"protocol": "snmp"
57-
}
58-
},
5946
{
6047
"description": "Current of PSU 1 reported by BMC, in amp",
6148
"labels": {
@@ -70,20 +57,6 @@
7057
"protocol": "snmp"
7158
}
7259
},
73-
{
74-
"description": "Current of PSU 2 reported by BMC, in amp",
75-
"labels": {
76-
"psu": "2"
77-
},
78-
"name": "bmc_psu_current_amp",
79-
"optional_period": 5000,
80-
"period": 0,
81-
"scale_factor": 0.1,
82-
"source": {
83-
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
84-
"protocol": "snmp"
85-
}
86-
},
8760
{
8861
"description": "Cumulated power consumption of node reported by BMC, in watt",
8962
"name": "bmc_node_power_watt_total",

data/grid5000/sites/lyon/clusters/taurus/taurus.json

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,6 @@
4343
"protocol": "snmp"
4444
}
4545
},
46-
{
47-
"description": "Voltage of PSU 2 reported by BMC, in volt",
48-
"labels": {
49-
"psu": "2"
50-
},
51-
"name": "bmc_psu_voltage_volt",
52-
"optional_period": 5000,
53-
"period": 0,
54-
"source": {
55-
"id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
56-
"protocol": "snmp"
57-
}
58-
},
5946
{
6047
"description": "Current of PSU 1 reported by BMC, in amp",
6148
"labels": {
@@ -70,20 +57,6 @@
7057
"protocol": "snmp"
7158
}
7259
},
73-
{
74-
"description": "Current of PSU 2 reported by BMC, in amp",
75-
"labels": {
76-
"psu": "2"
77-
},
78-
"name": "bmc_psu_current_amp",
79-
"optional_period": 5000,
80-
"period": 0,
81-
"scale_factor": 0.1,
82-
"source": {
83-
"id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
84-
"protocol": "snmp"
85-
}
86-
},
8760
{
8861
"description": "Cumulated power consumption of node reported by BMC, in watt",
8962
"name": "bmc_node_power_watt_total",

input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,27 @@ metrics:
3535
protocol: snmp
3636
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
3737

38-
- name: bmc_psu_current_amp
39-
labels: {"psu": "1"}
40-
description: Current of PSU 1 reported by BMC, in amp
41-
period: 0
42-
optional_period: 5000
43-
scale_factor: 0.1
44-
source:
45-
protocol: snmp
46-
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
47-
48-
- name: bmc_psu_current_amp
49-
labels: {"psu": "2"}
50-
description: Current of PSU 2 reported by BMC, in amp
51-
period: 0
52-
optional_period: 5000
53-
scale_factor: 0.1
54-
source:
55-
protocol: snmp
56-
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
38+
# SNMP error: No Such Instance currently exists at this OID
39+
# - name: bmc_psu_current_amp
40+
# labels: {"psu": "1"}
41+
# description: Current of PSU 1 reported by BMC, in amp
42+
# period: 0
43+
# optional_period: 5000
44+
# scale_factor: 0.1
45+
# source:
46+
# protocol: snmp
47+
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
48+
49+
# SNMP error: No Such Instance currently exists at this OID
50+
# - name: bmc_psu_current_amp
51+
# labels: {"psu": "2"}
52+
# description: Current of PSU 2 reported by BMC, in amp
53+
# period: 0
54+
# optional_period: 5000
55+
# scale_factor: 0.1
56+
# source:
57+
# protocol: snmp
58+
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
5759

5860
- name: bmc_node_power_watt_total
5961
description: Cumulated power consumption of node reported by BMC, in watt

input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ metrics:
4343
protocol: snmp
4444
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
4545

46-
- name: bmc_psu_voltage_volt
47-
labels: {"psu": "2"}
48-
description: Voltage of PSU 2 reported by BMC, in volt
49-
period: 0
50-
optional_period: 5000
51-
source:
52-
protocol: snmp
53-
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
46+
# PSU2 not plugged
47+
# - name: bmc_psu_voltage_volt
48+
# labels: {"psu": "2"}
49+
# description: Voltage of PSU 2 reported by BMC, in volt
50+
# period: 0
51+
# optional_period: 5000
52+
# source:
53+
# protocol: snmp
54+
# id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
5455

5556
- name: bmc_psu_current_amp
5657
labels: {"psu": "1"}
@@ -62,15 +63,16 @@ metrics:
6263
protocol: snmp
6364
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
6465

65-
- name: bmc_psu_current_amp
66-
labels: {"psu": "2"}
67-
description: Current of PSU 2 reported by BMC, in amp
68-
period: 0
69-
optional_period: 5000
70-
scale_factor: 0.1
71-
source:
72-
protocol: snmp
73-
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
66+
# PSU2 not plugged
67+
# - name: bmc_psu_current_amp
68+
# labels: {"psu": "2"}
69+
# description: Current of PSU 2 reported by BMC, in amp
70+
# period: 0
71+
# optional_period: 5000
72+
# scale_factor: 0.1
73+
# source:
74+
# protocol: snmp
75+
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
7476

7577
- name: bmc_node_power_watt_total
7678
description: Cumulated power consumption of node reported by BMC, in watt

input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ metrics:
4444
protocol: snmp
4545
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
4646

47-
- name: bmc_psu_voltage_volt
48-
labels: {"psu": "2"}
49-
description: Voltage of PSU 2 reported by BMC, in volt
50-
period: 0
51-
optional_period: 5000
52-
source:
53-
protocol: snmp
54-
id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
47+
# PSU2 not plugged
48+
# - name: bmc_psu_voltage_volt
49+
# labels: {"psu": "2"}
50+
# description: Voltage of PSU 2 reported by BMC, in volt
51+
# period: 0
52+
# optional_period: 5000
53+
# source:
54+
# protocol: snmp
55+
# id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
5556

5657
- name: bmc_psu_current_amp
5758
labels: {"psu": "1"}
@@ -63,15 +64,16 @@ metrics:
6364
protocol: snmp
6465
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
6566

66-
- name: bmc_psu_current_amp
67-
labels: {"psu": "2"}
68-
description: Current of PSU 2 reported by BMC, in amp
69-
period: 0
70-
optional_period: 5000
71-
scale_factor: 0.1
72-
source:
73-
protocol: snmp
74-
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
67+
# PSU2 not plugged
68+
# - name: bmc_psu_current_amp
69+
# labels: {"psu": "2"}
70+
# description: Current of PSU 2 reported by BMC, in amp
71+
# period: 0
72+
# optional_period: 5000
73+
# scale_factor: 0.1
74+
# source:
75+
# protocol: snmp
76+
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
7577

7678
- name: bmc_node_power_watt_total
7779
description: Cumulated power consumption of node reported by BMC, in watt

0 commit comments

Comments
 (0)