From 290d513c08f4101327ea1e62a5e12e750a5f3bed Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <christian.elberfeld@adesso.de> Date: Thu, 13 May 2021 14:45:09 +0200 Subject: [PATCH] versionen fixieren --- webserver/docker_icinga/templates/Dockerfile | 33 ++++++++++++------- .../etc/icinga/conf.d/commands2.conf | 2 +- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/webserver/docker_icinga/templates/Dockerfile b/webserver/docker_icinga/templates/Dockerfile index 5c53c359..d62b0f6f 100644 --- a/webserver/docker_icinga/templates/Dockerfile +++ b/webserver/docker_icinga/templates/Dockerfile @@ -1,12 +1,11 @@ FROM jordan/icinga2:2.12.1 -# Install additional Packages (Backports needed for Golang > 1.13) +# Install additional Packages RUN apt-get update \ - && apt-get install -y -q --no-install-recommends -t buster-backports \ + && apt-get install -y -q --no-install-recommends \ curl \ dnsutils \ git \ - golang \ jq \ libdata-validate-domain-perl \ libdata-validate-ip-perl \ @@ -27,16 +26,26 @@ COPY notify_by_pushover.sh /opt RUN chmod +x /opt/*.sh # check_mqtt -RUN cd /opt/ && git clone https://github.com/jpmens/check-mqtt.git +RUN cd /opt/ \ + && git clone https://github.com/jpmens/check-mqtt.git \ + && cd /opt/check-mqtt/ \ + && git checkout v3.0 # check_rbl -RUN cd /opt/ && git clone https://github.com/matteocorti/check_rbl.git +RUN cd /opt/ \ + && git clone https://github.com/matteocorti/check_rbl.git \ + && cd /opt/check_rbl/ \ + && git checkout v1.5.7 -# check_json -RUN cd /opt/ && git clone https://github.com/asymworks/check_json.git +# prom2json -- needed for check_metric_value +RUN cd /opt/ \ + && wget https://github.com/prometheus/prom2json/releases/download/v1.3.0/prom2json-1.3.0.linux-amd64.tar.gz \ + && tar --strip-components=1 -xzvf prom2json-1.3.0.linux-amd64.tar.gz \ + && chmod ugo+x /opt/prom2json + +# check_metric_value - commit from 16.12.2020 +RUN cd /opt/ \ + && git clone https://github.com/elberfeld/check_metric_value.git \ + && cd /opt/check_metric_value/ \ + && git checkout b94d3c3e78497a05e3b4520d33421f37e4d77985 -# prom2json (go 1.13 min reqired) -RUN cd /opt/ && GOPATH=/opt/ go get github.com/prometheus/prom2json/cmd/prom2json - -# check_metric_value -RUN cd /opt/ && git clone https://github.com/elberfeld/check_metric_value.git diff --git a/webserver/docker_icinga/templates/etc/icinga/conf.d/commands2.conf b/webserver/docker_icinga/templates/etc/icinga/conf.d/commands2.conf index f83a9075..7ff9ab0d 100644 --- a/webserver/docker_icinga/templates/etc/icinga/conf.d/commands2.conf +++ b/webserver/docker_icinga/templates/etc/icinga/conf.d/commands2.conf @@ -52,7 +52,7 @@ object CheckCommand "check_metric_value" { command = [ "/opt/check_metric_value/check_metric_value.py" ] arguments = { - "-P" = "/opt/bin/prom2json" + "-P" = "/opt/prom2json" "-U" = "$metric_url$" "-M" = "$metric_name$" "-n" = "$metric_labelname$" -- GitLab