saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index bbb96ea045006034537f573e95f3bc16f7b335f3..ce7a843bebc8905f0e91aad193408a1840365ad3 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1534,9 +1534,21 @@ maybe chmod 0664 'icinga/idomod.cfg-sample'
 maybe chown 'icinga' 'icinga/modules'
 maybe chgrp 'icinga' 'icinga/modules'
 maybe chmod 0775 'icinga/modules'
+maybe chown 'icinga' 'icinga/modules/flapjack.cfg'
+maybe chgrp 'icinga' 'icinga/modules/flapjack.cfg'
+maybe chmod 0664 'icinga/modules/flapjack.cfg'
 maybe chown 'icinga' 'icinga/modules/idoutils.cfg-sample'
 maybe chgrp 'icinga' 'icinga/modules/idoutils.cfg-sample'
 maybe chmod 0664 'icinga/modules/idoutils.cfg-sample'
+maybe chown 'icinga' 'icinga/modules/livestatus.cfg'
+maybe chgrp 'icinga' 'icinga/modules/livestatus.cfg'
+maybe chmod 0664 'icinga/modules/livestatus.cfg'
+maybe chown 'icinga' 'icinga/modules/mod_gearman.cfg'
+maybe chgrp 'icinga' 'icinga/modules/mod_gearman.cfg'
+maybe chmod 0664 'icinga/modules/mod_gearman.cfg'
+maybe chown 'icinga' 'icinga/modules/pnp4nagios.cfg'
+maybe chgrp 'icinga' 'icinga/modules/pnp4nagios.cfg'
+maybe chmod 0664 'icinga/modules/pnp4nagios.cfg'
 maybe chown 'icinga' 'icinga/objects'
 maybe chgrp 'icinga' 'icinga/objects'
 maybe chmod 0775 'icinga/objects'

diff --git a/icinga/icinga.cfg b/icinga/icinga.cfg
index cb734484677a880871b0202f00fbb7598ab07be3..7c9e123e77b90770f43f4aee08cd8e5c23f59a26 100644 (file)
--- a/icinga/icinga.cfg
+++ b/icinga/icinga.cfg
@@ -246,37 +246,7 @@ event_broker_options=-1
 # ----> use the new *module definition* instead:
 # ----> http://docs.icinga.org/latest/en/objectdefinitions.html
 #
-# This directive can be used to specify an event broker module that should
-# by loaded by Icinga at startup.  Use multiple directives if you want
-# to load more than one module.  Arguments that should be passed to
-# the module at startup are seperated from the module path by a space.
-#
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Do NOT overwrite modules while they are being used by Icinga or Icinga
-# will crash in a fiery display of SEGFAULT glory.
-#
-# The correct/safe way of updating a module is by using one of these methods:
-#    1. Shutdown Icinga, replace the module file, restart Icinga
-#    2. Delete the original module file, move the new module file into place, restart Icinga
-#
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
-# IDOUtils idomod.so should be enabled using the module definition,
-# i.e. using a package. First check that, and if not, you can
-# enable it here. 
-#
-# ATTENTION: DO NOT load the same module here AND as a module definition.
-# This can lead into problems with races on ressources.
-#
-# Example:
-#   broker_module=<modulepath> [moduleargs]
-
-#broker_module=/usr/lib64/idomod.so config_file=/etc/icinga/idomod.cfg
-
+# Example definitions can be found in the '/etc/icinga/modules/' directory.
 
 
 # LOG ROTATION METHOD
@@ -1540,16 +1510,3 @@ debug_file=/var/log/icinga/icinga.debug
 
 # 100M
 max_debug_file_size=100000000
-
-
-
-# EVENT PROFILING - DEPRECATED!
-# This option enables or disables event profiling for stats of event counts
-# and time taken for events.  Option can't be used on Solaris with gcc3.
-# Values: 0 - disabled
-#         1 - enabled
-#
-# WARNING: This setting will be deprecated in 1.9 and not developed
-# anymore, as it remains buggy and wasn't really useful for anyone.
-
-event_profiling_enabled=0

diff --git a/icinga/ido2db.cfg-sample b/icinga/ido2db.cfg-sample
index 01acf7d2c5d52a7ba15a182217dda99ae9acfe86..fe193fbeb0976f7f01b5091bb422653feba59009 100644 (file)
--- a/icinga/ido2db.cfg-sample
+++ b/icinga/ido2db.cfg-sample
@@ -316,5 +316,10 @@ oci_errors_to_syslog=1
 # 4 – Bind variables only
 # 8 – Wait events only
 # 12 – Bind Variables and Wait Events
-
 oracle_trace_level=0
+
+
+# TRANSACTIONS
+# This setting determines whether transactions are used. Enabled by default.
+
+use_transactions=1

