tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael Friedrich 2016-08-16 08:42:52 +02:00
parent b7a1b58069
commit 9a455f0c3d
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/4-configuring-icinga-2.md
View File

@ -100,6 +100,9 @@ The `include` directive can be used to include other files.
*/ */
include "zones.conf" 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 * The Icinga Template Library (ITL) provides a number of useful templates
* and command definitions. * and command definitions.
@ -107,6 +110,20 @@ The `include` directive can be used to include other files.
*/ */
include <itl> include <itl>
include <plugins> 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 * The features-available directory contains a number of configuration

15
etc/icinga2/icinga2.conf
View File

@ -25,7 +25,20 @@ include "zones.conf"
*/ */
include <itl> include <itl>
include <plugins> 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 * The features-available directory contains a number of configuration

4
etc/icinga2/win32/icinga2.conf
View File

@ -25,7 +25,8 @@ include "zones.conf"
*/ */
include <itl> include <itl>
include <plugins> include <plugins>
// include <plugins-contrib> include <plugins-contrib>
include <manubulon>
/** /**
* This includes the Icinga 2 Windows plugins. * 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". * directory. Each of these files must have the file extension ".conf".
*/ */
include_recursive "conf.d" include_recursive "conf.d"