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
-base-files 10.3+deb10u5 amd64
+base-files 10.3+deb10u6 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
-chrony 3.4-4 amd64
+chrony 3.4-4+deb10u1 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 2.12.0-1.buster amd64
+icinga2-bin 2.12.0-1.buster amd64
+icinga2-common 2.12.0-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
-libpq5 11.7-0+deb10u1 amd64
+libpq5 11.9-0+deb10u1 amd64
-libx11-6 2:1.6.7-1 amd64
-libx11-data 2:1.6.7-1 all
+libx11-6 2:1.6.7-1+deb10u1 amd64
+libx11-data 2:1.6.7-1+deb10u1 all
-libzmq5 4.3.1-4+deb10u1 amd64
+libzmq5 4.3.1-4+deb10u2 amd64
+linux-image-4.19.0-11-amd64 4.19.146-1 amd64
-linux-image-amd64 4.19+105+deb10u5 amd64
+linux-image-amd64 4.19+105+deb10u6 amd64
-python-zmq 17.1.2-2 amd64
+python-zmq 17.1.2-2+deb10u1 amd64
-vim-icinga2 2.11.4-1.buster all
+vim-icinga2 2.12.0-1.buster all

diff --git a/.etckeeper b/.etckeeper
index caf95b0b2155cb922d6ec90acd9bd826dfccfd75..d2b230885dd68a2261889e4e1c0b4df0dd58b38d 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -800,6 +800,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/influxdb.conf'
 maybe chgrp 'nagios' 'icinga2/features-available/influxdb.conf'
 maybe chmod 0644 'icinga2/features-available/influxdb.conf'

diff --git a/apparmor.d/usr.sbin.chronyd b/apparmor.d/usr.sbin.chronyd
index 74090f06deea3bc6f259fa8cfdd0a83d3441a97d..04f9d4736c3bfea90a9c89241519bda7b5099639 100644 (file)
--- a/apparmor.d/usr.sbin.chronyd
+++ b/apparmor.d/usr.sbin.chronyd
@@ -30,6 +30,7 @@
   # the stability and accuracy of the clock by compensating the temperature
   # changes measured by a sensor close to the oscillator.
   @{sys}/class/hwmon/hwmon[0-9]*/temp[0-9]*_input r,
