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

Drop satellite.conf reference for bottom-up 

refs #4799
This commit is contained in:
Michael Friedrich 2017-09-22 14:26:39 +02:00
parent 790485c8bc
commit 16c0fc4177
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/04-configuring-icinga-2.md
View File

@ -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

1
etc/CMakeLists.txt
View File

@ -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)