Trying to get the additional Plugins working again

tronyx · May 31, 2024 · a8093b4 · a8093b4
1 parent fb69c00
commit a8093b4
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 49 deletions.
diff --git a/Dockerfile.linux-amd64 b/Dockerfile.linux-amd64
@@ -226,29 +226,29 @@ RUN cd /opt && \
     #python2 get-pip.py && \
     #python3 get-pip.py && \
     #pip install --no-cache-dir "pymssql<2.2.0" && \
-    #pip3 install --no-cache-dir pymssql && \
-    #pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \
-    #pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
+    pip3 install --no-cache-dir pymssql && \
+    pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \
+    pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
     git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \
     git clone https://github.com/JasonRivers/nagios-plugins.git JR-Nagios-Plugins && \
     git clone https://github.com/justintime/nagios-plugins.git JE-Nagios-Plugins && \
-    #git clone https://github.com/nagiosenterprises/check_mssql_collection.git nagios-mssql && \
+    git clone https://github.com/nagiosenterprises/check_mssql_collection.git nagios-mssql && \
     git clone https://github.com/danfruehauf/nagios-plugins.git DF-Nagios-Plugins && \
-    #git clone https://github.com/jpmens/check-mqtt.git jpmens-mqtt && \
+    git clone https://github.com/jpmens/check-mqtt.git jpmens-mqtt && \
     chmod +x /opt/WL-Nagios-Plugins/check* && \
     chmod +x /opt/JE-Nagios-Plugins/check_mem/check_mem.pl && \
     chmod +x /opt/DF-Nagios-Plugins/check_sql/check_sql && \
     chmod +x /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins && \
     chmod +x /opt/DF-Nagios-Plugins/check_vpn/check_vpn && \
-    #chmod +x /opt/jpmens-mqtt/check-mqtt.py && \
+    chmod +x /opt/jpmens-mqtt/check-mqtt.py && \
     cp /opt/JE-Nagios-Plugins/check_mem/check_mem.pl ${NAGIOS_HOME}/libexec/ && \
-    #cp /opt/nagios-mssql/check_mssql_database.py ${NAGIOS_HOME}/libexec/ && \
-    #cp /opt/nagios-mssql/check_mssql_server.py ${NAGIOS_HOME}/libexec/ && \
+    cp /opt/nagios-mssql/check_mssql_database.py ${NAGIOS_HOME}/libexec/ && \
+    cp /opt/nagios-mssql/check_mssql_server.py ${NAGIOS_HOME}/libexec/ && \
     cp /opt/DF-Nagios-Plugins/check_sql/check_sql ${NAGIOS_HOME}/libexec/ && \
     cp /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins ${NAGIOS_HOME}/libexec/ && \
-    ######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \
-    cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/
-    #cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/
+    cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \
+    ######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/
+    cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/
 
 # Add check_apc.pl check
 COPY plugins/check_apc.pl ${NAGIOS_HOME}/libexec/

diff --git a/Dockerfile.linux-arm-v7 b/Dockerfile.linux-arm-v7
@@ -225,42 +225,42 @@ RUN cd /tmp && \
 
 # Install additional plugins
 RUN cd /opt && \
-    #export RUSTUP_HOME=/root/.rustup && \
-    #export CARGO_HOME=/root/.cargo && \
-    #curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sed 's#/proc/self/exe#\/bin\/sh#g' | sh -s -- --profile minimal -y && \
-    #. "/root/.cargo/env" && \
-    #export PATH="/root/.cargo/bin:$PATH" && \
+    export RUSTUP_HOME=/root/.rustup && \
+    export CARGO_HOME=/root/.cargo && \
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sed 's#/proc/self/exe#\/bin\/sh#g' | sh -s -- --profile minimal -y && \
+    . "/root/.cargo/env" && \
+    export PATH="/root/.cargo/bin:$PATH" && \
     #wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
     #wget -q https://bootstrap.pypa.io/get-pip.py && \
     #python2 get-pip.py && \
     #python3 get-pip.py && \