+  @{sys}/devices/virtual/thermal/thermal_zone[0-9]*/hwmon[0-9]*/temp[0-9]*_input r,
 
   # Support all paths suggested in the man page (LP: #1771028). Assume these
   # are common use cases; others should be set as local include (see below).

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 10db6839b08e42259442f8d66c61fda83a6b714d..4de0e2dd1eb154d607c03588e6a3229937068688 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -2,64 +2,64 @@
 APT::NeverAutoRemove
 {
    "^linux-image-4\.19\.0-10-amd64$";
-   "^linux-image-4\.19\.0-9-amd64$";
+   "^linux-image-4\.19\.0-11-amd64$";
    "^linux-headers-4\.19\.0-10-amd64$";
-   "^linux-headers-4\.19\.0-9-amd64$";
+   "^linux-headers-4\.19\.0-11-amd64$";
    "^linux-image-extra-4\.19\.0-10-amd64$";
-   "^linux-image-extra-4\.19\.0-9-amd64$";
+   "^linux-image-extra-4\.19\.0-11-amd64$";
    "^linux-modules-4\.19\.0-10-amd64$";
-   "^linux-modules-4\.19\.0-9-amd64$";
+   "^linux-modules-4\.19\.0-11-amd64$";
    "^linux-modules-extra-4\.19\.0-10-amd64$";
-   "^linux-modules-extra-4\.19\.0-9-amd64$";
+   "^linux-modules-extra-4\.19\.0-11-amd64$";
    "^linux-signed-image-4\.19\.0-10-amd64$";
-   "^linux-signed-image-4\.19\.0-9-amd64$";
+   "^linux-signed-image-4\.19\.0-11-amd64$";
    "^linux-image-unsigned-4\.19\.0-10-amd64$";
-   "^linux-image-unsigned-4\.19\.0-9-amd64$";
+   "^linux-image-unsigned-4\.19\.0-11-amd64$";
    "^kfreebsd-image-4\.19\.0-10-amd64$";
-   "^kfreebsd-image-4\.19\.0-9-amd64$";
+   "^kfreebsd-image-4\.19\.0-11-amd64$";
    "^kfreebsd-headers-4\.19\.0-10-amd64$";
-   "^kfreebsd-headers-4\.19\.0-9-amd64$";
+   "^kfreebsd-headers-4\.19\.0-11-amd64$";
    "^gnumach-image-4\.19\.0-10-amd64$";
-   "^gnumach-image-4\.19\.0-9-amd64$";
+   "^gnumach-image-4\.19\.0-11-amd64$";
    "^.*-modules-4\.19\.0-10-amd64$";
-   "^.*-modules-4\.19\.0-9-amd64$";
+   "^.*-modules-4\.19\.0-11-amd64$";
    "^.*-kernel-4\.19\.0-10-amd64$";
-   "^.*-kernel-4\.19\.0-9-amd64$";
+   "^.*-kernel-4\.19\.0-11-amd64$";
    "^linux-backports-modules-.*-4\.19\.0-10-amd64$";
-   "^linux-backports-modules-.*-4\.19\.0-9-amd64$";
+   "^linux-backports-modules-.*-4\.19\.0-11-amd64$";
    "^linux-modules-.*-4\.19\.0-10-amd64$";
-   "^linux-modules-.*-4\.19\.0-9-amd64$";
+   "^linux-modules-.*-4\.19\.0-11-amd64$";
    "^linux-tools-4\.19\.0-10-amd64$";
-   "^linux-tools-4\.19\.0-9-amd64$";
+   "^linux-tools-4\.19\.0-11-amd64$";
    "^linux-cloud-tools-4\.19\.0-10-amd64$";
-   "^linux-cloud-tools-4\.19\.0-9-amd64$";
+   "^linux-cloud-tools-4\.19\.0-11-amd64$";
    "^linux-buildinfo-4\.19\.0-10-amd64$";
-   "^linux-buildinfo-4\.19\.0-9-amd64$";
+   "^linux-buildinfo-4\.19\.0-11-amd64$";
    "^linux-source-4\.19\.0-10-amd64$";
-   "^linux-source-4\.19\.0-9-amd64$";
+   "^linux-source-4\.19\.0-11-amd64$";
 };
 /* Debug information:
 # dpkg list:
-iF  linux-image-4.19.0-10-amd64          4.19.132-1                   amd64        Linux 4.19 for 64-bit PCs (signed)
-ii  linux-image-4.19.0-8-amd64           4.19.98-1+deb10u1            amd64        Linux 4.19 for 64-bit PCs (signed)
+ii  linux-image-4.19.0-10-amd64          4.19.132-1                   amd64        Linux 4.19 for 64-bit PCs (signed)
+iF  linux-image-4.19.0-11-amd64          4.19.146-1                   amd64        Linux 4.19 for 64-bit PCs (signed)
 ii  linux-image-4.19.0-9-amd64           4.19.118-2+deb10u1           amd64        Linux 4.19 for 64-bit PCs (signed)
-iU  linux-image-amd64                    4.19+105+deb10u5             amd64        Linux for 64-bit PCs (meta-package)
+iU  linux-image-amd64                    4.19+105+deb10u6             amd64        Linux for 64-bit PCs (meta-package)
 # list of installed kernel packages:
 4.19.0-10-amd64 4.19.132-1
-4.19.0-8-amd64 4.19.98-1+deb10u1
+4.19.0-11-amd64 4.19.146-1
 4.19.0-9-amd64 4.19.118-2+deb10u1
 # list of different kernel versions:
+4.19.146-1
 4.19.132-1
 4.19.118-2+deb10u1
-4.19.98-1+deb10u1
-# Installing kernel: 4.19.132-1 (4.19.0-10-amd64)
-# Running kernel: 4.19.118-2+deb10u1 (4.19.0-9-amd64)
-# Last kernel: 4.19.132-1
-# Previous kernel: 4.19.118-2+deb10u1
+# Installing kernel: 4.19.146-1 (4.19.0-11-amd64)
+# Running kernel: 4.19.132-1 (4.19.0-10-amd64)
+# Last kernel: 4.19.146-1
+# Previous kernel: 4.19.132-1
 # Kernel versions list to keep:
-4.19.118-2+deb10u1
 4.19.132-1
+4.19.146-1
 # Kernel packages (version part) to protect:
 4\.19\.0-10-amd64
-4\.19\.0-9-amd64
+4\.19\.0-11-amd64
 */

diff --git a/debian_version b/debian_version
index 9a62de225f08ef1ad0ee2d75d94fd4c4c8b2d8be..12c0281acb5c16513449367698ccc00293c91c0d 100644 (file)
--- a/debian_version
+++ b/debian_version
@@ -1 +1 @@
-10.5
+10.6

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