diff --git a/metricbeat/module/apache/_meta/Dockerfile b/metricbeat/module/apache/_meta/Dockerfile index b6239b871f91..06b9d21c98c5 100644 --- a/metricbeat/module/apache/_meta/Dockerfile +++ b/metricbeat/module/apache/_meta/Dockerfile @@ -1,4 +1,5 @@ FROM httpd:2.4.20 +RUN sed -i "/jessie-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf diff --git a/metricbeat/module/apache/_meta/Dockerfile.2.4.12 b/metricbeat/module/apache/_meta/Dockerfile.2.4.12 index f35ea2d95c03..8170e61ba4d1 100644 --- a/metricbeat/module/apache/_meta/Dockerfile.2.4.12 +++ b/metricbeat/module/apache/_meta/Dockerfile.2.4.12 @@ -1,4 +1,5 @@ FROM httpd:2.4.12 +RUN sed -i "/jessie-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf diff --git a/metricbeat/module/mongodb/_meta/Dockerfile b/metricbeat/module/mongodb/_meta/Dockerfile index 958ff456ce49..22ccbf5d16f3 100644 --- a/metricbeat/module/mongodb/_meta/Dockerfile +++ b/metricbeat/module/mongodb/_meta/Dockerfile @@ -1,3 +1,4 @@ FROM mongo:3.4 +RUN sed -i "/jessie-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y netcat HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 27017 diff --git a/metricbeat/module/mysql/_meta/Dockerfile b/metricbeat/module/mysql/_meta/Dockerfile index 65bee75e4e4e..443e542717ba 100644 --- a/metricbeat/module/mysql/_meta/Dockerfile +++ b/metricbeat/module/mysql/_meta/Dockerfile @@ -1,5 +1,8 @@ -FROM mysql:5.7.12 -RUN apt-get update && apt-get install -y netcat -HEALTHCHECK --interval=1s --retries=90 CMD nc -z localhost 3306 +ARG MYSQL_IMAGE=mysql:5.7.12 +FROM $MYSQL_IMAGE ENV MYSQL_ROOT_PASSWORD test + +HEALTHCHECK --interval=1s --retries=90 CMD mysql -u root -p$MYSQL_ROOT_PASSWORD -h$HOSTNAME -P 3306 -e "SHOW STATUS" > /dev/null + +COPY test.cnf /etc/mysql/conf.d/test.cnf diff --git a/metricbeat/module/mysql/_meta/test.cnf b/metricbeat/module/mysql/_meta/test.cnf new file mode 100644 index 000000000000..f759a49631d3 --- /dev/null +++ b/metricbeat/module/mysql/_meta/test.cnf @@ -0,0 +1,2 @@ +[mysqld] +bind-address = 0.0.0.0 diff --git a/metricbeat/module/nginx/_meta/Dockerfile b/metricbeat/module/nginx/_meta/Dockerfile index 855362ca156c..1edda281c62e 100755 --- a/metricbeat/module/nginx/_meta/Dockerfile +++ b/metricbeat/module/nginx/_meta/Dockerfile @@ -1,4 +1,5 @@ FROM nginx:1.9 +RUN sed -i "/jessie-updates/d" /etc/apt/sources.list RUN apt-get update && apt-get install -y curl HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status COPY ./nginx.conf /etc/nginx/