diff --git a/docker/prometheus/Dockerfile b/docker/prometheus/Dockerfile index 3219711..41b5da0 100644 --- a/docker/prometheus/Dockerfile +++ b/docker/prometheus/Dockerfile @@ -15,8 +15,10 @@ RUN curl -fsSL https://github.com/abtreece/confd/releases/download/v0.20.0/confd RUN mkdir /etc/prometheus/ +COPY ./confd/ /etc/confd/ + COPY prometheus.yml /etc/prometheus/prometheus.yml -COPY COPY ./supervisord/ /etc/supervisord/ +COPY ./supervisord/ /etc/supervisord/ CMD [ "supervisord", "-c", "/etc/supervisord/supervisord.conf" ] diff --git a/docker/prometheus/confd/conf.d/prometheus.toml b/docker/prometheus/confd/conf.d/prometheus.toml index 2d55055..b7dcf17 100644 --- a/docker/prometheus/confd/conf.d/prometheus.toml +++ b/docker/prometheus/confd/conf.d/prometheus.toml @@ -1,8 +1,6 @@ [template] src = "prometheus.tmpl" -dest = "/prometheus.yml" +dest = "/etc/prometheus/prometheus.yml" keys = [ "/time/", -]a - - +] \ No newline at end of file diff --git a/docker/prometheus/confd/conf.d/supervisord.toml b/docker/prometheus/confd/conf.d/supervisord.toml new file mode 100644 index 0000000..b0d0e0d --- /dev/null +++ b/docker/prometheus/confd/conf.d/supervisord.toml @@ -0,0 +1,6 @@ +[template] +src = "supervisord.tmpl" +dest = "/etc/supervisord/supervisord.conf" +keys = [ + "/time/" +] \ No newline at end of file diff --git a/docker/prometheus/confd/templates/supervisord.tmpl b/docker/prometheus/confd/templates/supervisord.tmpl new file mode 100644 index 0000000..6e8ace0 --- /dev/null +++ b/docker/prometheus/confd/templates/supervisord.tmpl @@ -0,0 +1,18 @@ +[supervisord] +nodaemon=true ; 让 supervisor 运行在前台,保持容器不退出 +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid + +[program:confd] +command=/usr/local/bin/confd -config-file /etc/confd/confd.toml +autostart=true +autorestart=true +stderr_logfile=/var/log/confd.err.log +stdout_logfile=/var/log/confd.out.log + +[program:prometheus] +command=/usr/local/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.retention.time={{ getv "/time/storage_interval" }} +autostart=true +autorestart=true +stderr_logfile=/var/log/prometheus.err.log +stdout_logfile=/var/log/prometheus.out.log diff --git a/opcua-exporter/Dockerfile b/opcua-exporter/Dockerfile index ea394ba..bcbd76c 100644 --- a/opcua-exporter/Dockerfile +++ b/opcua-exporter/Dockerfile @@ -47,6 +47,10 @@ RUN dnf update -y && \ RUN curl -fsSL https://github.com/abtreece/confd/releases/download/v0.20.0/confd-v0.20.0-linux-amd64.tar.gz | tar -xz -C /usr/local/bin && \ chmod +x /usr/local/bin/confd +RUN mkdir /etc/opcua + +COPY ./confd/ /etc/confd/ + COPY ./supervisord/ /etc/supervisord/ COPY --from=build /app/build/opcua_exporter /usr/local/bin