refactor: Centralize MIB include directory specification #4603

Merged
merged 3 commits into from Sep 28, 2016

Projects

None yet

4 participants

@murrant
Contributor
murrant commented Sep 26, 2016 edited

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

If $mibdir is specified, -M will be as follows:

-M $config['mib_dir'] . '/' . $mibdir . ':' . $config['mib_dir']

This means we exclude OS mibs and only use ours (we could prepend + if we want to include os mibs).
All snmp calls should only include the name of the subdirectory under the mibs directory.

Fixes: #3562

murrant added some commits Sep 26, 2016
@murrant murrant refactor: Centralize MIB include directory specification
The default is now:
```
$config['mib_dir'].'/mibdirname:'.$config['mib_dir']
```
This means we exclude OS mibs and only use ours  (we could prepend `+` if we want to include os mibs.
All snmp calls should only include the name of the subdirectory under the mibs directory.
e54cd22
@murrant murrant Remove d_echo from Proc
Fix snmpsim tests.
33362f3
@laf
Member
laf commented Sep 26, 2016

Will test over the next 24 - 48 hours.

@murrant murrant Merge remote-tracking branch 'upstream/master' into dont-use-os-mibs
18a2330
@murrant murrant added the Core label Sep 27, 2016
@scrutinizer-notifier

The inspection completed: 18 new issues

@laf laf merged commit edbb6ae into librenms:master Sep 28, 2016

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@murrant murrant deleted the murrant:dont-use-os-mibs branch Sep 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment