From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 24 Aug 2021 16:14:11 +0000 (+0200)
Subject: committing changes in /etc made by "apt dist-upgrade -y"
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=40ccaeb896a0b8555037eb2d8cd31db9bba0c203;p=config%2Fns1%2Fetc.git

committing changes in /etc made by "apt dist-upgrade -y"

Package changes:
-icinga-php-library 0.6.0-1.buster all
-icinga-php-thirdparty 0.10.0-1.buster all
-icinga2 2.12.5-1.buster amd64
-icinga2-bin 2.12.5-1.buster amd64
-icinga2-common 2.12.5-1.buster all
-icinga2-ido-pgsql 2.12.5-1.buster amd64
-icingacli 2.9.0-1.buster all
-icingaweb2 2.9.0-1.buster all
-icingaweb2-common 2.9.0-1.buster all
-icingaweb2-module-monitoring 2.9.0-1.buster all
+icinga-php-library 0.6.1-1.buster all
+icinga-php-thirdparty 0.10.0-2.buster all
+icinga2 2.13.1-1.buster amd64
+icinga2-bin 2.13.1-1.buster amd64
+icinga2-common 2.13.1-1.buster all
+icinga2-ido-pgsql 2.13.1-1.buster amd64
+icingacli 2.9.3-1.buster all
+icingaweb2 2.9.3-1.buster all
+icingaweb2-common 2.9.3-1.buster all
+icingaweb2-module-monitoring 2.9.3-1.buster all
-libsndfile1 1.0.28-6 amd64
+libsndfile1 1.0.28-6+deb10u1 amd64
-libssl1.1 1.1.1d-0+deb10u6 amd64
+libssl1.1 1.1.1d-0+deb10u7 amd64
-openssl 1.1.1d-0+deb10u6 amd64
+openssl 1.1.1d-0+deb10u7 amd64
-php-icinga 2.9.0-1.buster all
+php-icinga 2.9.3-1.buster all
+php-soap 2:7.3+69 all
+php7.3-soap 7.3.29-1~deb10u1 amd64
-salt-common 3003.1+ds-1 all
-salt-minion 3003.1+ds-1 all
+salt-common 3003.2+ds-1 all
+salt-minion 3003.2+ds-1 all
-vim-icinga2 2.12.5-1.buster all
+vim-icinga2 2.13.1-1.buster all
---

diff --git a/.etckeeper b/.etckeeper
index 97dce1e..c7a15c8 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -912,6 +912,9 @@ maybe chmod 0600 'icinga2/features-available/ido-pgsql.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'
@@ -1939,6 +1942,7 @@ maybe chmod 0644 'php/7.3/mods-available/readline.ini'
 maybe chmod 0644 'php/7.3/mods-available/shmop.ini'
 maybe chmod 0644 'php/7.3/mods-available/simplexml.ini'
 maybe chmod 0644 'php/7.3/mods-available/smbclient.ini'
+maybe chmod 0644 'php/7.3/mods-available/soap.ini'
 maybe chmod 0644 'php/7.3/mods-available/sockets.ini'
 maybe chmod 0644 'php/7.3/mods-available/sysvmsg.ini'
 maybe chmod 0644 'php/7.3/mods-available/sysvsem.ini'
diff --git a/icinga2/features-available/influxdb.conf b/icinga2/features-available/influxdb.conf
index af84235..f0af37b 100644
--- 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
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 2a2c011..744481a 100755
--- 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 c901f23..8e560ac 100755
--- 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
 
diff --git a/php/7.3/apache2/conf.d/20-soap.ini b/php/7.3/apache2/conf.d/20-soap.ini
new file mode 120000
index 0000000..bf63c37
--- /dev/null
+++ b/php/7.3/apache2/conf.d/20-soap.ini
@@ -0,0 +1 @@
+/etc/php/7.3/mods-available/soap.ini
\ No newline at end of file
diff --git a/php/7.3/cli/conf.d/20-soap.ini b/php/7.3/cli/conf.d/20-soap.ini
new file mode 120000
index 0000000..bf63c37
--- /dev/null
+++ b/php/7.3/cli/conf.d/20-soap.ini
@@ -0,0 +1 @@
+/etc/php/7.3/mods-available/soap.ini
\ No newline at end of file
diff --git a/php/7.3/mods-available/soap.ini b/php/7.3/mods-available/soap.ini
new file mode 100644
index 0000000..d545dfb
--- /dev/null
+++ b/php/7.3/mods-available/soap.ini
@@ -0,0 +1,3 @@
+; configuration for php soap module
+; priority=20
+extension=soap.so
diff --git a/php/7.3/phpdbg/conf.d/20-soap.ini b/php/7.3/phpdbg/conf.d/20-soap.ini
new file mode 120000
index 0000000..bf63c37
--- /dev/null
+++ b/php/7.3/phpdbg/conf.d/20-soap.ini
@@ -0,0 +1 @@
+/etc/php/7.3/mods-available/soap.ini
\ No newline at end of file