Skip to content

Commit 14f988c

Browse files
laflaf
authored
Update os discovery yaml to use MIB::OID 3 (librenms#18962)
1 parent e47768a commit 14f988c

File tree

10 files changed

+368
-351
lines changed

10 files changed

+368
-351
lines changed

‎resources/definitions/os_discovery/algcom-dc-ups.yaml‎

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,92 @@
1-
mib: ALGPOWER-v2-MIB
21
modules:
32
sensors:
43
voltage:
54
data:
65
-
7-
oid: outputVoltage
6+
oid: ALGPOWER-v2-MIB::outputVoltage
87
num_oid: '.1.3.6.1.4.1.49136.1.1.1.{{ $index }}'
98
divisor: 10
109
descr: 'DC Voltage'
1110
index: outputVoltage
1211
-
13-
oid: batteryVoltage
12+
oid: ALGPOWER-v2-MIB::batteryVoltage
1413
num_oid: '.1.3.6.1.4.1.49136.1.2.1.{{ $index }}'
1514
divisor: 10
1615
descr: 'Battery Voltage'
1716
index: batteryVoltage
1817
-
19-
oid: supplyVoltage
18+
oid: ALGPOWER-v2-MIB::supplyVoltage
2019
num_oid: '.1.3.6.1.4.1.49136.1.6.1.{{ $index }}'
2120
divisor: 10
2221
descr: 'AC Voltage (Optional)'
2322
index: supplyVoltage
2423
-
25-
oid: btst-volt-i
24+
oid: ALGPOWER-v2-MIB::btst-volt-i
2625
num_oid: '.1.3.6.1.4.1.49136.1.8.5.{{ $index }}'
2726
divisor: 10
2827
descr: 'Bat-test initial'
2928
index: btst-volt-i
3029
-
31-
oid: btst-volt-f
30+
oid: ALGPOWER-v2-MIB::btst-volt-f
3231
num_oid: '.1.3.6.1.4.1.49136.1.8.7.{{ $index }}'
3332
divisor: 10
3433
descr: 'Bat-test final'
3534
index: btst-volt-f
3635
current:
3736
data:
3837
-
39-
oid: outputCurrent
38+
oid: ALGPOWER-v2-MIB::outputCurrent
4039
num_oid: '.1.3.6.1.4.1.49136.1.1.2.{{ $index }}'
4140
divisor: 1000
4241
descr: 'Total output current'
4342
index: outputCurrent
4443
-
45-
oid: batteryCurrent
44+
oid: ALGPOWER-v2-MIB::batteryCurrent
4645
num_oid: '.1.3.6.1.4.1.49136.1.2.2.{{ $index }}'
4746
divisor: 1000
4847
descr: 'Battery current'
4948
index: batteryCurrent
5049
-
51-
oid: btst-amp-i
50+
oid: ALGPOWER-v2-MIB::btst-amp-i
5251
num_oid: '.1.3.6.1.4.1.49136.1.8.6.{{ $index }}'
5352
divisor: 1000
5453
descr: 'Bat-test initial'
5554
index: btst-amp-i
5655
-
57-
oid: btst-amp-f
56+
oid: ALGPOWER-v2-MIB::btst-amp-f
5857
num_oid: '.1.3.6.1.4.1.49136.1.8.8.{{ $index }}'
5958
divisor: 1000
6059
descr: 'Bat-test final'
6160
index: btst-amp-f
6261
temperature:
6362
data:
6463
-
65-
oid: innerTemperature
64+
oid: ALGPOWER-v2-MIB::innerTemperature
6665
num_oid: '.1.3.6.1.4.1.49136.1.4.1.{{ $index }}'
6766
multiplier: 1
6867
descr: 'Internal temperature'
6968
index: innerTemperature
7069
-
71-
oid: outerTemperature
70+
oid: ALGPOWER-v2-MIB::outerTemperature
7271
num_oid: '.1.3.6.1.4.1.49136.1.4.2.{{ $index }}'
7372
multiplier: 1
7473
descr: 'External probe temperature'
7574
index: outerTemperature
7675
-
77-
oid: heatSinkTemperature
76+
oid: ALGPOWER-v2-MIB::heatSinkTemperature
7877
num_oid: '.1.3.6.1.4.1.49136.1.4.3.{{ $index }}'
7978
multiplier: 1
8079
descr: 'Heatsink temperature'
8180
index: heatSinkTemperature
8281
state:
8382
data:
8483
-
85-
oid: chargerStatus
84+
oid: ALGPOWER-v2-MIB::chargerStatus
85+
value: ALGPOWER-v2-MIB::chargerStatus
8686
num_oid: '.1.3.6.1.4.1.49136.1.2.3.{{ $index }}'
8787
descr: 'Charger Status'
8888
index: chargerStatus
89+
state_name: chargerStatus
8990
states:
9091
- { graph: 1, value: 0, generic: 2, descr: BATTERY_DISCONNECTED }
9192
- { graph: 1, value: 1, generic: 2, descr: WRONG_BATTERY_VOLTAGE }
@@ -96,63 +97,79 @@ modules:
9697
- { graph: 1, value: 6, generic: 2, descr: CRITICAL_LOW_VOLTAGE }
9798
- { graph: 1, value: 7, generic: 0, descr: BATTERY_UNDER_TEST }
9899
-
99-
oid: alarmOnBattery
100+
oid: ALGPOWER-v2-MIB::alarmOnBattery
101+
value: ALGPOWER-v2-MIB::alarmOnBattery
100102
num_oid: '.1.3.6.1.4.1.49136.1.3.1.{{ $index }}'
101103
descr: 'Operation Mode'
102104
index: alarmOnBattery
105+
state_name: alarmOnBattery
103106
states:
104107
- { graph: 1, value: 0, generic: 0, descr: AC }
105108
- { graph: 1, value: 1, generic: 1, descr: BATTERY }
106109
-
107-
oid: acFail
110+
oid: ALGPOWER-v2-MIB::acFail
111+
value: ALGPOWER-v2-MIB::acFail
108112
num_oid: '.1.3.6.1.4.1.49136.1.3.2.{{ $index }}'
109113
descr: 'AC Power'
110114
index: acFail
115+
state_name: acFail
111116
states:
112117
- { graph: 1, value: 0, generic: 0, descr: OK }
113118
- { graph: 1, value: 1, generic: 1, descr: FAIL }
114119
-
115-
oid: batteryCharging
120+
oid: ALGPOWER-v2-MIB::batteryCharging
121+
value: ALGPOWER-v2-MIB::batteryCharging
116122
num_oid: '.1.3.6.1.4.1.49136.1.3.3.{{ $index }}'
117123
descr: 'Charging'
118124
index: batteryCharging
125+
state_name: batteryCharging
119126
states:
120127
- { graph: 1, value: 0, generic: 0, descr: NO }
121128
- { graph: 1, value: 1, generic: 0, descr: YES }
122129
-
123-
oid: batteryDischarging
130+
oid: ALGPOWER-v2-MIB::batteryDischarging
131+
value: ALGPOWER-v2-MIB::batteryDischarging
124132
num_oid: '.1.3.6.1.4.1.49136.1.3.4.{{ $index }}'
125133
descr: 'Discharging'
126134
index: batteryDischarging
135+
state_name: batteryDischarging
127136
states:
128137
- { graph: 1, value: 0, generic: 0, descr: NO }
129138
- { graph: 1, value: 1, generic: 0, descr: YES }
130139
-
131-
oid: overheat
140+
oid: ALGPOWER-v2-MIB::overheat
141+
value: ALGPOWER-v2-MIB::overheat
132142
num_oid: '.1.3.6.1.4.1.49136.1.3.5.{{ $index }}'
133143
descr: 'Temperature Status'
134144
index: overheat
145+
state_name: overheat
135146
states:
136147
- { graph: 1, value: 0, generic: 0, descr: OK }
137148
- { graph: 1, value: 1, generic: 2, descr: OVERHEAT }
138149
-
139-
oid: overload
150+
oid: ALGPOWER-v2-MIB::overload
151+
value: ALGPOWER-v2-MIB::overload
140152
num_oid: '.1.3.6.1.4.1.49136.1.3.6.{{ $index }}'
141153
descr: 'Load Capacity'
142154
index: overload
155+
state_name: overload
143156
states:
144157
- { graph: 1, value: 0, generic: 0, descr: OK }
145158
- { graph: 1, value: 1, generic: 2, descr: OVERLOAD }
146159
-
147-
oid: fanAfail
160+
oid: ALGPOWER-v2-MIB::fanAfail
161+
value: ALGPOWER-v2-MIB::fanAfail
162+
state_name: fanAfail
148163
num_oid: '.1.3.6.1.4.1.49136.1.3.7.{{ $index }}'
149164
descr: 'Fan A'
150165
index: fanAfail
151166
states:
152167
- { graph: 0, value: 0, generic: 0, descr: OK }
153168
- { graph: 0, value: 1, generic: 2, descr: FAIL }
154169
-
155-
oid: fanBfail
170+
oid: ALGPOWER-v2-MIB::fanBfail
171+
value: ALGPOWER-v2-MIB::fanBfail
172+
state_name: fanBfail
156173
num_oid: '.1.3.6.1.4.1.49136.1.3.8.{{ $index }}'
157174
descr: 'Fan B'
158175
index: fanBfail
@@ -162,7 +179,8 @@ modules:
162179
count:
163180
data:
164181
-
165-
oid: upTime
182+
oid: ALGPOWER-v2-MIB::upTime
183+
value: ALGPOWER-v2-MIB::upTime
166184
num_oid: '.1.3.6.1.4.1.49136.1.3.11.{{ $index }}'
167185
descr: 'Horimeter'
168186
multiplier: 1

‎resources/definitions/os_discovery/aloha.yaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
mib: EXCELIANCE-MIB
21
modules:
32
os:
43
hardware: EXCELIANCE-MIB::alHardwareModel
@@ -9,35 +8,35 @@ modules:
98
state:
109
data:
1110
-
12-
oid: alFrontendTable
13-
value: alFrontendStatus
11+
oid: EXCELIANCE-MIB::alFrontendTable
12+
value: EXCELIANCE-MIB::alFrontendStatus
1413
num_oid: '.1.3.6.1.4.1.23263.4.2.1.3.2.1.13.{{ $index }}'
1514
index: 'alFrontendStatus.{{ $index }}'
16-
descr: alFrontendName
15+
descr: EXCELIANCE-MIB::alFrontendName
1716
state_name: alFrontendStatus
1817
group: "Frontend status"
1918
states:
2019
- { value: 0, generic: 0, graph: 1, descr: no }
2120
- { value: 1, generic: 0, graph: 1, descr: OPEN }
2221

2322
-
24-
oid: alBackendTable
25-
value: alBackendStatus
23+
oid: EXCELIANCE-MIB::alBackendTable
24+
value: EXCELIANCE-MIB::alBackendStatus
2625
num_oid: '.1.3.6.1.4.1.23263.4.2.1.3.3.1.20.{{ $index }}'
2726
index: 'alBackendStatus.{{ $index }}'
28-
descr: alBackendName
27+
descr: EXCELIANCE-MIB::alBackendName
2928
group: "Backend status"
3029
state_name: alBackendStatus
3130
states:
3231
- { value: 2, generic: 1, graph: 1, descr: DOWN }
3332
- { value: 1, generic: 0, graph: 1, descr: UP }
3433

3534
-
36-
oid: alServerTable
37-
value: alServerStatus
35+
oid: EXCELIANCE-MIB::alServerTable
36+
value: EXCELIANCE-MIB::alServerStatus
3837
num_oid: '.1.3.6.1.4.1.23263.4.2.1.3.4.1.19.{{ $index }}'
3938
index: 'alServerStatus.{{ $index }}'
40-
descr: alServerName
39+
descr: EXCELIANCE-MIB::alServerName
4140
#group: "{{ $alBackendTable }}.{{ $alServerBackendID }}"
4241
group: 'Server status'
4342
state_name: alServerStatus

0 commit comments

Comments
 (0)