[icinga-checkins] icinga.org: icinga2/master: icinga2.conf: Include plugins-contrib, manubulon, windows-plugins, nscp by default

git at icinga.org git at icinga.org
Tue Aug 16 11:18:48 CEST 2016


Module: icinga2
Branch: master
Commit: 9a455f0c3da7586a74ef3d6dd8ea8ff4dd73f5e3
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=9a455f0c3da7586a74ef3d6dd8ea8ff4dd73f5e3

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Tue Aug 16 08:42:52 2016 +0200

icinga2.conf: Include plugins-contrib, manubulon, windows-plugins, nscp by default

This helps a lot when configuring client checks as command endpoint
where the check command definitions are both used on the master
and the client.

fixes #10722

---

 doc/4-configuring-icinga-2.md  |   17 +++++++++++++++++
 etc/icinga2/icinga2.conf       |   15 ++++++++++++++-
 etc/icinga2/win32/icinga2.conf |    4 ++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/doc/4-configuring-icinga-2.md b/doc/4-configuring-icinga-2.md
index 192bad5..9e455fa 100644
--- a/doc/4-configuring-icinga-2.md
+++ b/doc/4-configuring-icinga-2.md
@@ -100,6 +100,9 @@ The `include` directive can be used to include other files.
      */
      include "zones.conf"
 
+The [Icinga Template Library](10-icinga-template-library.md#icinga-template-library) provides a set of common templates
+and [CheckCommand](3-monitoring-basics.md#check-commands) definitions.
+
     /**
      * The Icinga Template Library (ITL) provides a number of useful templates
      * and command definitions.
@@ -107,6 +110,20 @@ The `include` directive can be used to include other files.
      */
     include <itl>
     include <plugins>
+    include <plugins-contrib>
+    include <manubulon>
+
+    /**
+     * This includes the Icinga 2 Windows plugins. These command definitions
+     * are required on a master node when a client is used as command endpoint.
+     */
+    include <windows-plugins>
+
+    /**
+     * This includes the NSClient++ check commands. These command definitions
+     * are required on a master node when a client is used as command endpoint.
+     */
+    include <nscp>
 
     /**
      * The features-available directory contains a number of configuration
diff --git a/etc/icinga2/icinga2.conf b/etc/icinga2/icinga2.conf
index e258e7e..a809b96 100644
--- a/etc/icinga2/icinga2.conf
+++ b/etc/icinga2/icinga2.conf
@@ -25,7 +25,20 @@ include "zones.conf"
  */
 include <itl>
 include <plugins>
-// include <plugins-contrib>
+include <plugins-contrib>
+include <manubulon>
+
+/**
+ * This includes the Icinga 2 Windows plugins. These command definitions
+ * are required on a master node when a client is used as command endpoint.
+ */
+include <windows-plugins>
+
+/**
+ * This includes the NSClient++ check commands. These command definitions
+ * are required on a master node when a client is used as command endpoint.
+ */
+include <nscp>
 
 /**
  * The features-available directory contains a number of configuration
diff --git a/etc/icinga2/win32/icinga2.conf b/etc/icinga2/win32/icinga2.conf
index 6263afb..ecd6120 100644
--- a/etc/icinga2/win32/icinga2.conf
+++ b/etc/icinga2/win32/icinga2.conf
@@ -25,7 +25,8 @@ include "zones.conf"
  */
 include <itl>
 include <plugins>
-// include <plugins-contrib>
+include <plugins-contrib>
+include <manubulon>
 
 /**
  * This includes the Icinga 2 Windows plugins.
@@ -58,4 +59,3 @@ include_recursive "repository.d"
  * directory. Each of these files must have the file extension ".conf".
  */
 include_recursive "conf.d"
-



More information about the icinga-checkins mailing list