From 470496bc24c4d68793527ff871e49762fd7e98c5 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Fri, 13 Aug 2021 08:16:38 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -code-brand 6.4-20 all +code-brand 6.4-21 all -firefox 90.0.2+linuxmint1+tricia amd64 -firefox-locale-de 90.0.2+linuxmint1+tricia amd64 -firefox-locale-en 90.0.2+linuxmint1+tricia amd64 +firefox 91.0+linuxmint1+tricia amd64 +firefox-locale-de 91.0+linuxmint1+tricia amd64 +firefox-locale-en 91.0+linuxmint1+tricia amd64 -galera-3 25.3.33-bionic amd64 +galera-3 25.3.34-bionic amd64 -icinga2 2.12.5-1.bionic amd64 -icinga2-bin 2.12.5-1.bionic amd64 -icinga2-common 2.12.5-1.bionic all -icinga2-ido-mysql 2.12.5-1.bionic amd64 -icingacli 2.9.2-1.bionic all -icingaweb2 2.9.2-1.bionic all -icingaweb2-common 2.9.2-1.bionic all -icingaweb2-module-monitoring 2.9.2-1.bionic all +icinga2 2.13.0-1.bionic amd64 +icinga2-bin 2.13.0-1.bionic amd64 +icinga2-common 2.13.0-1.bionic all +icingacli 2.9.3-1.bionic all +icingaweb2 2.9.3-1.bionic all +icingaweb2-common 2.9.3-1.bionic all +icingaweb2-module-monitoring 2.9.3-1.bionic all -libc-ares2 1.14.0-1 amd64 +libc-ares2 1.14.0-1ubuntu0.1 amd64 -libdbi-perl 1.640-1ubuntu0.2 amd64 +libdbi-perl 1.640-1ubuntu0.3 amd64 -libmariadb3 1:10.3.30+maria~bionic amd64 +libmariadb3 1:10.3.31+maria~bionic amd64 -libmysqlclient18 1:10.3.30+maria~bionic amd64 +libmysqlclient18 1:10.3.31+maria~bionic amd64 -libpq5 10.17-0ubuntu0.18.04.1 amd64 +libpq5 10.18-0ubuntu0.18.04.1 amd64 -libsnapd-glib1 1.49-0ubuntu0.18.04.2 amd64 +libsnapd-glib1 1.58-0ubuntu0.18.04.0 amd64 -libssl-dev 1.1.1-1ubuntu2.1~18.04.9 amd64 +libssl-dev 1.1.1-1ubuntu2.1~18.04.10 amd64 -libssl1.1 1.1.1-1ubuntu2.1~18.04.9 amd64 +libssl1.1 1.1.1-1ubuntu2.1~18.04.10 amd64 -linux-libc-dev 4.15.0-151.157 amd64 +linux-libc-dev 4.15.0-153.160 amd64 -loolwsd 6.4.10-6 amd64 +loolwsd 6.4.10-9 amd64 -mariadb-client-10.3 1:10.3.30+maria~bionic amd64 -mariadb-client-core-10.3 1:10.3.30+maria~bionic amd64 -mariadb-common 1:10.3.30+maria~bionic all -mariadb-server 1:10.3.30+maria~bionic all -mariadb-server-10.3 1:10.3.30+maria~bionic amd64 -mariadb-server-core-10.3 1:10.3.30+maria~bionic amd64 +mariadb-client-10.3 1:10.3.31+maria~bionic amd64 +mariadb-client-core-10.3 1:10.3.31+maria~bionic amd64 +mariadb-common 1:10.3.31+maria~bionic all +mariadb-server 1:10.3.31+maria~bionic all +mariadb-server-10.3 1:10.3.31+maria~bionic amd64 +mariadb-server-core-10.3 1:10.3.31+maria~bionic amd64 -mysql-common 1:10.3.30+maria~bionic all +mysql-common 1:10.3.31+maria~bionic all -openssh-client 1:7.6p1-4ubuntu0.3 amd64 -openssh-server 1:7.6p1-4ubuntu0.3 amd64 -openssh-sftp-server 1:7.6p1-4ubuntu0.3 amd64 -openssl 1.1.1-1ubuntu2.1~18.04.9 amd64 -openvpn 2.4.4-2ubuntu1.5 amd64 +openssh-client 1:7.6p1-4ubuntu0.5 amd64 +openssh-server 1:7.6p1-4ubuntu0.5 amd64 +openssh-sftp-server 1:7.6p1-4ubuntu0.5 amd64 +openssl 1.1.1-1ubuntu2.1~18.04.10 amd64 +openvpn 2.4.4-2ubuntu1.6 amd64 -php-icinga 2.9.2-1.bionic all +php-icinga 2.9.3-1.bionic all -ssh-askpass-gnome 1:7.6p1-4ubuntu0.3 amd64 +ssh-askpass-gnome 1:7.6p1-4ubuntu0.5 amd64 -vim-icinga2 2.12.5-1.bionic all +vim-icinga2 2.13.0-1.bionic all -wireless-regdb 2020.11.20-0ubuntu1~18.04.1 all +wireless-regdb 2021.07.14-0ubuntu1~18.04.1 all --- .etckeeper | 3 +++ icinga2/features-available/influxdb.conf | 2 +- icinga2/features-available/influxdb2.conf | 27 ++++++++++++++++++++ icinga2/scripts/mail-host-notification.sh | 2 +- icinga2/scripts/mail-service-notification.sh | 2 +- 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 icinga2/features-available/influxdb2.conf diff --git a/.etckeeper b/.etckeeper index f7c0b7c0..7779cfe3 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2817,6 +2817,9 @@ maybe chmod 0600 'icinga2/features-available/ido-mysql.conf' maybe chown 'nagios' 'icinga2/features-available/influxdb.conf' maybe chgrp 'nagios' 'icinga2/features-available/influxdb.conf' maybe chmod 0644 'icinga2/features-available/influxdb.conf' +maybe chown 'nagios' 'icinga2/features-available/influxdb2.conf' +maybe chgrp 'nagios' 'icinga2/features-available/influxdb2.conf' +maybe chmod 0644 'icinga2/features-available/influxdb2.conf' maybe chown 'nagios' 'icinga2/features-available/livestatus.conf' maybe chgrp 'nagios' 'icinga2/features-available/livestatus.conf' maybe chmod 0644 'icinga2/features-available/livestatus.conf' diff --git a/icinga2/features-available/influxdb.conf b/icinga2/features-available/influxdb.conf index af842357..f0af37bd 100644 --- a/icinga2/features-available/influxdb.conf +++ b/icinga2/features-available/influxdb.conf @@ -1,6 +1,6 @@ /** * The InfluxdbWriter type writes check result metrics and - * performance data to an InfluxDB HTTP API + * performance data to an InfluxDB v1 HTTP API */ object InfluxdbWriter "influxdb" { diff --git a/icinga2/features-available/influxdb2.conf b/icinga2/features-available/influxdb2.conf new file mode 100644 index 00000000..53f7a217 --- /dev/null +++ b/icinga2/features-available/influxdb2.conf @@ -0,0 +1,27 @@ +/** + * The Influxdb2Writer type writes check result metrics and + * performance data to an InfluxDB v2 HTTP API + */ + +object Influxdb2Writer "influxdb2" { + //host = "127.0.0.1" + //port = 8086 + //organization = "monitoring" + //bucket = "icinga2" + //auth_token = "ABCDEvwxyz0189-_" + //flush_threshold = 1024 + //flush_interval = 10s + //host_template = { + // measurement = "$host.check_command$" + // tags = { + // hostname = "$host.name$" + // } + //} + //service_template = { + // measurement = "$service.check_command$" + // tags = { + // hostname = "$host.name$" + // service = "$service.name$" + // } + //} +} diff --git a/icinga2/scripts/mail-host-notification.sh b/icinga2/scripts/mail-host-notification.sh index 2a2c011f..744481a7 100755 --- a/icinga2/scripts/mail-host-notification.sh +++ b/icinga2/scripts/mail-host-notification.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license diff --git a/icinga2/scripts/mail-service-notification.sh b/icinga2/scripts/mail-service-notification.sh index c901f234..8e560ac2 100755 --- a/icinga2/scripts/mail-service-notification.sh +++ b/icinga2/scripts/mail-service-notification.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license -- 2.43.0