Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Mikrotik neighbor indexes make them unique #986

Merged
merged 1 commit into from
Sep 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion generator/generator.yml
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
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