Nagios python and ubuntu version upgrades

Ubuntu bionic and python 2.x to 3.x upgrades

Change-Id: I06399204d30c3607ab3bcb7cfd464a216571edea

nagios/Dockerfile.ubuntu_bionic

@@ -0,0 +1,71 @@
+ARG FROM=docker.io/ubuntu:bionic
+FROM ${FROM}
+
+ENV APACHE_FRONTEND_PORT 8000
+ENV APACHE_FRONTEND_SECURE_PORT 8443
+ENV ES_DSL_VERSION=5.4.0
+ENV ES_VERSION=5.5.3
+ENV KUBE_VERSION=1.16.2
+ENV NAGIOSADMIN_EMAIL nagios@localhost
+ENV NAGIOS_HOME /opt/nagios
+ENV NAGIOS_PLUGIN_DIR /usr/lib/nagios/plugins
+ENV VERSION=4.4.3
+
+RUN apt-get -o Acquire::ForceIPv4=true -y update \
+        && apt-get -y install curl apache2 checkinstall unzip libapache2-mod-php snmp snmpd snmp-mibs-downloader jq python-requests \
+        && apt-get -y install --no-install-recommends monitoring-plugins python3-pip \
+        && apt-get clean \
+        && rm -rf /var/lib/apt/lists/*
+
+RUN rm -f /usr/bin/python
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
+RUN pip3 --no-cache-dir install --upgrade pip3 \
+        && hash -r \
+        && pip3 --no-cache-dir install --upgrade setuptools \
+        && pip3 --no-cache-dir install --upgrade kubernetes \
+        && pip3 --no-cache-dir install --upgrade elasticsearch==${ES_VERSION} \
+        && pip3 --no-cache-dir install --upgrade elasticsearch-dsl==${ES_DSL_VERSION} \
+        && pip3 uninstall -y urllib3 \
+        && pip3 --no-cache-dir install urllib3==1.23
+
+RUN groupadd -g 3000 nagios
+RUN useradd -u 3000 -g nagios -d ${NAGIOS_HOME} -s /bin/bash -c 'Nagios Admin' nagios
+RUN adduser www-data nagios
+
+RUN TMP_DIR=$(mktemp --directory) ;\
+    cd ${TMP_DIR} ;\
+    curl -sSL https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\
+    mv ${TMP_DIR}/client/bin/kubectl /usr/local/bin/kubectl ;\
+    chmod +x /usr/local/bin/kubectl
+
+ADD https://assets.nagios.com/downloads/nagioscore/releases/nagios-${VERSION}.tar.gz ${TMP_DIR}/
+RUN cd ${TMP_DIR} && \
+        tar zxf ${TMP_DIR}/nagios-${VERSION}.tar.gz  && \
+        cd nagios-${VERSION} && \
+        ./configure --with-lockfile=/var/run/nagios.lock --prefix=${NAGIOS_HOME} --with-nagios-user=nagios --with-nagios-group=nagios --with-command-user=nagios --with-command-group=nagios && \
+        make all  && \
+        make install  && \
+        make install-init  && \
+        make install-config  && \
+        make install-commandmode  && \
+        make install-webconf  && \
+        cd ${TMP_DIR} && \
+        rm -rf nagios-* && \
+        rm -rf ${TMP_DIR}
+
+COPY apache2/sites-available/* /etc/apache2/sites-available/
+COPY apache2/ports.conf /etc/apache2/
+
+RUN  a2ensite nagios  && \
+        a2enmod cgi && \
+        a2dissite 000-default
+
+COPY scripts/entrypoint.sh /entrypoint.sh
+COPY plugins/* ${NAGIOS_PLUGIN_DIR}/
+COPY scripts/snmp-mibs/* /usr/share/snmp/mibs/
+
+EXPOSE ${APACHE_FRONTEND_PORT}/tcp
+EXPOSE ${APACHE_FRONTEND_SECURE_PORT}/tcp
+
+ENTRYPOINT ["/entrypoint.sh"]

nagios/build.sh

@@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/..
 
 IMAGE="nagios"
 VERSION=${VERSION:-latest}
-DISTRO=${DISTRO:-ubuntu_xenial}
+DISTRO=${DISTRO:-ubuntu_bionic}
 REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
 EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
 docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE}

nagios/plugins/nagiosutil.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright 2017 The Openstack-Helm Authors.