From 97ac53e7508dcf415145016d032602e37f359e15 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 13 Jul 2023 18:03:08 +0200 Subject: [PATCH] committing changes in /etc made by "apt dist-upgrade -y" Packages with configuration changes: -icinga2-common 2.13.7-1+debian11 all Package changes: -icinga2 2.13.7-1+debian11 amd64 -icinga2-bin 2.13.7-1+debian11 amd64 -icinga2-common 2.13.7-1+debian11 all -icinga2-ido-pgsql 2.13.7-1+debian11 amd64 -vim-icinga2 2.13.7-1+debian11 all +vim-icinga2 2.14.0-1+debian11 all --- .etckeeper | 3 +++ icinga2/conf.d/commands.conf | 9 +++++++++ icinga2/features-available/journald.conf | 7 +++++++ icinga2/scripts/mail-host-notification.sh | 12 ++++++++++-- icinga2/scripts/mail-service-notification.sh | 20 ++++++++++++++++++-- 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 icinga2/features-available/journald.conf diff --git a/.etckeeper b/.etckeeper index 15bf20b..275d1a8 100755 --- a/.etckeeper +++ b/.etckeeper @@ -948,6 +948,9 @@ 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/journald.conf' +maybe chgrp 'nagios' 'icinga2/features-available/journald.conf' +maybe chmod 0644 'icinga2/features-available/journald.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/conf.d/commands.conf b/icinga2/conf.d/commands.conf index bd511ce..e7d555c 100644 --- a/icinga2/conf.d/commands.conf +++ b/icinga2/conf.d/commands.conf @@ -43,6 +43,7 @@ object NotificationCommand "mail-host-notification" { required = true value = "$notification_hoststate$" } + "-X" = "$notification_hostnotes$" "-t" = { required = true value = "$notification_type$" @@ -62,6 +63,7 @@ object NotificationCommand "mail-host-notification" { notification_hostoutput = "$host.output$" notification_hoststate = "$host.state$" notification_useremail = "$user.email$" + notification_hostnotes = "$host.notes$" } } @@ -110,6 +112,8 @@ object NotificationCommand "mail-service-notification" { required = true value = "$notification_type$" } + "-X" = "$notification_hostnotes$" + "-x" = "$notification_servicenotes$" "-u" = { required = true value = "$notification_servicedisplayname$" @@ -131,6 +135,8 @@ object NotificationCommand "mail-service-notification" { notification_servicestate = "$service.state$" notification_useremail = "$user.email$" notification_servicedisplayname = "$service.display_name$" + notification_hostnotes = "$host.notes$" + notification_servicenotes = "$service.notes$" } } @@ -160,6 +166,7 @@ object NotificationCommand "mail-host-notification" { NOTIFICATIONCOMMENT = "$notification.comment$" HOSTDISPLAYNAME = "$host.display_name$" USEREMAIL = "$user.email$" + HOSTNOTES = "$host.notes$" } } @@ -180,6 +187,8 @@ object NotificationCommand "mail-service-notification" { HOSTDISPLAYNAME = "$host.display_name$" SERVICEDISPLAYNAME = "$service.display_name$" USEREMAIL = "$user.email$" + HOSTNOTES = "$host.notes$" + SERVICENOTES = "$service.notes$" } } diff --git a/icinga2/features-available/journald.conf b/icinga2/features-available/journald.conf new file mode 100644 index 0000000..e0b36f7 --- /dev/null +++ b/icinga2/features-available/journald.conf @@ -0,0 +1,7 @@ +/** + * The JournaldLogger type writes log information to the systemd journal. + */ + +object JournaldLogger "journald" { + severity = "warning" +} diff --git a/icinga2/scripts/mail-host-notification.sh b/icinga2/scripts/mail-host-notification.sh index 744481a..70d3b50 100755 --- a/icinga2/scripts/mail-host-notification.sh +++ b/icinga2/scripts/mail-host-notification.sh @@ -27,6 +27,7 @@ Required parameters: Optional parameters: -4 HOSTADDRESS (\$address\$) -6 HOSTADDRESS6 (\$address6\$) + -X HOSTNOTES (\$host.notes\$) -b NOTIFICATIONAUTHORNAME (\$notification.author\$) -c NOTIFICATIONCOMMENT (\$notification.comment\$) -i ICINGAWEB2URL (\$notification_icingaweb2url\$, Default: unset) @@ -63,7 +64,7 @@ urlencode() { } ## Main -while getopts 4:6::b:c:d:f:hi:l:n:o:r:s:t:v: opt +while getopts 4:6::b:c:d:f:hi:l:n:o:r:s:t:v:X: opt do case "$opt" in 4) HOSTADDRESS=$OPTARG ;; @@ -77,6 +78,7 @@ do l) HOSTNAME=$OPTARG ;; # required n) HOSTDISPLAYNAME=$OPTARG ;; # required o) HOSTOUTPUT=$OPTARG ;; # required + X) HOSTNOTES=$OPTARG ;; r) USEREMAIL=$OPTARG ;; # required s) HOSTSTATE=$OPTARG ;; # required t) NOTIFICATIONTYPE=$OPTARG ;; # required @@ -129,6 +131,12 @@ if [ -n "$HOSTADDRESS6" ] ; then IPv6: $HOSTADDRESS6" fi +## Check whether host notes was specified. +if [ -n "$HOSTNOTES" ] ; then + NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE +Host notes: $HOSTNOTES" +fi + ## Check whether author and comment was specified. if [ -n "$NOTIFICATIONCOMMENT" ] ; then NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE @@ -141,7 +149,7 @@ fi if [ -n "$ICINGAWEB2URL" ] ; then NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE -$ICINGAWEB2URL/monitoring/host/show?host=$(urlencode "$HOSTNAME")" +$ICINGAWEB2URL/icingadb/host?name=$(urlencode "$HOSTNAME")" fi ## Check whether verbose mode was enabled and log to syslog. diff --git a/icinga2/scripts/mail-service-notification.sh b/icinga2/scripts/mail-service-notification.sh index 8e560ac..31d9137 100755 --- a/icinga2/scripts/mail-service-notification.sh +++ b/icinga2/scripts/mail-service-notification.sh @@ -29,6 +29,8 @@ Required parameters: Optional parameters: -4 HOSTADDRESS (\$address\$) -6 HOSTADDRESS6 (\$address6\$) + -X HOSTNOTES (\$host.notes\$) + -x SERVICENOTES (\$service.notes\$) -b NOTIFICATIONAUTHORNAME (\$notification.author\$) -c NOTIFICATIONCOMMENT (\$notification.comment\$) -i ICINGAWEB2URL (\$notification_icingaweb2url\$, Default: unset) @@ -65,7 +67,7 @@ urlencode() { } ## Main -while getopts 4:6:b:c:d:e:f:hi:l:n:o:r:s:t:u:v: opt +while getopts 4:6:b:c:d:e:f:hi:l:n:o:r:s:t:u:v:X:x: opt do case "$opt" in 4) HOSTADDRESS=$OPTARG ;; @@ -79,6 +81,8 @@ do i) ICINGAWEB2URL=$OPTARG ;; l) HOSTNAME=$OPTARG ;; # required n) HOSTDISPLAYNAME=$OPTARG ;; # required + X) HOSTNOTES=$OPTARG ;; + x) SERVICENOTES=$OPTARG ;; o) SERVICEOUTPUT=$OPTARG ;; # required r) USEREMAIL=$OPTARG ;; # required s) SERVICESTATE=$OPTARG ;; # required @@ -134,6 +138,18 @@ if [ -n "$HOSTADDRESS6" ] ; then IPv6: $HOSTADDRESS6" fi +## Check whether host notes was specified. +if [ -n "$HOSTNOTES" ] ; then + NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE +Host notes: $HOSTNOTES" +fi + +## Check whether service notes was specified. +if [ -n "$SERVICENOTES" ] ; then + NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE +Service notes: $SERVICENOTES" +fi + ## Check whether author and comment was specified. if [ -n "$NOTIFICATIONCOMMENT" ] ; then NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE @@ -146,7 +162,7 @@ fi if [ -n "$ICINGAWEB2URL" ] ; then NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE -$ICINGAWEB2URL/monitoring/service/show?host=$(urlencode "$HOSTNAME")&service=$(urlencode "$SERVICENAME")" +$ICINGAWEB2URL/icingadb/service?name=$(urlencode "$SERVICENAME")&host.name=$(urlencode "$HOSTNAME")" fi ## Check whether verbose mode was enabled and log to syslog. -- 2.39.5