Documentation: Add some more remote client details

Rename agents.conf too.

refs #7254

diff --git a/doc/5-monitoring-remote-systems.md b/doc/5-monitoring-remote-systems.md
index df90283bf3aab39baff139865f5e1f21be483e75..ace7d35d34bd442df8fc443b69d84931e5ef8b9e 100644 (file)
--- a/doc/5-monitoring-remote-systems.md
+++ b/doc/5-monitoring-remote-systems.md
@@ -299,6 +299,11 @@ The setup wizard will do the following:
 
 The setup wizard does not automatically restart Icinga 2.
 
+If you are getting an error when requesting the ticket number, please check the following:
+
+* Is the CN the same (from pki ticket on the master and setup node on the client)
+* Is the ticket expired
+
 
 ### <a id="icinga2-remote-monitoring-client-windows"></a> Windows Client Setup for Remote Monitoring
 
@@ -396,6 +401,12 @@ generating all required configuration.
 
 The generated configuration of all nodes is stored in the `repository.d/` directory.
 
+By default, the following additional configuration is generated:
+* add `Endpoint` and `Zone` objects for the newly added node
+* add `cluster-zone` health check for the master host detecting if the remote node died
+* use the default templates `satellite-host` and `satellite-service` defined in `/etc/icinga2/conf.d/satellite.conf`
+* apply a dependency for all other hosts on the remote satellite prevening failure checks/notifications
+
 > **Note**
 >
 > If there are existing hosts/services defined or modified, the cli command will not overwrite these (modified)

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 03906863e8e6a53fed91c4b5d7542d70fd0001b3..0ddaae47840e9c52bc8851d049c78698c79226fa 100644 (file)
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -26,11 +26,11 @@ install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf ${CMAKE_INST
 install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
 install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
 install_if_not_exists(icinga2/zones.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
-install_if_not_exists(icinga2/conf.d/agent.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/commands.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/downtimes.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/groups.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/notifications.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
+install_if_not_exists(icinga2/conf.d/satellite.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/templates.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/timeperiods.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)

diff --git a/etc/icinga2/conf.d/agent.conf b/etc/icinga2/conf.d/satellite.conf
similarity index 100%
rename from etc/icinga2/conf.d/agent.conf
rename to etc/icinga2/conf.d/satellite.conf