Fix generator lookups to match OIDs closer to the index OID. #828
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…label Signed-off-by: Windischmann, Stephan <stephan.windischmann@sky.uk>
stephan-windischmann-sky
force-pushed
the
generator_lookup_oid
branch
from
72aff0b
to
3f70dc1
Compare
|
Interesting, can you point to any specific OIDs where this changes things? |
I have attached the MIB with which we noticed the issue. As an example, both SYMSOFT-SS7FILTER-0-MIB.txt and SYMSOFT-TRAFFICSIMULATOR-0-MIB.txt both have nodes with the label layerName. This is used to lookup a human readable name. |
|
Interesting, I was hoping this would fix the conflict in |
SuperQ
approved these changes
Sep 2, 2023
|
It looks like this affects the raritan module. Does the output change look right to you? Would you mind updating the snmp.yml so the generator test passes? |
SuperQ
requested changes
Sep 17, 2023
Signed-off-by: stephan-windischmann-sky <120649376+stephan-windischmann-sky@users.noreply.github.com>
stephan-windischmann-sky
force-pushed
the
generator_lookup_oid
branch
from
53ff90b
to
d0f6670
Compare
|
The changes in snmp.yml look good to me. Thanks. |
|
Yikes, it looks like the git history got messed up. |
Signed-off-by: Stephan Windischmann <windi@Stephans-MacBook-Pro.local>
stephan-windischmann-sky
force-pushed
the
generator_lookup_oid
branch
from
d0f6670
to
ba620cb
Compare
|
Fixed git messup. snmp.yml is updated. |
SuperQ
changed the title
SuperQ
approved these changes
Oct 28, 2023
|
Nice, thanks. |
SuperQ
added a commit
that referenced
this pull request
Nov 24, 2023
* [ENHANCEMENT] generator: Add support for subsequent address family #782 * [ENHANCEMENT] generator: Fix lookups to match OIDs closer to the index OID. #828 * [FEATURE] Add a scaling factor #1026 * [FEATURE] generator: Enable passing input file, output file, and mibs dir as flags #1028 * [FEATURE] Add an offset factor #1029 * [BUGFIX] Fix and optimize generator Docker image building #1045 snmp.yml changes: * Override `bsnAPName` to DisplayString #660 * Import TP-Link EAP MIB #833 * Updated Mikrotik neighbor indexes make them unique #986 * Update PowerNet MIB to v4.5.1 #1003 * Refactor HOST-RESOURCES-MIB #1027 * Update keepalived MIB files to latest version #1044 Signed-off-by: SuperQ <superq@gmail.com>
Merged
SuperQ
added a commit
that referenced
this pull request
Nov 26, 2023
* [ENHANCEMENT] generator: Add support for subsequent address family #782 * [ENHANCEMENT] generator: Fix lookups to match OIDs closer to the index OID. #828 * [FEATURE] Add a scaling factor #1026 * [FEATURE] generator: Enable passing input file, output file, and mibs dir as flags #1028 * [FEATURE] Add an offset factor #1029 * [BUGFIX] Fix and optimize generator Docker image building #1045 snmp.yml changes: * Override `bsnAPName` to DisplayString #660 * Import TP-Link EAP MIB #833 * Updated Mikrotik neighbor indexes make them unique #986 * Update PowerNet MIB to v4.5.1 #1003 * Refactor HOST-RESOURCES-MIB #1027 * Update keepalived MIB files to latest version #1044 Signed-off-by: SuperQ <superq@gmail.com>
SuperQ
added a commit
that referenced
this pull request
Dec 6, 2023
* [ENHANCEMENT] generator: Add support for subsequent address family #782 * [ENHANCEMENT] generator: Fix lookups to match OIDs closer to the index OID. #828 * [FEATURE] Add a scaling factor #1026 * [FEATURE] generator: Enable passing input file, output file, and mibs dir as flags #1028 * [FEATURE] Add an offset factor #1029 * [BUGFIX] Fix and optimize generator Docker image building #1045 snmp.yml changes: * Override `bsnAPName` to DisplayString #660 * Import TP-Link EAP MIB #833 * Updated Mikrotik neighbor indexes make them unique #986 * Update PowerNet MIB to v4.5.1 #1003 * Refactor HOST-RESOURCES-MIB #1027 * Update keepalived MIB files to latest version #1044 Signed-off-by: SuperQ <superq@gmail.com>
SuperQ
added a commit
that referenced
this pull request
Dec 10, 2023
* [ENHANCEMENT] generator: Add support for subsequent address family #782 * [ENHANCEMENT] generator: Fix lookups to match OIDs closer to the index OID. #828 * [FEATURE] Add a scaling factor #1026 * [FEATURE] generator: Enable passing input file, output file, and mibs dir as flags #1028 * [FEATURE] Add an offset factor #1029 * [BUGFIX] Fix and optimize generator Docker image building #1045 snmp.yml changes: * Override `bsnAPName` to DisplayString #660 * Import TP-Link EAP MIB #833 * Updated Mikrotik neighbor indexes make them unique #986 * Update PowerNet MIB to v4.5.1 #1003 * Refactor HOST-RESOURCES-MIB #1027 * Update keepalived MIB files to latest version #1044 Signed-off-by: SuperQ <superq@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When running the configuration generator with lookups were multilpe different nodes have the same label the generator was always grabbing the OID of the last MIB that was parsed.
I modified the lookup mechanism to first attempt to match the lookup node so that the OID matches that of the metric in all but the last branch.
In case no match is found, it reverts to the old behavior.