Enable passing input file, output file, and mibs dir on command line … #1028
Conversation
I think that makes sense for the But, would it even make sense for the |
|
For Generator path, yea, I think multi-file would be nice. Output, no, a single output file is fine. |
generator/net_snmp.go
Outdated
| C.netsnmp_set_mib_directory(C.CString(*userMibsDir)) | ||
| } else { | ||
| // Help the user find their MIB directories. | ||
| err = level.Info(logger).Log("msg", "Loading MIBs", "from", C.GoString(C.netsnmp_get_mib_directory())) |
There was a problem hiding this comment.
We don't need to worry about err from the logger. The error as actually never tripped due to the way the library works. This is why we ignore this in the golanci-lint config in the project.
Also, do we need to duplicate the log lines? Shouldn't C.netsnmp_get_mib_directory() return the correct thing after C.netsnmp_set_mib_directory()?
There was a problem hiding this comment.
The error as actually never tripped due to the way the library works.
🤦 Thanks! I'll fix those places where I somewhat mindlessly checked for the err.
There was a problem hiding this comment.
Shouldn't
C.netsnmp_get_mib_directory()return the correct thing afterC.netsnmp_set_mib_directory()?
Hmm, I'll check that. I would expect that it should.
…for the generate command Signed-off-by: dnck <[email protected]>
Signed-off-by: dnck <[email protected]>
Signed-off-by: dnck <[email protected]>
Signed-off-by: dnck <[email protected]>
|
@SuperQ - Thanks for your patience. I think this is now ready for another review. |
generator/tree.go
Outdated
| @@ -384,7 +393,10 @@ func generateConfigModule(cfg *ModuleConfig, node *Node, nameToNode map[string]* | |||
| if prevType == subtype { | |||
| metric.Indexes = metric.Indexes[:len(metric.Indexes)-1] | |||
| } else { | |||
| level.Warn(logger).Log("msg", "Can't handle index type on node, missing preceding", "node", n.Label, "type", index.Type, "missing", subtype) | |||
| err := level.Warn(logger).Log("msg", "Can't handle index type on node, missing preceding", "node", n.Label, "type", index.Type, "missing", subtype) | |||
There was a problem hiding this comment.
Same with these, please remove all the extraneous err checks you've added.
There was a problem hiding this comment.
I think I got them all now
Signed-off-by: dnck <[email protected]>
Signed-off-by: dnck <[email protected]>
Signed-off-by: dnck <[email protected]>
* [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 <[email protected]>
* [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 <[email protected]>
* [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 <[email protected]>
* [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 <[email protected]>
Description
@SuperQ @RichiH 👋
Hi there, I think this is a fairly trivial PR, but lmk what you think.
What's it do?
In order to facilitate the organization of snmp.ymls in different directories, I wanted a way to specify 1) the path to the
generator.yml, 2) the expected outputsnmp.yml, and 3) the directory of mibs.For this reason, I added a few flags to the cli
generator generatecommand group.With the PR, you can do something like,
./generator generate \ -g snmp-exporter/generator/myDevices/newManufacturer/generator.yml \ -o snmp-exporter/generator/myDevices/newManufacturer/snmp.yml \ -m snmp-exporter/generator/myDevices/shared-mibs \ -m snmp-exporter/generator/myDevices/newManufacturerwhich is helpful for me, and I hope for some others as well.