committing changes in /etc made by "apt dist-upgrade -y"

Package changes:
-apache2 2.4.38-3+deb10u3 amd64
-apache2-bin 2.4.38-3+deb10u3 amd64
-apache2-data 2.4.38-3+deb10u3 all
-apache2-utils 2.4.38-3+deb10u3 amd64
+apache2 2.4.38-3+deb10u4 amd64
+apache2-bin 2.4.38-3+deb10u4 amd64
+apache2-data 2.4.38-3+deb10u4 all
+apache2-utils 2.4.38-3+deb10u4 amd64
-bind9 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
-bind9-host 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
-bind9utils 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
+bind9 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
+bind9-host 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
+bind9utils 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
-dnsutils 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
+dnsutils 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
-icinga2 2.11.4-1.buster amd64
-icinga2-bin 2.11.4-1.buster amd64
-icinga2-common 2.11.4-1.buster all
-icinga2-ido-pgsql 2.11.4-1.buster amd64
-icingacli 2.8.1-1.buster all
-icingaweb2 2.8.1-1.buster all
-icingaweb2-common 2.8.1-1.buster all
-icingaweb2-module-monitoring 2.8.1-1.buster all
+icinga2 2.12.0-1.buster amd64
+icinga2-bin 2.12.0-1.buster amd64
+icinga2-common 2.12.0-1.buster all
+icinga2-ido-pgsql 2.12.0-1.buster amd64
+icingacli 2.8.2-1.buster all
+icingaweb2 2.8.2-1.buster all
+icingaweb2-common 2.8.2-1.buster all
+icingaweb2-module-monitoring 2.8.2-1.buster all
-libbind9-161 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
+libbind9-161 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
-libdns-export1104 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
-libdns1104 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
+libdns-export1104 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
+libdns1104 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
-libirs161 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
-libisc-export1100 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
-libisc1100 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
-libisccc161 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
-libisccfg163 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
+libirs161 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
+libisc-export1100 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
+libisc1100 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
+libisccc161 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
+libisccfg163 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
-libjson-c3 0.12.1+ds-2 amd64
+libjson-c3 0.12.1+ds-2+deb10u1 amd64
-liblwres161 1:9.11.5.P4+dfsg-5.1+deb10u1 amd64
+liblwres161 1:9.11.5.P4+dfsg-5.1+deb10u2 amd64
-libzmq5 4.3.1-4+deb10u1 amd64
+libzmq5 4.3.1-4+deb10u2 amd64
-php-icinga 2.8.1-1.buster all
+php-icinga 2.8.2-1.buster all
-vim-icinga2 2.11.4-1.buster all
+vim-icinga2 2.12.0-1.buster all

diff --git a/.etckeeper b/.etckeeper
index b922c3ea3d01f8c1d2e63b3a407b87339876ddc1..7b09eedba5c0ec9604ae46ed12885246a234e2b4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -901,6 +901,9 @@ maybe chmod 0644 'icinga2/features-available/gelf.conf'
 maybe chown 'nagios' 'icinga2/features-available/graphite.conf'
 maybe chgrp 'nagios' 'icinga2/features-available/graphite.conf'
 maybe chmod 0644 'icinga2/features-available/graphite.conf'
+maybe chown 'nagios' 'icinga2/features-available/icingadb.conf'
+maybe chgrp 'nagios' 'icinga2/features-available/icingadb.conf'
+maybe chmod 0644 'icinga2/features-available/icingadb.conf'
 maybe chown 'nagios' 'icinga2/features-available/ido-pgsql.conf'
 maybe chgrp 'nagios' 'icinga2/features-available/ido-pgsql.conf'
 maybe chmod 0600 'icinga2/features-available/ido-pgsql.conf'

diff --git a/icinga2/features-available/icingadb.conf b/icinga2/features-available/icingadb.conf
new file mode 100644 (file)
index 0000000..9951c83
--- /dev/null
+++ b/icinga2/features-available/icingadb.conf
@@ -0,0 +1,5 @@
+object IcingaDB "icingadb" {
+  //host = "127.0.0.1"
+  //port = 6380
+  //password = "xxx"
+}

diff --git a/icinga2/features-available/opentsdb.conf b/icinga2/features-available/opentsdb.conf
index 540556c101b740d1c81fb43d57da10d4f654a65c..471a6226845169e5d32dd50dacf08e3d7b7bcc2c 100644 (file)
--- a/icinga2/features-available/opentsdb.conf
+++ b/icinga2/features-available/opentsdb.conf
@@ -6,4 +6,20 @@
 object OpenTsdbWriter "opentsdb" {
   //host = "127.0.0.1"
   //port = 4242
+  //enable_generic_metrics = false
+
+  // Custom Tagging, refer to Icinga object type documentation for
+  // OpenTsdbWriter
+  //host_template = {
+  //  metric = "icinga.host"
+  //  tags = {
+  //    zone = "$host.zone$"
+  //  }
+  //}
+  //service_template = {
+  //  metric = "icinga.service.$service.check_command$"
+  //  tags = {
+  //    zone = "$service.zone$"
+  //  }
+  //}
 }

diff --git a/icinga2/scripts/mail-host-notification.sh b/icinga2/scripts/mail-host-notification.sh
index 93f942e13f167ddd7109f39e8305ef49c8b1731c..2a2c011f6b4ea8fdf8c9d45d70694761c953762d 100755 (executable)
--- a/icinga2/scripts/mail-host-notification.sh
+++ b/icinga2/scripts/mail-host-notification.sh
@@ -145,7 +145,7 @@ $ICINGAWEB2URL/monitoring/host/show?host=$(urlencode "$HOSTNAME")"
 fi
 
 ## Check whether verbose mode was enabled and log to syslog.
-if [ "$VERBOSE" == "true" ] ; then
+if [ "$VERBOSE" = "true" ] ; then
   logger "$PROG sends $SUBJECT => $USEREMAIL"
 fi
 
@@ -157,15 +157,13 @@ if [ -n "$MAILFROM" ] ; then
 
   ## Debian/Ubuntu use mailutils which requires `-a` to append the header
   if [ -f /etc/debian_version ]; then
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | tr -d '\015' \
-    | $MAILBIN -a "From: $MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -a "From: $MAILFROM" -s "$SUBJECT" $USEREMAIL
   ## Other distributions (RHEL/SUSE/etc.) prefer mailx which sets a sender address with `-r`
   else
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | tr -d '\015' \
-    | $MAILBIN -r "$MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -r "$MAILFROM" -s "$SUBJECT" $USEREMAIL
   fi
 
 else
-  /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | tr -d '\015' \
+  /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" \
   | $MAILBIN -s "$SUBJECT" $USEREMAIL
 fi

diff --git a/icinga2/scripts/mail-service-notification.sh b/icinga2/scripts/mail-service-notification.sh
index 8ccb8d45653205a3c653369abaa989fd6371645d..c901f234dcbb7493731efffbb37b41d62b8c13e1 100755 (executable)
--- a/icinga2/scripts/mail-service-notification.sh
+++ b/icinga2/scripts/mail-service-notification.sh
@@ -150,7 +150,7 @@ $ICINGAWEB2URL/monitoring/service/show?host=$(urlencode "$HOSTNAME")&service=$(u
 fi
 
 ## Check whether verbose mode was enabled and log to syslog.
-if [ "$VERBOSE" == "true" ] ; then
+if [ "$VERBOSE" = "true" ] ; then
   logger "$PROG sends $SUBJECT => $USEREMAIL"
 fi
 
@@ -162,15 +162,13 @@ if [ -n "$MAILFROM" ] ; then
 
   ## Debian/Ubuntu use mailutils which requires `-a` to append the header
   if [ -f /etc/debian_version ]; then
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | tr -d '\015' \
-    | $MAILBIN -a "From: $MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -a "From: $MAILFROM" -s "$SUBJECT" $USEREMAIL
   ## Other distributions (RHEL/SUSE/etc.) prefer mailx which sets a sender address with `-r`
   else
-    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | tr -d '\015' \
-    | $MAILBIN -r "$MAILFROM" -s "$SUBJECT" $USEREMAIL
+    /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | $MAILBIN -r "$MAILFROM" -s "$SUBJECT" $USEREMAIL
   fi
 
 else
-  /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" | tr -d '\015' \
+  /usr/bin/printf "%b" "$NOTIFICATION_MESSAGE" \
   | $MAILBIN -s "$SUBJECT" $USEREMAIL
 fi