Module: check_mk
Branch: master
Commit: 04b574f621a0069d95d3cdce61e36343c1a1a6d6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04b574f621a006…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Aug 23 13:36:51 2013 +0200
Added another missing help text
---
web/plugins/userdb/ldap.py | 2 ++
web/plugins/wato/check_mk_configuration.py | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index d58d873..488fccb 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -338,6 +338,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [],
scope = None):
except ldap.SERVER_DOWN:
if tries_left:
ldap_log(' Received SERVER_DOWN. Retrying...')
+ ldap_connection.reconnect(ldap_connection._uri)
time.sleep(0.5)
else:
break
@@ -345,6 +346,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [],
scope = None):
duration = time.time() - start_time
if not success:
+ ldap_log(' FAILED')
raise MKLDAPException(_('Unable to successfully perform the LDAP search.
'
'Maybe there is a connection problem with the LDAP
server.'))
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index 8d1b649..54b7cf6 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1202,7 +1202,10 @@ register_rule(group,
"host_groups",
GroupSelection(
"host",
- title = _("Assignment of hosts to host groups")),
+ title = _("Assignment of hosts to host groups"),
+ help = _("Hosts can be grouped together into host groups. The most common
use case "
+ "is to put hosts which belong together in a host group to make it
possible "
+ "to get them listed together in the status GUI.")),
match = "all")
register_rule(group,