committing changes in /etc after apt run

Package changes:
-curl 7.52.1-5+deb9u1 amd64
+curl 7.52.1-5+deb9u2 amd64
-icinga2 2.7.1-2.stretch amd64
-icinga2-bin 2.7.1-2.stretch amd64
-icinga2-classicui 2.7.1-2.stretch all
-icinga2-common 2.7.1-2.stretch all
+icinga2 2.8.0-1.stretch amd64
+icinga2-bin 2.8.0-1.stretch amd64
+icinga2-classicui 2.8.0-1.stretch all
+icinga2-common 2.8.0-1.stretch all
-libcurl3 7.52.1-5+deb9u1 amd64
-libcurl3-gnutls 7.52.1-5+deb9u1 amd64
+libcurl3 7.52.1-5+deb9u2 amd64
+libcurl3-gnutls 7.52.1-5+deb9u2 amd64
-libicinga2 2.7.1-2.stretch amd64
+libicinga2 2.8.0-1.stretch amd64
-libpq5 9.6.4-0+deb9u1 amd64
+libpq5 9.6.6-0+deb9u1 amd64
-libruby2.3 2.3.3-1+deb9u1 amd64
+libruby2.3 2.3.3-1+deb9u2 amd64
-libssl1.0.2 1.0.2l-2 amd64
-libssl1.1 1.1.0f-3 amd64
+libssl1.0.2 1.0.2l-2+deb9u1 amd64
+libssl1.1 1.1.0f-3+deb9u1 amd64
-openssl 1.1.0f-3 amd64
+openssl 1.1.0f-3+deb9u1 amd64
-postgresql 9.6+181 all
-postgresql-9.6 9.6.4-0+deb9u1 amd64
-postgresql-client-9.6 9.6.4-0+deb9u1 amd64
-postgresql-client-common 181 all
-postgresql-common 181 all
-procmail 3.22-25+b1 amd64
+postgresql 9.6+181+deb9u1 all
+postgresql-9.6 9.6.6-0+deb9u1 amd64
+postgresql-client-9.6 9.6.6-0+deb9u1 amd64
+postgresql-client-common 181+deb9u1 all
+postgresql-common 181+deb9u1 all
+procmail 3.22-25+deb9u1 amd64
-ruby2.3 2.3.3-1+deb9u1 amd64
+ruby2.3 2.3.3-1+deb9u2 amd64
-tzdata 2017b-1 all
+tzdata 2017c-0+deb9u1 all
-vim-icinga2 2.7.1-2.stretch all
+vim-icinga2 2.8.0-1.stretch all
-wget 1.18-5 amd64
+wget 1.18-5+deb9u1 amd64

diff --git a/.etckeeper b/.etckeeper
index 180f0376735d4295ee7c520961b0da492f552a3b..1a0aaeb3652129c4ca1218e883ffb4d21afd37c7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -834,6 +834,7 @@ maybe chmod 0644 'icinga2/features-available/checker.conf'
 maybe chmod 0644 'icinga2/features-available/command.conf'
 maybe chmod 0644 'icinga2/features-available/compatlog.conf'
 maybe chmod 0644 'icinga2/features-available/debuglog.conf'
+maybe chmod 0644 'icinga2/features-available/elasticsearch.conf'
 maybe chmod 0644 'icinga2/features-available/gelf.conf'
 maybe chmod 0644 'icinga2/features-available/graphite.conf'
 maybe chmod 0644 'icinga2/features-available/influxdb.conf'

diff --git a/icinga2/conf.d/timeperiods.conf b/icinga2/conf.d/timeperiods.conf
index 21fac5277e4d05d25f3b831629c40f5faa6cc46d..ea162ff897472933412a5b1b1101c156fa78d103 100644 (file)
--- a/icinga2/conf.d/timeperiods.conf
+++ b/icinga2/conf.d/timeperiods.conf
@@ -1,13 +1,9 @@
 /**
- * Sample timeperiods for Icinga 2 requiring
- * 'legacy-timeperiod' template from the Icinga
- * Template Library (ITL).
+ * Sample timeperiods for Icinga 2.
  * Check the documentation for details.
  */
 
 object TimePeriod "24x7" {
-  import "legacy-timeperiod"
-
   display_name = "Icinga 2 24x7 TimePeriod"
   ranges = {
     "monday"   = "00:00-24:00"
@@ -21,8 +17,6 @@ object TimePeriod "24x7" {
 }
 
 object TimePeriod "9to5" {
-  import "legacy-timeperiod"
-
   display_name = "Icinga 2 9to5 TimePeriod"
   ranges = {
     "monday"   = "09:00-17:00"
@@ -34,8 +28,6 @@ object TimePeriod "9to5" {
 }
 
 object TimePeriod "never" {
-  import "legacy-timeperiod"
-
   display_name = "Icinga 2 never TimePeriod"
   ranges = {
   }

diff --git a/icinga2/features-available/elasticsearch.conf b/icinga2/features-available/elasticsearch.conf
new file mode 100644 (file)
index 0000000..86a05a2
--- /dev/null
+++ b/icinga2/features-available/elasticsearch.conf
@@ -0,0 +1,10 @@
+library "perfdata"
+
+object ElasticsearchWriter "elasticsearch" {
+  //host = "127.0.0.1"
+  //port = 9200
+  //index = "icinga2"
+  //enable_send_perfdata = false
+  //flush_threshold = 1024
+  //flush_interval = 10s
+}

diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf
index a809b96949804586f2311e23277ee802a9d3b532..17513a34618a022d91b8bcedf652a46ff4267eae 100644 (file)
--- a/icinga2/icinga2.conf
+++ b/icinga2/icinga2.conf
@@ -49,12 +49,6 @@ include <nscp>
  */
 include "features-enabled/*.conf"
 
-/**
- * The repository.d directory contains all configuration objects
- * managed by the 'icinga2 repository' CLI commands.
- */
-include_recursive "repository.d"
-
 /**
  * Although in theory you could define all your objects in this file
  * the preferred way is to create separate directories and files in the conf.d