From: mhoellein Date: Thu, 6 Aug 2020 08:11:42 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=4b1e3da36d0aeda853b7b5c3f71e84ea014fe1f8;p=homeserver committing changes in /etc after apt run Package changes: -icinga2 2.11.4-1.bionic amd64 -icinga2-bin 2.11.4-1.bionic amd64 -icinga2-common 2.11.4-1.bionic all -icinga2-ido-mysql 2.11.4-1.bionic amd64 +icinga2 2.12.0-1.bionic amd64 +icinga2-bin 2.12.0-1.bionic amd64 +icinga2-common 2.12.0-1.bionic all +icinga2-ido-mysql 2.12.0-1.bionic amd64 -kmod 24-1ubuntu3.4 amd64 +kmod 24-1ubuntu3.5 amd64 -libkmod2 24-1ubuntu3.4 amd64 +libkmod2 24-1ubuntu3.5 amd64 -libpam-systemd 237-3ubuntu10.41 amd64 +libpam-systemd 237-3ubuntu10.42 amd64 -libsystemd-dev 237-3ubuntu10.41 amd64 +libsystemd-dev 237-3ubuntu10.42 amd64 -libsystemd0 237-3ubuntu10.41 amd64 -libsystemd0 237-3ubuntu10.41 i386 +libsystemd0 237-3ubuntu10.42 amd64 +libsystemd0 237-3ubuntu10.42 i386 -libudev1 237-3ubuntu10.41 amd64 -libudev1 237-3ubuntu10.41 i386 +libudev1 237-3ubuntu10.42 amd64 +libudev1 237-3ubuntu10.42 i386 -module-init-tools 24-1ubuntu3.4 all +module-init-tools 24-1ubuntu3.5 all -openjdk-8-jre 8u252-b09-1~18.04 amd64 -openjdk-8-jre-headless 8u252-b09-1~18.04 amd64 +openjdk-8-jre 8u265-b01-0ubuntu2~18.04 amd64 +openjdk-8-jre-headless 8u265-b01-0ubuntu2~18.04 amd64 -systemd 237-3ubuntu10.41 amd64 -systemd-coredump 237-3ubuntu10.41 amd64 +systemd 237-3ubuntu10.42 amd64 +systemd-coredump 237-3ubuntu10.42 amd64 -systemd-sysv 237-3ubuntu10.41 amd64 +systemd-sysv 237-3ubuntu10.42 amd64 -udev 237-3ubuntu10.41 amd64 +udev 237-3ubuntu10.42 amd64 -vim-icinga2 2.11.4-1.bionic all +vim-icinga2 2.12.0-1.bionic all --- diff --git a/.etckeeper b/.etckeeper index f3d81037..aa66e08a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2774,7 +2774,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' @@ -2805,6 +2805,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 0600 'icinga2/features-available/ido-mysql.conf' diff --git a/icinga2/features-available/icingadb.conf b/icinga2/features-available/icingadb.conf new file mode 100644 index 00000000..9951c835 --- /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 540556c1..471a6226 100644 --- 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 93f942e1..2a2c011f 100755 --- 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 8ccb8d45..c901f234 100755 --- 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/java-8-openjdk/security/java.security b/java-8-openjdk/security/java.security index bf77d5ff..ad8393c1 100644 --- a/java-8-openjdk/security/java.security +++ b/java-8-openjdk/security/java.security @@ -224,7 +224,10 @@ package.access=sun.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ jdk.xml.internal.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + jdk.jfr.events.,\ + jdk.jfr.internal.,\ + jdk.management.jfr.internal. # # List of comma-separated packages that start with or equal this string @@ -274,7 +277,10 @@ package.definition=sun.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ jdk.xml.internal.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + jdk.jfr.events.,\ + jdk.jfr.internal.,\ + jdk.management.jfr.internal. # # Determines whether this properties file can be appended to