Module: check_mk
Branch: master
Commit: b5986ef2f8f9bf52e642b6908d5558efc15405cf
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5986ef2f8f9bf…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Sep 24 16:29:25 2012 +0200
FIX: It is now possible to create clusters in empty folders
---
.bugs/718 | 7 +++++--
.bugs/731 | 7 +++++--
.bugs/738 | 7 +++++--
.bugs/740 | 7 +++++--
.bugs/797 | 7 +++++--
ChangeLog | 1 +
web/htdocs/wato.py | 25 ++++++++++++-------------
7 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/.bugs/718 b/.bugs/718
index c40b25d..a9b9368 100644
--- a/.bugs/718
+++ b/.bugs/718
@@ -1,9 +1,9 @@
Title: WATO tags menue has issues when deleting tags
Component: wato
-State: open
+Class: bug
+State: done
Date: 2012-08-10 16:42:19
Targetversion: future
-Class: bug
If you create an empty tag (desc. and tag id) and then another one the empty tag will
corrupt the tag id's.
@@ -11,3 +11,6 @@ It seems this faulty state is also saved:
If you delete another tag later on, all tags below the tag you're deleting are also
lost.
It's already verified to be a bug ;)
+
+2012-09-24 15:33:16: changed state open -> done
+It is not possible to define empty tag ids or descriptions anymore. Should be solved
now.
diff --git a/.bugs/731 b/.bugs/731
index 23473e9..16ec9ea 100644
--- a/.bugs/731
+++ b/.bugs/731
@@ -1,9 +1,12 @@
Title: Link to pnp4nagios when hash key in service description
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2012-07-10 11:43:04
Targetversion: future
-Class: bug
On service icon linkes, the hash char are not replaced by %23 so the link doesent work
on pnp service graph line, just the first hash a replaced
+
+2012-09-24 15:58:44: changed state open -> done
+Works in current versions
diff --git a/.bugs/738 b/.bugs/738
index 407d28c..9352274 100644
--- a/.bugs/738
+++ b/.bugs/738
@@ -1,8 +1,11 @@
Title: Creating clusters in emtpty wato folders
Component: wato
-State: open
+Class: bug
+State: done
Date: 2012-08-21 14:13:37
Targetversion: 1.2.0
-Class: bug
It is not possible to create an cluster host in an folder without normal hosts in it.
+
+2012-09-24 16:28:51: changed state open -> done
+It is now possible to create clusters in empty folders.
diff --git a/.bugs/740 b/.bugs/740
index fb0ce4f..64c8a64 100644
--- a/.bugs/740
+++ b/.bugs/740
@@ -1,8 +1,11 @@
Title: Empty "Monitoring on Host field" deleteds all Wato config
Component: wato
-State: open
+Class: bug
+State: done
Date: 2012-09-04 11:35:16
Targetversion: 1.2.0
-Class: bug
In replicated wato settings all configuration get lost, when the Monitoring on host field
is empty on creating a host
+
+2012-09-24 16:03:22: changed state open -> done
+It is not possible to select an empty value in "monitored on". So this bug has
been fixed.
diff --git a/.bugs/797 b/.bugs/797
index b74b5bd..6e4fafc 100644
--- a/.bugs/797
+++ b/.bugs/797
@@ -1,9 +1,9 @@
Title: PNP Graph zoom zooms wrong position
Component: multisite
-State: open
+Class: bug
+State: wontfix
Date: 2012-08-22 11:21:24
Targetversion: 1.2.0
-Class: bug
If you make a area selection on a pnp graphs displayed in multisite you end up
at a different position in the graph than you expected
@@ -11,3 +11,6 @@ If you try to view the right-most position, it will not be possible
because you
always get something else.
LM: Where can PNP graphs be zoomed while being displayed in multisite?
+
+2012-09-24 15:59:27: changed state open -> wontfix
+Can not reproduce. Closing this. Please report back with a detailed description how to
reproduce.
diff --git a/ChangeLog b/ChangeLog
index 3b703ba..2152120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* Added "view" parameter to dashlet_pnpgraph webservice
WATO
+ * FIX: It is now possible to create clusters in empty folders
* FIX: Fixed problem with complaining empty ListOf() valuespecs
1.2.1i1:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index e8ec7d5..2fdc5f1 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -704,18 +704,18 @@ def save_hosts(folder = None):
out.write(' %s,\n' % entry)
out.write("]\n")
- if len(clusters) > 0:
- out.write("\nclusters.update({")
- for entry, nodes in clusters:
- out.write('\n %s : %s,\n' % (entry, repr(nodes)))
- out.write("})\n")
-
- if len(ipaddresses) > 0:
- out.write("\n# Explicit IP addresses\n")
- out.write("ipaddresses.update(")
- out.write(pprint.pformat(ipaddresses))
- out.write(")")
- out.write("\n")
+ if len(clusters) > 0:
+ out.write("\nclusters.update({")
+ for entry, nodes in clusters:
+ out.write('\n %s : %s,\n' % (entry, repr(nodes)))
+ out.write("})\n")
+
+ if len(ipaddresses) > 0:
+ out.write("\n# Explicit IP addresses\n")
+ out.write("ipaddresses.update(")
+ out.write(pprint.pformat(ipaddresses))
+ out.write(")")
+ out.write("\n")
for nag_varname, entries in custom_macros.items():
macrolist = []
@@ -1889,7 +1889,6 @@ def mode_edithost(phase, new, cluster):
if hostname:
go_to_services = html.var("services")
if html.check_transaction():
-
if new:
g_folder[".hosts"][hostname] = host
mark_affected_sites_dirty(g_folder, hostname)