Icinga v 2.13.2

New version:

- Icinga [v2.13.2](https://github.com/Icinga/icinga2/releases/tag/v2.13.2)
- Fixes #1 #2 #3

See merge request !5

.gitlab-ci.yml

@@ -10,7 +10,7 @@ before_script:
 build-stable:
   stage: build
   script:
-    - /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:2 --destination $CI_REGISTRY_IMAGE:2.13 --destination $CI_REGISTRY_IMAGE:2.13.1
+    - /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:2 --destination $CI_REGISTRY_IMAGE:2.13 --destination $CI_REGISTRY_IMAGE:2.13.2
   only:
     - stable
 

Dockerfile

@@ -6,7 +6,7 @@ RUN printf "Running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATF
 # Basic info
 ARG NAME
 ARG BUILD_DATE
-ARG VERSION=2.13.1
+ARG VERSION=2.13.2
 ARG VCS_REF
 ARG VCS_URL
 
@@ -22,6 +22,7 @@ LABEL maintainer="Marek Jaroš <jaros@ics.muni.cz>" \
 	org.label-schema.schema-version="1.0"
 
 ENV CODENAME=bullseye
+ENV PACKAGE=2.13.2-1.${CODENAME}
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en
 
 # Prepare environment
@@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 		libconfig-inifiles-perl \
 		libnumber-format-perl \
 		libdatetime-perl \
+		libldap-common \
 		fping \
 		squidclient \
 		rsyslog \
@@ -98,14 +100,14 @@ COPY content/ /
 RUN export DEBIAN_FRONTEND=noninteractive \
 	&& curl -s https://packages.icinga.com/icinga.key | gpg --dearmor > /usr/share/keyrings/icinga-keyring.gpg \
 	&& curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgres-keyring.gpg \
-	&& echo "deb [signed-by=/usr/share/keyrings/icinga-keyring.gpg] https://packages.icinga.com/debian icinga-$CODENAME main" > /etc/apt/sources.list.d/icinga2.list \
-	&& echo "deb [signed-by=/usr/share/keyrings/postgres-keyring.gpg] https://apt.postgresql.org/pub/repos/apt/ $CODENAME-pgdg main" > /etc/apt/sources.list.d/$CODENAME-pgdg.list \
+	&& echo "deb [signed-by=/usr/share/keyrings/icinga-keyring.gpg] https://packages.icinga.com/debian icinga-${CODENAME} main" > /etc/apt/sources.list.d/icinga2.list \
+	&& echo "deb [signed-by=/usr/share/keyrings/postgres-keyring.gpg] https://apt.postgresql.org/pub/repos/apt/ ${CODENAME}-pgdg main" > /etc/apt/sources.list.d/${CODENAME}-pgdg.list \
 	&& apt-get update \
 	&& apt-get install -y -f --no-install-recommends -o DPkg::options::="--force-unsafe-io" \
-		icinga2 \
-		icinga2-bin \
-		icinga2-common \
-		icinga2-ido-pgsql \
+		icinga2=${PACKAGE} \
+		icinga2-bin=${PACKAGE} \
+		icinga2-common=${PACKAGE} \
+		icinga2-ido-pgsql=${PACKAGE} \
 		postgresql-client-13 \
 		monitoring-plugins \
 		monitoring-plugins-contrib \

content/opt/setup/70-icinga2-influxdb

@@ -11,7 +11,7 @@ if evaluate_boolean "${ICINGA2_FEATURE_INFLUXDB}"; then
 	ICINGA2_FEATURE_INFLUXDB_DB=${ICINGA2_FEATURE_INFLUXDB_DB:-icinga2_db}
 	ICINGA2_FEATURE_INFLUXDB_USER=${ICINGA2_FEATURE_INFLUXDB_USER:-icinga2}
 	ICINGA2_FEATURE_INFLUXDB_PASS=${ICINGA2_FEATURE_INFLUXDB_PASS}
-	ICINGA2_FEATURE_INFLUXDB_SSL=${ICINGA2_FEATURE_INFLUXDB_SSL:-True}
+	ICINGA2_FEATURE_INFLUXDB_SSL=${ICINGA2_FEATURE_INFLUXDB_SSL:-true}
 
 	echo "InfluxDB: Enabling Icinga2 InfluxDB writer"
 

docker-compose.yml

@@ -24,7 +24,6 @@ services:
     hostname: pgsql
     container_name: pgsql
     restart: always
-    mem_swappiness: 0
     networks:
       icinet:
     environment:
@@ -35,7 +34,6 @@ services:
     container_name: icinga
     restart: always
     hostname: 'icinga'
-    mem_swappiness: 0
     networks:
       icinet:
     ports: