Merge pull request #3351 from thomasmckay/1311-remove-monit

1311 - remove buildmanager monit

Dockerfile

@@ -52,7 +52,6 @@ RUN apt-get update && apt-get upgrade -y \
      libsasl2-dev      \
      libsasl2-modules  \
      memcached         \
-     monit             \
      nginx             \
      nodejs            \
      optipng           \
@@ -93,7 +92,7 @@ COPY static/ package.json tsconfig.json webpack.config.js tslint.json yarn.lock
 RUN yarn install --ignore-engines
 
 
-RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin /etc/monit $QUAYDIR/static/fonts $QUAYDIR/static/ldn /usr/local/nginx/logs/
+RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin $QUAYDIR/static/fonts $QUAYDIR/static/ldn /usr/local/nginx/logs/
 
 RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache
 VOLUME ["/var/log", "/datastorage", "/tmp"]
@@ -130,11 +129,8 @@ RUN PYTHONPATH=$QUAYPATH venv/bin/python -m external_libraries
 RUN curl -fsSL https://ip-ranges.amazonaws.com/ip-ranges.json -o util/ipresolver/aws-ip-ranges.json
 
 # Set up the init system
-RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin /etc/monit static/fonts static/ldn /usr/local/nginx/logs/ \
+RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin static/fonts static/ldn /usr/local/nginx/logs/ \
     && cp $QUAYCONF/init/syslog-ng.conf /etc/syslog-ng/ \
-    && cp $QUAYCONF/kill-buildmanager.sh /usr/local/bin/kill-buildmanager.sh \
-    && cp $QUAYCONF/monitrc /etc/monit/monitrc \
-    && chmod 0600 /etc/monit/monitrc \
     && cp $QUAYCONF/init/logrotate.conf /etc/logrotate.conf \
     && cp .git/HEAD GIT_HEAD \
     && rm -rf /etc/service/syslog-forwarder

conf/init/service/batch/buildmanager/run

@@ -2,13 +2,10 @@
 
 echo 'Starting internal build manager'
 
-# Run monit to ensure the build manager is restarted if/when it locks up.
-monit
-
 # Run the build manager.
 QUAYPATH=${QUAYPATH:-"."}
 cd ${QUAYDIR:-"/"}
 export PYTHONPATH=$QUAYPATH
 exec venv/bin/python -m buildman.builder 2>&1
 
-echo 'Internal build manager exited'
+echo 'Internal build manager exited'

conf/kill-buildmanager.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-PID=$(cat /etc/service/buildmanager/supervise/pid)
-gcore -o /tmp/buildman.core $PID
-
-/usr/bin/sv kill /etc/service/buildmanager

conf/monitrc

@@ -1,17 +0,0 @@
-set daemon 10 with start delay 30
-
-set httpd port 2812 and
-    use address localhost  # only accept connection from localhost
-    allow localhost        # allow localhost to connect to the server and
-    allow admin:monit      # require user 'admin' with password 'monit'
-
-check host buildmanager with address localhost
-    start program = "/usr/bin/sv start /etc/service/buildmanager" with timeout 10 seconds
-    stop program  = "/usr/bin/sv kill /etc/service/buildmanager"
-    if failed port 8787 protocol http
-      request "/"
-      status = 405
-      with timeout 3 seconds
-      for 3 cycles
-      then restart
-    if 10 restarts within 10 cycles then timeout

quay-base.dockerfile

@@ -45,7 +45,6 @@ RUN apt-get update && apt-get upgrade -y \
      libsasl2-dev      \
      libsasl2-modules  \
      memcached         \
-     monit             \
      nginx             \
      nodejs            \
      optipng           \
@@ -90,7 +89,7 @@ COPY static/ package.json tsconfig.json webpack.config.js tslint.json yarn.lock
 RUN yarn install --ignore-engines
 
 
-RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin /etc/monit $QUAYDIR/static/fonts $QUAYDIR/static/ldn /usr/local/nginx/logs/
+RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin $QUAYDIR/static/fonts $QUAYDIR/static/ldn /usr/local/nginx/logs/
 
 COPY external_libraries.py _init.py ./