Merge pull request #2144 from RincewindsHat/refactor/check_snmp

Refactor check snmp:
 - Switch from executing `snmpget`/`snmpgetnext` to linking directly agains net-snmp
 - Refactor to use test abstraction -> allows for JSON output

3 files changed, 20 insertions, 3 deletions

diff --git a/.github/monitoring-plugins.spec b/.github/monitoring-plugins.spec
index 10799128..ce22606b 100644
--- a/.github/monitoring-plugins.spec
+++ b/.github/monitoring-plugins.spec
@@ -88,6 +88,9 @@ BuildRequires: postgresql-devel
 # check_radius
 BuildRequires: radcli-devel
 
+# check_snmp
+BuildRequires: net-snmp-devel
+
 %description
 Common files for Monitoring Plugins
 
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index f7b6cf9f..cffe98c5 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -24,6 +24,7 @@ apt-get -y install perl \
         libpq-dev \
         libradcli-dev \
         libnet-snmp-perl \
+        libsnmp-dev \
         procps \
         libdbi0-dev \
         libdbd-sqlite3 \
@@ -111,6 +112,8 @@ mkdir -p /var/lib/snmp/mib_indexes
 sed -e 's/^agentaddress.*/agentaddress 127.0.0.1/' -i /etc/snmp/snmpd.conf
 service snmpd start
 
+sed 's/^mibs ://' -i /etc/snmp/snmp.conf
+
 # start cron, will be used by check_nagios
 cron
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 57487eed..e01aa5fc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,9 +57,20 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get install -y --no-install-recommends m4 gettext automake autoconf make build-essential
-          sudo apt-get install -y --no-install-recommends perl autotools-dev libdbi-dev libldap2-dev libpq-dev \
-                                                          libmysqlclient-dev libradcli-dev libkrb5-dev libdbi0-dev \
-                                                          libdbd-sqlite3 libssl-dev libcurl4-openssl-dev liburiparser-dev
+          sudo apt-get install -y --no-install-recommends perl \
+            autotools-dev \
+            libdbi-dev \
+            libldap2-dev \
+            libpq-dev \
+            libmysqlclient-dev \
+            libradcli-dev \
+            libkrb5-dev \
+            libdbi0-dev \
+            libdbd-sqlite3 \
+            libssl-dev \
+            libcurl4-openssl-dev \
+            liburiparser-dev \
+            libsnmp-dev
 
       - name: Configure build
         run: |