-    #echo "Cython==0.29.35" >> constraints.txt && \
-    #export PIP_CONSTRAINT="$(pwd)/constraints.txt" && \
+    echo "Cython==0.29.35" >> constraints.txt && \
+    export PIP_CONSTRAINT="$(pwd)/constraints.txt" && \
     #pip install --no-cache-dir "pymssql<2.2.0" && \
-    #pip3 install --no-cache-dir pymssql && \
+    pip3 install --break-system-packages --no-cache-dir pymssql && \
     #python3 -m pip install --upgrade pip && \
-    #pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt bcrypt && \
-    #pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
+    pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt bcrypt && \
+    pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
     git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \
     git clone https://github.com/JasonRivers/nagios-plugins.git JR-Nagios-Plugins && \
     git clone https://github.com/justintime/nagios-plugins.git JE-Nagios-Plugins && \
-    #git clone https://github.com/nagiosenterprises/check_mssql_collection.git nagios-mssql && \
+    git clone https://github.com/nagiosenterprises/check_mssql_collection.git nagios-mssql && \
     git clone https://github.com/danfruehauf/nagios-plugins.git DF-Nagios-Plugins && \
     git clone https://github.com/jpmens/check-mqtt.git jpmens-mqtt && \
     chmod +x /opt/WL-Nagios-Plugins/check* && \
     chmod +x /opt/JE-Nagios-Plugins/check_mem/check_mem.pl && \
     chmod +x /opt/DF-Nagios-Plugins/check_sql/check_sql && \
     chmod +x /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins && \
     chmod +x /opt/DF-Nagios-Plugins/check_vpn/check_vpn && \
-    #chmod +x /opt/jpmens-mqtt/check-mqtt.py && \
+    chmod +x /opt/jpmens-mqtt/check-mqtt.py && \
     cp /opt/JE-Nagios-Plugins/check_mem/check_mem.pl ${NAGIOS_HOME}/libexec/ && \
-    #cp /opt/nagios-mssql/check_mssql_database.py ${NAGIOS_HOME}/libexec/ && \
-    #cp /opt/nagios-mssql/check_mssql_server.py ${NAGIOS_HOME}/libexec/ && \
+    cp /opt/nagios-mssql/check_mssql_database.py ${NAGIOS_HOME}/libexec/ && \
+    cp /opt/nagios-mssql/check_mssql_server.py ${NAGIOS_HOME}/libexec/ && \
     cp /opt/DF-Nagios-Plugins/check_sql/check_sql ${NAGIOS_HOME}/libexec/ && \
     cp /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins ${NAGIOS_HOME}/libexec/ && \
-    #######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \
-    cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/
-    #cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/
+    cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \
+    #######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/
+    cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/
 
 # Add check_apc.pl check
 COPY plugins/check_apc.pl ${NAGIOS_HOME}/libexec/

diff --git a/Dockerfile.linux-arm64 b/Dockerfile.linux-arm64
@@ -229,32 +229,32 @@ RUN cd /opt && \
     #wget -q https://bootstrap.pypa.io/get-pip.py && \
     #python2 get-pip.py && \
     #python3 get-pip.py && \
-    #echo "Cython==0.29.35" >> constraints.txt && \
-    #export PIP_CONSTRAINT="$(pwd)/constraints.txt" && \
+    echo "Cython==0.29.35" >> constraints.txt && \
+    export PIP_CONSTRAINT="$(pwd)/constraints.txt" && \
     #pip install --no-cache-dir "pymssql<2.2.0" && \
-    #pip3 install --no-cache-dir pymssql && \
-    #pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \
-    #pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
+    pip3 install --break-system-packages --no-cache-dir pymssql && \
+    pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \
+    pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
     git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \
     git clone https://github.com/JasonRivers/nagios-plugins.git JR-Nagios-Plugins && \
     git clone https://github.com/justintime/nagios-plugins.git JE-Nagios-Plugins && \
-    #git clone https://github.com/nagiosenterprises/check_mssql_collection.git nagios-mssql && \
+    git clone https://github.com/nagiosenterprises/check_mssql_collection.git nagios-mssql && \
     git clone https://github.com/danfruehauf/nagios-plugins.git DF-Nagios-Plugins && \
