Module: check_mk
Branch: master
Commit: 422473596f3ddd8b1f256def9da8fca413258714
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=422473596f3ddd…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Feb 20 10:59:06 2012 +0100
WATO: FIX: honor site disabling in replication module
---
ChangeLog | 1 +
web/htdocs/wato.py | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 74edc23..480b481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
* FIX: Do not use None$ as item when creating new rules
* FIX: Do load *all* users from htpasswd, so passwords from
users not created via WATO will not be lost.
+ * FIX: honor site disabling in replication module
Checks & Agents:
* hpux_if: fix missing default parameter errors
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index c922a97..c302414 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -5821,10 +5821,10 @@ def mode_edit_site(phase):
"that URL will be fetched by the Apache server of the local "
"site itself, whilst the URL-Prefix is used by your local Browser.")))
html.text_input("multisiteurl", site.get("multisiteurl", ""), size=60)
- html.checkbox("insecure", site.get("insecure", False))
- html.write(_('Ignore SSL certificate errors<br>'
- '<i>This might be needed to make the synchronization accept problems with '
- 'SSL certificates when using an SSL secured connection.</i>'))
+ html.write("<br><br>")
+ html.checkbox("insecure", site.get("insecure", False), label = _('Ignore SSL certificate errors'))
+ html.write('<br><i>This might be needed to make the synchronization accept problems with '
+ 'SSL certificates when using an SSL secured connection.</i>')
html.write("</td></tr>")
html.write("<tr><td colspan=2 class=buttons>")
html.button("save", _("Save"))
@@ -5982,7 +5982,7 @@ def is_distributed(sites = None):
if sites == None:
sites = config.sites
for site in sites.values():
- if site.get("replication"):
+ if site.get("replication") and not site.get("disabled"):
return True
return False
Module: check_mk
Branch: master
Commit: 856d5d6722a9ae43e7f090a58abd070de455381d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=856d5d6722a9ae…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Feb 20 10:37:37 2012 +0100
Extended ping_level number of packets description
---
web/plugins/wato/check_parameters.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 11a4aa4..134f4cf 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -61,7 +61,9 @@ register_rule(group,
( "packets",
Integer(
title = _("Number of packets"),
- help = _("Number ICMP echo request packets to send to the target host"),
+ help = _("Number ICMP echo request packets to send to the target host on each "
+ "check execution. All packets are sent directly on check execution. Afterwards "
+ "the check waits for the incoming packets."),
minvalue = 1,
maxvalue = 20,
)),