Skip to content
Snippets Groups Projects
Commit f8436e42 authored by Jens Sandmann's avatar Jens Sandmann
Browse files

upgrade all incinga related services, make linter happy

parent 10f4c134
No related branches found
No related tags found
No related merge requests found
FROM jordan/icinga2:2.12.1
FROM jordan/icinga2:2.13.1
# Install additional Packages
# Install additional Packages
RUN apt-get update \
&& apt-get install -y -q --no-install-recommends \
curl \
curl \
dnsutils \
git \
jq \
......@@ -20,32 +20,31 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /tmp/* /var/lib/apt/lists/* /var/cache/debconf/*-old
# Helper Scripe
COPY check_rbl_helper.sh /opt
COPY notify_by_pushover.sh /opt
# Helper Scripe
COPY check_rbl_helper.sh /opt
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 \
&& cd /opt/check-mqtt/ \
&& git checkout v3.0
&& git checkout 7df3d82c339b1b64e89c1a3d1050289924698f11
# check_rbl
RUN cd /opt/ \
&& git clone https://github.com/matteocorti/check_rbl.git \
&& cd /opt/check_rbl/ \
&& git checkout v1.5.7
&& git checkout v1.6.3
# 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
&& git checkout b94d3c3e78497a05e3b4520d33421f37e4d77985
......@@ -3,7 +3,7 @@
version: "2.4"
services:
app:
build: .
......@@ -43,14 +43,14 @@ services:
- traefik.enable=true
- traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
- traefik.http.routers.{{ servicename }}.entrypoints=websecure
- traefik.http.services.{{ servicename }}.loadbalancer.server.port=80
- traefik.http.services.{{ servicename }}.loadbalancer.server.port=80
networks:
- default
- web
db:
image: mariadb:10.5.8
image: mariadb:10.7.1
restart: always
ports:
- "{{ int_ip4 }}:{{mysql_port}}:3306"
......@@ -63,10 +63,10 @@ services:
MYSQL_USER: icinga
networks:
- default
graphite:
image: graphiteapp/graphite-statsd:1.1.7-6
image: graphiteapp/graphite-statsd:1.1.8-7
restart: always
volumes:
- "{{ basedir }}/graphite-conf/storage-schemas.conf:/opt/graphite/conf/storage-schemas.conf"
......@@ -80,10 +80,10 @@ services:
GRAPHITE_LOG_FILE_RENDERING: "-"
networks:
- default
networks:
web:
external: true
external: true
default:
driver: bridge
enable_ipv6: true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment