committing changes in /etc made by "apt-get upgrade"

Package changes:
-icinga2 2.11.4-1.focal amd64
-icinga2-bin 2.11.4-1.focal amd64
-icinga2-common 2.11.4-1.focal all
-icinga2-doc 2.11.4-1.focal all
-icinga2-ido-mysql 2.11.4-1.focal amd64
+icinga2 2.12.0-1.focal amd64
+icinga2-bin 2.12.0-1.focal amd64
+icinga2-common 2.12.0-1.focal all
+icinga2-doc 2.12.0-1.focal all
+icinga2-ido-mysql 2.12.0-1.focal amd64
-libmysqlclient21 8.0.21-0ubuntu0.20.04.3 amd64
+libmysqlclient21 8.0.21-0ubuntu0.20.04.4 amd64
-mysql-client-8.0 8.0.21-0ubuntu0.20.04.3 amd64
-mysql-client-core-8.0 8.0.21-0ubuntu0.20.04.3 amd64
+mysql-client-8.0 8.0.21-0ubuntu0.20.04.4 amd64
+mysql-client-core-8.0 8.0.21-0ubuntu0.20.04.4 amd64
-mysql-server 8.0.21-0ubuntu0.20.04.3 all
+mysql-server 8.0.21-0ubuntu0.20.04.4 all
-mysql-server-8.0 8.0.21-0ubuntu0.20.04.3 amd64
-mysql-server-core-8.0 8.0.21-0ubuntu0.20.04.3 amd64
+mysql-server-8.0 8.0.21-0ubuntu0.20.04.4 amd64
+mysql-server-core-8.0 8.0.21-0ubuntu0.20.04.4 amd64
-vim-icinga2 2.11.4-1.focal all
+vim-icinga2 2.12.0-1.focal all

diff --git a/.etckeeper b/.etckeeper
index 987fef902f8758df28e451d0cc87b73b3381fd1b..bce6e9503e80c33bd783744c0209480aa905fa9a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1299,7 +1299,7 @@ maybe chgrp 'nagios' 'icinga2/conf.d/users.conf'
 maybe chmod 0644 'icinga2/conf.d/users.conf'
 maybe chown 'nagios' 'icinga2/constants.conf'
 maybe chgrp 'nagios' 'icinga2/constants.conf'
-maybe chmod 0644 'icinga2/constants.conf'
+maybe chmod 0640 'icinga2/constants.conf'
 maybe chown 'nagios' 'icinga2/constants.conf.orig'
 maybe chgrp 'nagios' 'icinga2/constants.conf.orig'
 maybe chmod 0640 'icinga2/constants.conf.orig'
@@ -1330,6 +1330,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-mysql.conf'
 maybe chgrp 'nagios' 'icinga2/features-available/ido-mysql.conf'
 maybe chmod 0644 'icinga2/features-available/ido-mysql.conf'
@@ -1366,8 +1369,14 @@ maybe chmod 0640 'icinga2/icinga2.conf'
 maybe chown 'nagios' 'icinga2/pki'
 maybe chgrp 'nagios' 'icinga2/pki'
 maybe chmod 0700 'icinga2/pki'
+maybe chown 'nagios' 'icinga2/pki/ca.crt'
+maybe chgrp 'nagios' 'icinga2/pki/ca.crt'
 maybe chmod 0644 'icinga2/pki/ca.crt'
+maybe chown 'nagios' 'icinga2/pki/icinga.hoellein.online.crt'
+maybe chgrp 'nagios' 'icinga2/pki/icinga.hoellein.online.crt'
 maybe chmod 0644 'icinga2/pki/icinga.hoellein.online.crt'
+maybe chown 'nagios' 'icinga2/pki/icinga.hoellein.online.key'
+maybe chgrp 'nagios' 'icinga2/pki/icinga.hoellein.online.key'
 maybe chmod 0644 'icinga2/pki/icinga.hoellein.online.key'
 maybe chmod 0755 'icinga2/scripts'
 maybe chmod 0755 'icinga2/scripts/mail-host-notification.sh'

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

diff --git a/mysql/FROZEN b/mysql/FROZEN
new file mode 120000 (symlink)
index 0000000..2bc63ae
--- /dev/null
+++ b/mysql/FROZEN
@@ -0,0 +1 @@
+../../usr/share/doc/mysql-common/frozen-mode/downgrade
\ No newline at end of file