From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Fri, 2 Jun 2017 08:52:47 +0000 (+0200)
Subject: zones.conf: Add global-templates & director-global by default
X-Git-Tag: v2.7.0~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e153f14d7a4e8cee810d912ef497674e87faa77;p=icinga2

zones.conf: Add global-templates & director-global by default

This makes it easier for cluster and client setups with or
without the Icinga Director.

Note: Clients will still not receive synced configuration if
accept_config is not enabled (which is the default, and can be changed
during setup).

fixes #5106
---

diff --git a/doc/6-distributed-monitoring.md b/doc/6-distributed-monitoring.md
index b59237442..7553cce33 100644
--- a/doc/6-distributed-monitoring.md
+++ b/doc/6-distributed-monitoring.md
@@ -542,6 +542,8 @@ the `zones.conf` file in your preferred editor. Add the following lines if not e
       global = true
     }
 
+Note: Packages >= 2.7 provide this configuration by default.
+
 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
@@ -669,6 +671,8 @@ for syncing check commands later:
       global = true
     }
 
+Note: Packages >= 2.7 provide this configuration by default.
+
 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
@@ -1059,6 +1063,8 @@ for syncing check commands later:
       global = true
     }
 
+Note: Packages >= 2.7 provide this configuration by default.
+
 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
@@ -1227,6 +1233,8 @@ file.
       global = true
     }
 
+Note: Packages >= 2.7 provide this configuration by default.
+
 Put existing CheckCommand definitions into `/etc/icinga2/zones.d/global-templates/commands.conf`.
 
     [root@icinga2-master1.localdomain /]# mkdir -p /etc/icinga2/zones.d/global-templates
@@ -1923,6 +1931,8 @@ the global configuration files:
       global = true
     }
 
+Note: Packages >= 2.7 provide this configuration by default.
+
 Similar to the zone configuration sync you'll need to create a new directory in
 `/etc/icinga2/zones.d`:
 
@@ -2551,6 +2561,8 @@ Add an additional global zone. Please note the `>>` append mode.
     }
     EOF
 
+Note: Packages >= 2.7 provide this configuration by default.
+
 If this client node is configured as [remote command endpoint execution](6-distributed-monitoring.md#distributed-monitoring-top-down-command-endpoint)
 you can safely disable the `checker` feature. The `node setup` CLI command already disabled the `notification` feature.
 
diff --git a/etc/icinga2/zones.conf b/etc/icinga2/zones.conf
index 9c76de7bb..70ac766d8 100644
--- a/etc/icinga2/zones.conf
+++ b/etc/icinga2/zones.conf
@@ -13,17 +13,29 @@ object Zone ZoneName {
 }
 
 /*
- * Defines a global zone containing templates,
- * etc. synced to all nodes, if they accept
- * configuration. All remote nodes need
- * this zone configured too.
+ * Defines a global zone for distributed setups with masters,
+ * satellites and clients.
+ * This is required to sync configuration commands,
+ * templates, apply rules, etc. to satellite and clients.
+ * All nodes require the same configuration and must
+ * have `accept_config` enabled in the `api` feature.
  */
 
-/*
 object Zone "global-templates" {
   global = true
 }
-*/
+
+/*
+ * Defines a global zone for the Icinga Director.
+ * This is required to sync configuration commands,
+ * templates, apply rules, etc. to satellite and clients.
+ * All nodes require the same configuration and must
+ * have `accept_config` enabled in the `api` feature.
+ */
+
+object Zone "director-global" {
+  global = true
+}
 
 /*
  * Read the documentation on how to configure