diff --git a/icinga/modules/flapjack.cfg b/icinga/modules/flapjack.cfg
new file mode 100644 (file)
index 0000000..186bde3
--- /dev/null
+++ b/icinga/modules/flapjack.cfg
@@ -0,0 +1,17 @@
+# ICINGA CONFIG FOR NEB MODULE: FLAPJACK FEEDER
+#
+# In order to have Icinga run the event broker module, you'll need
+# to place a file like this into modules/ by default, and include that
+# directory in your icinga.cfg
+#
+# Note: This is an addon for Icinga 1.x not developed by the Icinga
+# team. You can use this sample config for easier integration.
+
+
+#define module{
+#        module_name     flapjackfeeder
+#        module_type     neb
+#        path            /usr/lib64/flapjackfeeder.o
+#        args            redis_host=localhost,redis_port=6379
+#      }
+

diff --git a/icinga/modules/idoutils.cfg-sample b/icinga/modules/idoutils.cfg-sample
index 413978719bbd1e20c4e238c13220cbc6b63f629d..789cfae54ad2860095053c30d7d6f00319a72b3b 100644 (file)
--- a/icinga/modules/idoutils.cfg-sample
+++ b/icinga/modules/idoutils.cfg-sample
@@ -1,26 +1,8 @@
-# ICINGA CONFIG FOR IDOUTILS
+# ICINGA CONFIG FOR NEB MODULE: IDOMOD (PART OF IDOUTILS)
 #
-# In order to have Icinga run the IDOMOD event broker module, you'll need
+# In order to have Icinga run the event broker module, you'll need
 # to place a file like this into modules/ by default, and include that
 # directory in your icinga.cfg
-#
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Do NOT overwrite modules while they are being used by Icinga or Icinga
-# will crash in a fiery display of SEGFAULT glory.
-#
-# The correct/safe way of updating a module is by using one of these methods:
-#    1. Shutdown Icinga, replace the module file, restart Icinga
-#    2. Delete the original module file, move the new module file into place, restart Icinga
-#
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
-#
-# ATTENTION: DO NOT load the same module here AND via broker_module in icinga.cfg
-# This can lead into problems with races on ressources.
 
 
 define module{

diff --git a/icinga/modules/livestatus.cfg b/icinga/modules/livestatus.cfg
new file mode 100644 (file)
index 0000000..f6d2977
--- /dev/null
+++ b/icinga/modules/livestatus.cfg
@@ -0,0 +1,16 @@
+# ICINGA CONFIG FOR NEB MODULE: LIVESTATUS
+#
+# In order to have Icinga run the event broker module, you'll need
+# to place a file like this into modules/ by default, and include that
+# directory in your icinga.cfg
+#
+# Note: This is an addon for Icinga 1.x not developed by the Icinga
+# team. You can use this sample config for easier integration.
+
+
+#define module{
+#        module_name     livestatus
+#        module_type     neb
+#        path            /usr/lib64/livestatus.so
+#       args            /var/lib/icinga/rw/live
+#      }

diff --git a/icinga/modules/mod_gearman.cfg b/icinga/modules/mod_gearman.cfg
new file mode 100644 (file)
index 0000000..57c6708
--- /dev/null
+++ b/icinga/modules/mod_gearman.cfg
@@ -0,0 +1,15 @@
+# ICINGA CONFIG FOR NEB MODULE: MOD_GEARMAN
+#
+# In order to have Icinga run the event broker module, you'll need
+# to place a file like this into modules/ by default, and include that
+# directory in your icinga.cfg
+#
+# Note: This is an addon for Icinga 1.x not developed by the Icinga
+# team. You can use this sample config for easier integration.
+
+#define module{
+#        module_name     mod_gearman
+#        module_type     neb
+#        path            /usr/lib64/mod_gearman.o
+#        args            config_file=/etc/icinga/mod_gearman.conf
+#      }

diff --git a/icinga/modules/pnp4nagios.cfg b/icinga/modules/pnp4nagios.cfg
new file mode 100644 (file)
index 0000000..2d1afa5
--- /dev/null
+++ b/icinga/modules/pnp4nagios.cfg
@@ -0,0 +1,16 @@
+# ICINGA CONFIG FOR NEB MODULE: NPCDMOD (PNP4NAGIOS)
+#
+# In order to have Icinga run the event broker module, you'll need
+# to place a file like this into modules/ by default, and include that
+# directory in your icinga.cfg
+#
+# Note: This is an addon for Icinga 1.x not developed by the Icinga
+# team. You can use this sample config for easier integration.
+
+
+#define module{
+#        module_name     npcdmod
+#        module_type     neb
+#        path            /usr/lib64/npcdmod.o
+#        args            config_file=/etc/icinga/npcd.cfg
+#      }