Skip to content

Commit

Permalink
Updated Mikrotik neighbor indexes make them unique (prometheus#986)
Browse files Browse the repository at this point in the history 
Signed-off-by: Joffrey van Wageningen <joffrey@ne2000.nl>
Signed-off-by: Stephan Windischmann <windi@Stephans-MacBook-Pro.local>
  • Loading branch information
@jvwag
jvwag authored and Stephan Windischmann committed Oct 27, 2023
1 parent 000a303 commit 921e06a
Show file tree
Hide file tree
Showing 2 changed files with 142 additions and 25 deletions.
7 changes: 6 additions & 1 deletion generator/generator.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,12 @@ modules:
lookup: mtxrGaugeName
drop_source_indexes: true
- source_indexes: [mtxrNeighborIndex]
lookup: mtxrNeighborIpAddress
lookup: mtxrNeighborMacAddress
drop_source_indexes: true
- source_indexes: [mtxrNeighborIndex]
lookup: mtxrNeighborInterfaceID
- source_indexes: [mtxrNeighborInterfaceID]
lookup: ifName
drop_source_indexes: true
- source_indexes: [mtxrOpticalIndex]
lookup: mtxrOpticalName
Expand Down
160 changes: 136 additions & 24 deletions snmp.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14735,119 +14735,231 @@ modules:
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
help: ' - 1.3.6.1.4.1.14988.1.1.11.1.1.2'
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
help: ' - 1.3.6.1.4.1.14988.1.1.11.1.1.3'
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrNeighborVersion
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.4
type: DisplayString
help: ' - 1.3.6.1.4.1.14988.1.1.11.1.1.4'
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrNeighborPlatform
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.5
type: DisplayString
help: ' - 1.3.6.1.4.1.14988.1.1.11.1.1.5'
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrNeighborIdentity
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.6
type: DisplayString
help: ' - 1.3.6.1.4.1.14988.1.1.11.1.1.6'
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrNeighborSoftwareID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.7
type: DisplayString
help: ' - 1.3.6.1.4.1.14988.1.1.11.1.1.7'
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
help: ' - 1.3.6.1.4.1.14988.1.1.11.1.1.8'
indexes:
- labelname: mtxrNeighborIndex
type: gauge
- labelname: mtxrNeighborInterfaceID
type: gauge
lookups:
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborIpAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
type: InetAddressIPv4
labelname: mtxrNeighborMacAddress
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
type: PhysAddress48
- labels:
- mtxrNeighborIndex
labelname: mtxrNeighborInterfaceID
oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
type: gauge
- labels:
- mtxrNeighborInterfaceID
labelname: ifName
oid: 1.3.6.1.2.1.31.1.1.1.1
type: DisplayString
- labels: []
labelname: mtxrNeighborIndex
- labels: []
labelname: mtxrNeighborInterfaceID
- name: mtxrDate
oid: 1.3.6.1.4.1.14988.1.1.12.1
type: gauge
Expand Down

0 comments on commit 921e06a

Please sign in to comment.