-    #git clone https://github.com/jpmens/check-mqtt.git jpmens-mqtt && \
+    git clone https://github.com/jpmens/check-mqtt.git jpmens-mqtt && \
     chmod +x /opt/WL-Nagios-Plugins/check* && \
     chmod +x /opt/JE-Nagios-Plugins/check_mem/check_mem.pl && \
     chmod +x /opt/DF-Nagios-Plugins/check_sql/check_sql && \
     chmod +x /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins && \
     chmod +x /opt/DF-Nagios-Plugins/check_vpn/check_vpn && \
-    #chmod +x /opt/jpmens-mqtt/check-mqtt.py && \
+    chmod +x /opt/jpmens-mqtt/check-mqtt.py && \
     cp /opt/JE-Nagios-Plugins/check_mem/check_mem.pl ${NAGIOS_HOME}/libexec/ && \
-    #cp /opt/nagios-mssql/check_mssql_database.py ${NAGIOS_HOME}/libexec/ && \
-    #cp /opt/nagios-mssql/check_mssql_server.py ${NAGIOS_HOME}/libexec/ && \
+    cp /opt/nagios-mssql/check_mssql_database.py ${NAGIOS_HOME}/libexec/ && \
+    cp /opt/nagios-mssql/check_mssql_server.py ${NAGIOS_HOME}/libexec/ && \
     cp /opt/DF-Nagios-Plugins/check_sql/check_sql ${NAGIOS_HOME}/libexec/ && \
     cp /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins ${NAGIOS_HOME}/libexec/ && \
-    ######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \
-    cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/
-    #cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/
+    cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \
+    ######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/
+    cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/
 
 # Add check_apc.pl check
 COPY plugins/check_apc.pl ${NAGIOS_HOME}/libexec/

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Listing these as I wish to give the original users credit for their work.
 
 Things that I have changed/updated/added to date:
 
-* Updated the image to Ubuntu 24.04 LTS
+* Updated the image to Ubuntu 22.04 LTS
 * Updated Nagios Core to the current latest
 * Updated Nagios Plugins to current latest
 * Updated NRPE to current latest
@@ -33,7 +33,7 @@ Things that I have changed/updated/added to date:
 
 ## Information
 
-Nagios Core running on Ubuntu 24.04 LTS with NagiosGraph, NRPE, NCPA, NSCA, and NagiosTV.
+Nagios Core running on Ubuntu 22.04 LTS with NagiosGraph, NRPE, NCPA, NSCA, and NagiosTV.
 
 | Product | Version |
 | ------- | ------- |
@@ -61,12 +61,9 @@ docker pull ghcr.io/tronyx/nagios
 
 #### Versions/Docker Tags
 
-| Branch | Docker Tag | Notes |
-| ------- | ------- | ------- |
-| Master | `latest` | Master branch that is known to be stable. |
-| Develop | `develop` | My testing/development branch for base image and component updates. |
-| Ubuntu-22.04 | `ubuntu-22.04` | Older Ubuntu base version that still has Python 2 and the plugins that require it. Will keep this as up-to-date as possible. |
-
+* Master (:latest) - Master branch that is known to be stable.
+* Develop (:develop) - My testing/development branch for updates.
+* Ubuntu-22.04 (:ubuntu-22.04) - Older Ubuntu base version that still has Python 2 and the plugins that require it. Will keep this as up-to-date as possible.
 
 ### Running
 
@@ -128,5 +125,6 @@ The default credentials for the web interface are:
 * [WL-Nagios-Plugins](https://github.com/willixix/WL-NagiosPlugins) - Custom plugins from William Leibzon
 * [JE-Nagios-Plugins](https://github.com/justintime/nagios-plugins) - Custom plugins from Justin Ellison
 * [DF-Nagios-Plugins](https://github.com/danfruehauf/nagios-plugins) - Custom pluging for MSSQL monitoring from Dan Fruehauf
+* [check-mqtt](https://github.com/jpmens/check-mqtt.git) - Custom plugin for mqtt monitoring from Jan-Piet Mens
 * [NagiosTV](https://github.com/chriscareycode/nagiostv-react) - Monitor your Nagios server on a wall-mounted TV
 * [check_apc](https://exchange.nagios.org/directory/Plugins/Hardware/UPS/APC/check_apc-2Epl/details) - Check APC for status, health, and load