Module: check_mk
Branch: master
Commit: 67547e0efcfe7737acdc3af050978e3f46a54c29
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67547e0efcfe77…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 25 11:25:55 2012 +0200
Updated bug entries #0758
---
.bugs/758 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/.bugs/758 b/.bugs/758
new file mode 100644
index 0000000..371cf8c
--- /dev/null
+++ b/.bugs/758
@@ -0,0 +1,12 @@
+Title: Offer dropdown for standard command comments
+Component: multisite
+State: open
+Date: 2012-05-25 11:22:25
+Targetversion: future
+Class: feature
+
+In the global settings we could have the user configure a list
+of texts. This texts could then be offered as a dropdown in th
+command form. We can implemented this using OptionalDropDown, where
+a text field appears as soon as the first entry "custom text" is
+selected.
Module: check_mk
Branch: master
Commit: 96477b46a3b6f5c48ed6a643287324c910c1c4c8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96477b46a3b6f5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 25 11:38:02 2012 +0200
Allow list of aux tags to be missing in host tag definitions.
---
ChangeLog | 2 ++
web/htdocs/wato.py | 6 ++++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fe36100..6d6b939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
* Keep track of changes made by other users before activating changes,
let user confirm this, new permission can be used to prevent a user
from activating foreign changes.
+ * Allow list of aux tags to be missing in host tag definitions. This
+ makes migration from older version easier.
Multisite:
* New display type 'boxes-omit-root' for BI views
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 68d395b..938f247 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -8828,6 +8828,12 @@ def load_hosttags():
"wato_host_tags" : [],
"wato_aux_tags" : []}
execfile(filename, vars, vars)
+ # Convert manually crafted host tags tags WATO-style. This
+ # makes the migration easier
+ for taggroup in vars["wato_host_tags"]:
+ for nr, entry in enumerate(taggroup[2]):
+ if len(entry) <= 2:
+ taggroup[2][nr] = entry + ([],)
return vars["wato_host_tags"], vars["wato_aux_tags"]
except Exception, e:
Module: check_mk
Branch: master
Commit: 86aae873f19bbc65b6ff79c83b584a247811395c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86aae873f19bbc…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 25 11:20:42 2012 +0200
Fix default value of ValueSpec Dictionary
---
web/htdocs/valuespec.py | 8 ++++++++
web/plugins/wato/active_checks.py | 3 ++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 07cc648..62ee869 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -1656,6 +1656,14 @@ class Dictionary(ValueSpec):
in self._elements
if name in self._required_keys or not self._optional_keys])
+ def default_value(self):
+ def_val = {}
+ for name, vs in self._elements:
+ if name in self._required_keys or not self._optional_keys:
+ def_val[name] = vs.default_value()
+
+ return def_val
+
def value_to_text(self, value):
parts = []
for param, vs in self._elements:
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index ea82ea6..215578f 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -503,7 +503,8 @@ register_rule(group,
title = _("Service description"),
help = _("Please make sure that this is unique per host "
"and does not collide with other services."),
- allow_empty = False)
+ allow_empty = False,
+ default_value = _("Customcheck"))
),
( "command_line",
TextAscii(
Module: check_mk
Branch: master
Commit: 6350e0c318f3dbe8da8e4e7cf9ef8c8171c74067
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6350e0c318f3db…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri May 25 10:34:26 2012 +0200
Updated bug entries #0751
---
.bugs/751 | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.bugs/751 b/.bugs/751
index 27ca54e..2a45a93 100644
--- a/.bugs/751
+++ b/.bugs/751
@@ -1,11 +1,15 @@
Title: CascadingDropdown: visibility broken in case of complain
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2012-05-16 05:43:37
Targetversion: 1.2.0
-Class: bug
If the validate_value raises an exception, the sub-vs will
not be visible. Try this out: got the the details of one
multisite connection, select "Connect via TCP", leave the
host field empty and save.
+
+2012-05-25 10:34:23: changed state open -> done
+This should be solved now. Hope I understood that magic thing ;-).
+Need to review my changes with Mathias.