diff options
| author | Kristian Lyngstol <kristian@bohemians.org> | 2016-11-11 12:31:01 +0100 |
|---|---|---|
| committer | Kristian Lyngstol <kristian@bohemians.org> | 2016-11-11 12:31:01 +0100 |
| commit | a611aeff3cf50c3cdd56d76a66e7795df57b375e (patch) | |
| tree | a57cb1d0c26790eefb2705bbfff3e10cce995590 | |
| parent | 2e0babfe617b32a8b4969e68ee903f0ded3c9a39 (diff) | |
Move mibs into data directory and automatically fetch them
| -rw-r--r-- | build/test/gondul-snmp-test.Dockerfile | 1 | ||||
| -rwxr-xr-x | build/test/snmpfetch-misc.sh | 4 | ||||
| -rwxr-xr-x | collectors/snmpfetchng.pl | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/build/test/gondul-snmp-test.Dockerfile b/build/test/gondul-snmp-test.Dockerfile index 3491831..9eb7065 100644 --- a/build/test/gondul-snmp-test.Dockerfile +++ b/build/test/gondul-snmp-test.Dockerfile @@ -15,6 +15,7 @@ RUN apt-get -y install \ snmpd \ libsnmp-perl \ perl-modules +RUN apt-get -y install wget tar RUN mkdir -p /opt/gondul COPY build/test/snmpd.conf /etc/snmp/ CMD /opt/gondul/build/test/snmpfetch-misc.sh diff --git a/build/test/snmpfetch-misc.sh b/build/test/snmpfetch-misc.sh index 95b005f..0453c59 100755 --- a/build/test/snmpfetch-misc.sh +++ b/build/test/snmpfetch-misc.sh @@ -1,3 +1,7 @@ #!/bin/bash service snmpd start +cd /opt/gondul/data +if [ ! -d mibs ]; then + ../extras/tools/get_mibs.sh +fi exec /opt/gondul/collectors/snmpfetchng.pl diff --git a/collectors/snmpfetchng.pl b/collectors/snmpfetchng.pl index 680c392..ab91e14 100755 --- a/collectors/snmpfetchng.pl +++ b/collectors/snmpfetchng.pl @@ -11,9 +11,9 @@ use nms qw(convert_mac); use IO::Socket::IP; SNMP::initMib(); -SNMP::addMibDirs("/opt/gondul/mibs/StandardMibs"); -SNMP::addMibDirs("/opt/gondul/mibs/JuniperMibs"); -SNMP::addMibDirs("/opt/gondul/mibs/CiscoMibs"); +SNMP::addMibDirs("/opt/gondul/data/mibs/StandardMibs"); +SNMP::addMibDirs("/opt/gondul/data/mibs/JuniperMibs"); +SNMP::addMibDirs("/opt/gondul/data/mibs/CiscoMibs"); SNMP::loadModules('ALL'); our $dbh = nms::db_connect(); |