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

Package changes:
-alsa-ucm-conf 1.2.2-1ubuntu0.8 all
+alsa-ucm-conf 1.2.2-1ubuntu0.9 all
-code-brand 6.4-20 all
+code-brand 6.4-21 all
-icinga2 2.12.5-1.focal amd64
-icinga2-bin 2.12.5-1.focal amd64
-icinga2-common 2.12.5-1.focal all
-icinga2-doc 2.12.5-1.focal all
-icinga2-ido-mysql 2.12.5-1.focal amd64
+icinga2 2.13.0-1.focal amd64
+icinga2-bin 2.13.0-1.focal amd64
+icinga2-common 2.13.0-1.focal all
+icinga2-doc 2.13.0-1.focal all
+icinga2-ido-mysql 2.13.0-1.focal amd64
-libc-ares2 1.15.0-1build1 amd64
+libc-ares2 1.15.0-1ubuntu0.1 amd64
-libdbi-perl 1.643-1 amd64
+libdbi-perl 1.643-1ubuntu0.1 amd64
-libdrm-amdgpu1 2.4.102-1ubuntu1~20.04.1 amd64
-libdrm-common 2.4.102-1ubuntu1~20.04.1 all
-libdrm-intel1 2.4.102-1ubuntu1~20.04.1 amd64
-libdrm-nouveau2 2.4.102-1ubuntu1~20.04.1 amd64
-libdrm-radeon1 2.4.102-1ubuntu1~20.04.1 amd64
-libdrm2 2.4.102-1ubuntu1~20.04.1 amd64
+libdrm-amdgpu1 2.4.105-3~20.04.1 amd64
+libdrm-common 2.4.105-3~20.04.1 all
+libdrm-intel1 2.4.105-3~20.04.1 amd64
+libdrm-nouveau2 2.4.105-3~20.04.1 amd64
+libdrm-radeon1 2.4.105-3~20.04.1 amd64
+libdrm2 2.4.105-3~20.04.1 amd64
-libssl1.1 1.1.1f-1ubuntu2.4 amd64
+libssl1.1 1.1.1f-1ubuntu2.5 amd64
-linux-libc-dev 5.4.0-80.90 amd64
+linux-libc-dev 5.4.0-81.91 amd64
-loolwsd 6.4.10-6 amd64
+loolwsd 6.4.10-9 amd64
-openssh-client 1:8.2p1-4ubuntu0.2 amd64
-openssh-server 1:8.2p1-4ubuntu0.2 amd64
-openssh-sftp-server 1:8.2p1-4ubuntu0.2 amd64
-openssl 1.1.1f-1ubuntu2.4 amd64
+openssh-client 1:8.2p1-4ubuntu0.3 amd64
+openssh-server 1:8.2p1-4ubuntu0.3 amd64
+openssh-sftp-server 1:8.2p1-4ubuntu0.3 amd64
+openssl 1.1.1f-1ubuntu2.5 amd64
-vim-icinga2 2.12.5-1.focal all
+vim-icinga2 2.13.0-1.focal all
-wireless-regdb 2020.11.20-0ubuntu1~20.04.1 all
+wireless-regdb 2021.07.14-0ubuntu1~20.04.1 all

diff --git a/.etckeeper b/.etckeeper
index fbe21d6dc80a4ff86819e62a21cf79bcc497c7e1..5586ca7165d9e1cb0a0742ad91d677a1646ecc95 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1352,6 +1352,9 @@ maybe chmod 0644 'icinga2/features-available/ido-mysql.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'
+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/livestatus.conf'
 maybe chgrp 'nagios' 'icinga2/features-available/livestatus.conf'
 maybe chmod 0644 'icinga2/features-available/livestatus.conf'

diff --git a/icinga2/features-available/influxdb.conf b/icinga2/features-available/influxdb.conf
index af8423577d5d46aa4d998d635f2fc7ca9f2bec75..f0af37bdb5372574f2af860a7c76c7fa1fc930b5 100644 (file)
--- a/icinga2/features-available/influxdb.conf
+++ b/icinga2/features-available/influxdb.conf
@@ -1,6 +1,6 @@
 /**
  * The InfluxdbWriter type writes check result metrics and
- * performance data to an InfluxDB HTTP API
+ * performance data to an InfluxDB v1 HTTP API
  */
 
 object InfluxdbWriter "influxdb" {

diff --git a/icinga2/features-available/influxdb2.conf b/icinga2/features-available/influxdb2.conf
new file mode 100644 (file)
index 0000000..53f7a21
--- /dev/null
+++ b/icinga2/features-available/influxdb2.conf
@@ -0,0 +1,27 @@
+/**
+ * The Influxdb2Writer type writes check result metrics and
+ * performance data to an InfluxDB v2 HTTP API
+ */
+
+object Influxdb2Writer "influxdb2" {
+  //host = "127.0.0.1"
+  //port = 8086
+  //organization = "monitoring"
+  //bucket = "icinga2"
+  //auth_token = "ABCDEvwxyz0189-_"
+  //flush_threshold = 1024
+  //flush_interval = 10s
+  //host_template = {
+  //  measurement = "$host.check_command$"
+  //  tags = {
+  //    hostname = "$host.name$"
+  //  }
+  //}
+  //service_template = {
+  //  measurement = "$service.check_command$"
+  //  tags = {
+  //    hostname = "$host.name$"
+  //    service = "$service.name$"
+  //  }
+  //}
+}

diff --git a/icinga2/scripts/mail-host-notification.sh b/icinga2/scripts/mail-host-notification.sh
index 2a2c011f6b4ea8fdf8c9d45d70694761c953762d..744481a77757f97521b9af6ca69dc4fa88cdb4aa 100755 (executable)
--- a/icinga2/scripts/mail-host-notification.sh
+++ b/icinga2/scripts/mail-host-notification.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
 # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license
 

diff --git a/icinga2/scripts/mail-service-notification.sh b/icinga2/scripts/mail-service-notification.sh
index c901f234dcbb7493731efffbb37b41d62b8c13e1..8e560ac23981941965fbd4f50636b340711147f9 100755 (executable)
--- a/icinga2/scripts/mail-service-notification.sh
+++ b/icinga2/scripts/mail-service-notification.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
 # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license