Skip to content

Commit d0cdb91

Browse files
Npeca75Npeca75
authored
[routeros] MIKROTIK-MIB update (librenms#18479)
* [routeros] MIKROTIK-MIB update * YAML & test
1 parent bf9f819 commit d0cdb91

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

‎mibs/mikrotik/MIKROTIK-MIB‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4169,30 +4169,22 @@ mtxrCtTotalEntries OBJECT-TYPE
41694169
MAX-ACCESS read-only
41704170
STATUS current
41714171
DESCRIPTION "Total number of connections"
4172-
::= { mtxrCtStatsGroup 1 }
4172+
::= { mtxrCT 1 }
41734173

41744174
mtxrCtIP4Entries OBJECT-TYPE
41754175
SYNTAX Counter32
41764176
MAX-ACCESS read-only
41774177
STATUS current
41784178
DESCRIPTION "Total number of ipv4 connections"
4179-
::= { mtxrCtStatsGroup 2 }
4179+
::= { mtxrCT 2 }
41804180

41814181
mtxrCtIP6Entries OBJECT-TYPE
41824182
SYNTAX Counter32
41834183
MAX-ACCESS read-only
41844184
STATUS current
41854185
DESCRIPTION "Total number of ipv6 connections"
4186-
::= { mtxrCtStatsGroup 3 }
4186+
::= { mtxrCT 3 }
41874187

4188-
mtxrCtStatsGroup OBJECT-GROUP OBJECTS {
4189-
mtxrCtTotalEntries,
4190-
mtxrCtIP4Entries,
4191-
mtxrCtIP6Entries
4192-
}
4193-
STATUS current
4194-
DESCRIPTION "Connection tracking information"
4195-
::= { mtxrCT 1 }
41964188
-- ***************************************************************************
41974189

41984190
END

‎resources/definitions/os_discovery/routeros.yaml‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,19 +244,34 @@ modules:
244244
index: mtxrDHCPLeaseCount.{{ $index }}
245245
-
246246
oid: MIKROTIK-MIB::mtxrCtTotalEntries
247-
num_oid: .1.3.6.1.4.1.14988.1.1.22.1.1.{{ $index }}
247+
num_oid: .1.3.6.1.4.1.14988.1.1.22.1.1.1.0
248248
descr: 'Total number of connections'
249-
index: mtxrCtTotalEntries.{{ $index }}
249+
index: mtxrCtTotalEntries.0
250250
group: Firewall
251+
skip_values:
252+
-
253+
oid: index
254+
op: not_ends
255+
value: '.1.0'
251256
-
252-
oid: MIKROTIK-MIB::mtxrCtIP4Entries
253-
num_oid: .1.3.6.1.4.1.14988.1.1.22.1.2.{{ $index }}
257+
oid: MIKROTIK-MIB::mtxrCtTotalEntries
258+
num_oid: .1.3.6.1.4.1.14988.1.1.22.1.1.2.0
254259
descr: 'Total number of ipv4 connections'
255-
index: mtxrCtIP4Entries.{{ $index }}
260+
index: mtxrCtIP4Entries.0
256261
group: Firewall
262+
skip_values:
263+
-
264+
oid: index
265+
op: not_ends
266+
value: '.2.0'
257267
-
258-
oid: MIKROTIK-MIB::mtxrCtIP6Entries
259-
num_oid: .1.3.6.1.4.1.14988.1.1.22.1.3.{{ $index }}
268+
oid: MIKROTIK-MIB::mtxrCtTotalEntries
269+
num_oid: .1.3.6.1.4.1.14988.1.1.22.1.1.3.0
260270
descr: 'Total number of ipv6 connections'
261-
index: mtxrCtIP6Entries.{{ $index }}
271+
index: mtxrCtIP6Entries.0
262272
group: Firewall
273+
skip_values:
274+
-
275+
oid: index
276+
op: not_ends
277+
value: '.3.0'

‎tests/data/routeros_rb750gr3.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"sysObjectID": ".1.3.6.1.4.1.14988.1",
88
"sysDescr": "RouterOS RB750Gr3",
99
"sysContact": "<private>",
10-
"version": "7.20beta2",
10+
"version": "7.20.4",
1111
"hardware": "RB750Gr3",
1212
"features": "Level 4",
1313
"location": "<private>",
@@ -3291,7 +3291,7 @@
32913291
"sensor_deleted": 0,
32923292
"sensor_class": "count",
32933293
"poller_type": "snmp",
3294-
"sensor_oid": ".1.3.6.1.4.1.14988.1.1.22.1.2.0",
3294+
"sensor_oid": ".1.3.6.1.4.1.14988.1.1.22.1.1.2.0",
32953295
"sensor_index": "mtxrCtIP4Entries.0",
32963296
"sensor_type": "routeros",
32973297
"sensor_descr": "Total number of ipv4 connections",
@@ -3316,7 +3316,7 @@
33163316
"sensor_deleted": 0,
33173317
"sensor_class": "count",
33183318
"poller_type": "snmp",
3319-
"sensor_oid": ".1.3.6.1.4.1.14988.1.1.22.1.3.0",
3319+
"sensor_oid": ".1.3.6.1.4.1.14988.1.1.22.1.1.3.0",
33203320
"sensor_index": "mtxrCtIP6Entries.0",
33213321
"sensor_type": "routeros",
33223322
"sensor_descr": "Total number of ipv6 connections",
@@ -3341,7 +3341,7 @@
33413341
"sensor_deleted": 0,
33423342
"sensor_class": "count",
33433343
"poller_type": "snmp",
3344-
"sensor_oid": ".1.3.6.1.4.1.14988.1.1.22.1.1.0",
3344+
"sensor_oid": ".1.3.6.1.4.1.14988.1.1.22.1.1.1.0",
33453345
"sensor_index": "mtxrCtTotalEntries.0",
33463346
"sensor_type": "routeros",
33473347
"sensor_descr": "Total number of connections",

‎tests/snmpsim/routeros_rb750gr3.snmprec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@
920920
1.3.6.1.4.1.14988.1.1.3.100.1.4.13|2|3
921921
1.3.6.1.4.1.14988.1.1.3.100.1.4.14|2|1
922922
1.3.6.1.4.1.14988.1.1.4.3.0|2|4
923-
1.3.6.1.4.1.14988.1.1.4.4.0|4|7.20beta2
923+
1.3.6.1.4.1.14988.1.1.4.4.0|4|7.20.4
924924
1.3.6.1.4.1.14988.1.1.6.1.0|66|9
925925
1.3.6.1.4.1.14988.1.1.7.3.0|4|6F3A071688EA
926926
1.3.6.1.4.1.14988.1.1.7.9.0|4|RB750Gr3
@@ -948,6 +948,6 @@
948948
1.3.6.1.4.1.14988.1.1.14.1.1.2.12|4|Vlan2
949949
1.3.6.1.4.1.14988.1.1.14.1.1.2.13|4|Vlan51
950950
1.3.6.1.4.1.14988.1.1.14.1.1.2.14|4|Vlan255
951-
1.3.6.1.4.1.14988.1.1.22.1.1.0|65|224
952-
1.3.6.1.4.1.14988.1.1.22.1.2.0|65|120
953-
1.3.6.1.4.1.14988.1.1.22.1.3.0|65|104
951+
1.3.6.1.4.1.14988.1.1.22.1.1.1.0|65|224
952+
1.3.6.1.4.1.14988.1.1.22.1.1.2.0|65|120
953+
1.3.6.1.4.1.14988.1.1.22.1.1.3.0|65|104

0 commit comments

Comments
 (0)