Module: check_mk
Branch: master
Commit: a8fd68d99c50dfcd70923a3604e59034734409f0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8fd68d99c50df…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 24 17:20:11 2012 +0200
FIX: Site management: replication setting was lost after re-editing
---
ChangeLog | 1 +
web/htdocs/wato.py | 20 +++++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 68f5453..f93d1c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
* FIX: Added check if contacts belong to contactgroup before contactgroup deletion
* FIX: fix site configuration for local site in Multisite environments
* FIX: "(no not monitor)" setting in distributed WATO now works
+ * FIX: Site management: replication setting was lost after re-editing
Multisite:
* New display type 'boxes-omit-root' for BI views
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a60f3a3..6fd528a 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6355,8 +6355,7 @@ def mode_edit_site(phase):
# Persist
new_site["persist"] = html.get_checkbox("persist")
- # Handle the insecure replication flag
- new_site["insecure"] = html.get_checkbox("insecure")
+
# Status host
sh_site = html.var("sh_site")
@@ -6387,18 +6386,25 @@ def mode_edit_site(phase):
multisiteurl = html.var("multisiteurl", "").strip()
if repl:
if not multisiteurl:
- raise MKUserError("multisiteurl", _("Please enter the Multisite URL of the slave/peer site."))
+ raise MKUserError("multisiteurl",
+ _("Please enter the Multisite URL of the slave/peer site."))
if not multisiteurl.endswith("/check_mk/"):
- raise MKUserError("multisiteurl", _("The Multisite URL must end with /check_mk/"))
+ raise MKUserError("multisiteurl",
+ _("The Multisite URL must end with /check_mk/"))
if not multisiteurl.startswith("http://") and not multisiteurl.startswith("https://"):
- raise MKUserError("multisiteurl", _("The Multisites URL must begin with <tt>http://</tt> or <tt>https://</tt>."))
+ raise MKUserError("multisiteurl",
+ _("The Multisites URL must begin with <tt>http://</tt> or <tt>https://</tt>."))
if "socket" not in new_site:
- raise MKUserError("replication", _("You cannot do replication with the local site."))
+ raise MKUserError("replication",
+ _("You cannot do replication with the local site."))
# Save Multisite-URL even if replication is turned off. That way that
# setting is not lost if replication is turned off for a while.
new_site["multisiteurl"] = multisiteurl
+ # Handle the insecure replication flag
+ new_site["insecure"] = html.get_checkbox("insecure")
+
# Secret is not checked here, just kept
if not new and "secret" in old_site:
new_site["secret"] = old_site["secret"]
@@ -6519,7 +6525,7 @@ def mode_edit_site(phase):
[ ("none", _("No replication with this site")),
("peer", _("Peer: synchronize configuration with this site")),
("slave", _("Slave: push configuration to this site"))
- ])
+ ], site.get("replication", "none"))
html.help( _("WATO replication allows you to manage several monitoring sites with a "
"logically centralized WATO. Slave sites receive their configuration "
"from master sites. Several master sites can build a peer-to-peer "
Module: check_mk
Branch: master
Commit: 76edfcbba083b12bccb1e06068a356d3aeafe5ba
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76edfcbba083b1…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 24 17:09:30 2012 +0200
"(no not monitor)" setting in distributed WATO now works
---
.bugs/661 | 7 +++++--
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.bugs/661 b/.bugs/661
index 7d0f6eb..c0edc3b 100644
--- a/.bugs/661
+++ b/.bugs/661
@@ -1,11 +1,14 @@
Title: Do no monitor host leads to host monitored on all sites
Component: wato
-State: open
+Class: bug
+State: done
Date: 2012-05-10 14:36:38
Targetversion: 1.2.0
-Class: bug
If you set a host to "do not monitor" in the "monitored on" attribute,
then that host will be monitored on *all* sites instead of on none.
Solution: currently no site: tag is set in that case, but we rather
should set an empty site: tag.
+
+2012-05-24 17:08:45: changed state open -> done
+Instead of removing the site: tag we now add an empty site: tag
diff --git a/ChangeLog b/ChangeLog
index b0e1f5d..68f5453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
* FIX: Fixed layout problem on "activate changes" page
* FIX: Added check if contacts belong to contactgroup before contactgroup deletion
* FIX: fix site configuration for local site in Multisite environments
+ * FIX: "(no not monitor)" setting in distributed WATO now works
Multisite:
* New display type 'boxes-omit-root' for BI views
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 007e37a..cc624ac 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6790,7 +6790,7 @@ class SiteAttribute(Attribute):
if value:
return [ "site:" + value ]
else:
- return []
+ return [ "site:" ]
# The replication status contains information about each
# site. It is a dictionary from the site id to a dict with
Module: check_mk
Branch: master
Commit: dd47d1ba25c87bb47a2c46909df34fb407fd5fa5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd47d1ba25c87b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu May 24 15:41:05 2012 +0200
FIX: Added check if contacts belong to contactgroup before contactgroup deletion
---
ChangeLog | 1 +
web/htdocs/wato.py | 30 ++++++++++++++++++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ce82a23..22319e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
* FIX: Detecting duplicate tag ids between regular tags and auxtags
* FIX: Fixed layout problem of "new special rule" button in rule editor
* FIX: Fixed layout problem on "activate changes" page
+ * FIX: Added check if contacts belong to contactgroup before contactgroup deletion
Multisite:
* FIX: remove refresh button from dashboard.
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 71ec08a..612d4c2 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -5387,10 +5387,32 @@ def mode_groups(phase, what):
if phase == "action":
delname = html.var("_delete")
- c = wato_confirm(_("Confirm deletion of group %s" % delname),
- _("Do you really want to delete the group %s? If there are still objects "
- "assigned to that group, the group will kept up (but without an alias). "
- "Removing all objects from the will make the group disappear completely. " % what))
+
+ if what == 'contact':
+ # Is the contactgroup in use?
+ member_links = []
+ users = filter_hidden_users(load_users())
+ entries = users.items()
+ entries.sort(cmp = lambda a, b: cmp(a[1].get("alias"), b[1].get("alias")))
+ for id, user in entries:
+ cgs = user.get("contactgroups", [])
+ if delname in cgs:
+ member_links.append('<a href="%s">%s</a>' %
+ (make_link([('mode', 'edit_user'), ('edit', id)]), user.get('alias')))
+
+ if member_links:
+ raise MKUserError(None,
+ _('Unable to delete the group %s. It still has the following members: %s. '
+ ' You must first remove all members from the group to be able to delete the group.') %
+ (delname, ', '.join(member_links)))
+
+ confirm_txt = _('Do you really want to delete the %s group %s?') % (what, delname)
+ else:
+ confirm_txt = _("Do you really want to delete the %s group %s? If there are still objects "
+ "assigned to that group, the group will kept up (but without an alias). "
+ "Removing all objects from the will make the group disappear completely. ") % (what, delname)
+
+ c = wato_confirm(_("Confirm deletion of group %s" % delname), confirm_txt)
if c:
del groups[delname]
save_group_information(all_groups)