Module: check_mk
Branch: master
Commit: 3e07d2ee22db7c85c2054c75d6d7869135482383
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e07d2ee22db7c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 26 09:57:50 2018 +0200
6352 FIX Fixed "Sync with LDAP connections" default for new sites
When a new monitoring site is create using WATO it was intended to
set the option "Sync with LDAP connections" to make the site not
perform an LDAP sync on it's own.
We assume that new sites will be added as WATO slave site in most
cases. In this scenario you normally don't want to let the slave
sites synchronize on their own because the synchronization would
produce pending changes on the slave site. These pending changes
will prevent future synchronizations from the master site and need
to be confirmed manually on the slave site to be able to sync again.
In previous versions the new sites were configured to synchronize
with LDAP on their own by default. It's recommended to change this
option to the intended default.
However, there are scenarios were it makes sense to set this option
to also perform the synchronization on the slave site with either
all configured LDAP connections or just some connections.
Change-Id: Iaa23361eb7207c16f7070d1fbf78cb36a4f2d854
---
.werks/6352 | 28 ++++++++++++++++++++++++++++
cmk/gui/wato/pages/sites.py | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/.werks/6352 b/.werks/6352
new file mode 100644
index 0000000..b83e2b2
--- /dev/null
+++ b/.werks/6352
@@ -0,0 +1,28 @@
+Title: Fixed "Sync with LDAP connections" default for new sites
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1531893317
+
+When a new monitoring site is create using WATO it was intended to
+set the option "Sync with LDAP connections" to make the site not
+perform an LDAP sync on it's own.
+
+We assume that new sites will be added as WATO slave site in most
+cases. In this scenario you normally don't want to let the slave
+sites synchronize on their own because the synchronization would
+produce pending changes on the slave site. These pending changes
+will prevent future synchronizations from the master site and need
+to be confirmed manually on the slave site to be able to sync again.
+
+In previous versions the new sites were configured to synchronize
+with LDAP on their own by default. It's recommended to change this
+option to the intended default.
+
+However, there are scenarios were it makes sense to set this option
+to also perform the synchronization on the slave site with either
+all configured LDAP connections or just some connections.
diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py
index 32703e9..e541e97 100644
--- a/cmk/gui/wato/pages/sites.py
+++ b/cmk/gui/wato/pages/sites.py
@@ -673,7 +673,7 @@ class ModeEditSite(ModeSites):
forms.section(_("Sync with LDAP connections"), simple=True)
self._site_mgmt.user_sync_valuespec().render_input("user_sync",
- self._site.get("user_sync",
userdb.user_sync_default_config(self._site_id)))
+ self._site.get("user_sync", None if self._new else
userdb.user_sync_default_config(self._site_id)))
html.br()
html.help(_('By default the users are synchronized automatically in the
interval configured '
'in the connection. For example the LDAP connector synchronizes
the users every '