From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Fri, 22 Sep 2017 12:26:39 +0000 (+0200)
Subject: Drop satellite.conf reference for bottom-up
X-Git-Tag: v2.8.0~66^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16c0fc4177d76ef6949f9d6bbf5209e0cd50cb26;p=icinga2

Drop satellite.conf reference for bottom-up

refs #4799
---

diff --git a/doc/04-configuring-icinga-2.md b/doc/04-configuring-icinga-2.md
index 76c77d561..aff560627 100644
--- a/doc/04-configuring-icinga-2.md
+++ b/doc/04-configuring-icinga-2.md
@@ -250,7 +250,6 @@ Available configuration files which are installed by default:
 * [templates.conf](04-configuring-icinga-2.md#templates-conf)
 * [downtimes.conf](04-configuring-icinga-2.md#downtimes-conf)
 * [timeperiods.conf](04-configuring-icinga-2.md#timeperiods-conf)
-* [satellite.conf](04-configuring-icinga-2.md#satellite-conf)
 * [api-users.conf](04-configuring-icinga-2.md#api-users-conf)
 * [app.conf](04-configuring-icinga-2.md#app-conf)
 
@@ -682,18 +681,6 @@ and `never`. TimePeriod objects are referenced by `*period`
 objects such as hosts, services or notifications.
 
 
-#### satellite.conf <a id="satellite-conf"></a>
-
-Includes default templates and dependencies for
-[monitoring remote clients](06-distributed-monitoring.md#distributed-monitoring)
-using service discovery and
-[config generation](06-distributed-monitoring.md#distributed-monitoring-bottom-up)
-on the master. Can be ignored/removed on setups not using this feature.
-
-
-Further details on the monitoring configuration can be found in the
-[monitoring basics](03-monitoring-basics.md#monitoring-basics) chapter.
-
 #### api-users.conf <a id="api-users-conf"></a>
 
 Provides the default [ApiUser](09-object-types.md#objecttype-apiuser) object
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 46bc6ffb0..68abbf73e 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -50,7 +50,6 @@ else()
 endif()
 
 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/templates.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/timeperiods.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/users.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)