Docs: Add a note about removing "conf.d" on the client for "top down command endpoint...

fixes #13395

diff --git a/doc/6-distributed-monitoring.md b/doc/6-distributed-monitoring.md
index 3555e710bcafc49216af18c6b3d0c6dfe571151a..04cf8b28f024f30e1699c4ae46b88c57d4ad48ac 100644 (file)
--- a/doc/6-distributed-monitoring.md
+++ b/doc/6-distributed-monitoring.md
@@ -603,6 +603,16 @@ for syncing check commands later:
       global = true
     }
 
+You don't need any local configuration on the client except for
+CheckCommand definitions which can be synced using the global zone
+above. Therefore disable the inclusion of the `conf.d` directory
+in `/etc/icinga2/icinga2.conf`.
+
+    [root@icinga2-client1.localdomain /]# vim /etc/icinga2/icinga2.conf
+
+    // Commented out, not required on a client as command endpoint
+    //include_recursive "conf.d"
+
 Edit the `api` feature on the client `icinga2-client2.localdomain` in
 the `/etc/icinga2/features-enabled/api.conf` file and make sure to set
 `accept_commands` and `accept_config` to `true`:
@@ -988,13 +998,7 @@ configuration file.
 
 **Steps on each client**:
 
-Comment or remove the `include recursive "conf.d"` line.
-
-    [root@icinga2-client1.localdomain /]# vim /etc/icinga2/icinga2.conf
-
-    //include_recursive "conf.d"
-
-In addition to that add a [global zone](6-distributed-monitoring.md#distributed-monitoring-global-zone-config-sync)
+Add a [global zone](6-distributed-monitoring.md#distributed-monitoring-global-zone-config-sync)
 for syncing check commands later:
 
     [root@icinga2-client1.localdomain /]# vim /etc/icinga2/zones.conf
@@ -1003,6 +1007,16 @@ for syncing check commands later:
       global = true
     }
 
+You don't need any local configuration on the client except for
+CheckCommand definitions which can be synced using the global zone
+above. Therefore disable the inclusion of the `conf.d` directory
+in `/etc/icinga2/icinga2.conf`.
+
+    [root@icinga2-client1.localdomain /]# vim /etc/icinga2/icinga2.conf
+
+    // Commented out, not required on a client as command endpoint
+    //include_recursive "conf.d"
+
 Edit the `api` feature on the client `icinga2-client2.localdomain` in
 the `/etc/icinga2/features-enabled/api.conf` file and make sure to set
 `accept_commands` and `accept_config` to `true`:
@@ -1827,6 +1841,8 @@ zone. The configuration validation will terminate with an error.
 The zone object configuration must be deployed on all nodes which should receive
 the global configuration files:
 
+    [root@icinga2-master1.localdomain /]# vim /etc/icinga2/zones.conf
+
     object Zone "global-templates" {
       global = true
     }