Module: check_mk
Branch: master
Commit: dc2ee6bc8293f054833ad6ec53ce4ae61fb8c2e5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc2ee6bc8293f0…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Dec 23 20:40:23 2011 +0100
Updated bug entries #0416, #0105, #0411, #0406, #0407
---
.bugs/105 | 10 +++-------
.bugs/406 | 2 +-
.bugs/407 | 2 +-
.bugs/411 | 2 +-
.bugs/416 | 16 ++++++++++------
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.bugs/105 b/.bugs/105
index 77bb133..25a3dfb 100644
--- a/.bugs/105
+++ b/.bugs/105
@@ -1,20 +1,16 @@
-Title: SNMP scan: implement missing scan functions for all checks
+Title: SNMP scan: implement missing scan functions
Component: core
Benefit: 3
State: open
Cost: 5
Date: 2011-01-24 16:22:26
Class: cleanup
-Targetversion: 1.1.12
+Targetversion: 1.2.0
All SNMP checks must define scan functions. Otherwise the scan
can take a long time on some slow devices.
-Currently these are:
+There is just one scan function missing:
$ doc/helpers/validate_checks -a | grep scan
-bluecoat_diskcpu snmp_scan manpage pnp_rra pnp_tmpl perfometer
-fsc_fans snmp_scan pnp_rra pnp_tmpl perfometer
-fsc_temp snmp_scan pnp_rra pnp_tmpl perfometer
ibm_imm_health snmp_scan manpage
-fsc_subsystems snmp_scan
diff --git a/.bugs/406 b/.bugs/406
index 5172638..80f16af 100644
--- a/.bugs/406
+++ b/.bugs/406
@@ -4,7 +4,7 @@ Benefit: 2
State: open
Cost: 2
Date: 2011-10-28 09:22:31
-Targetversion: 1.1.12p1
+Targetversion: 1.2.0
Class: cleanup
In all Multisite views showing problems (also dashboard_...) the
diff --git a/.bugs/407 b/.bugs/407
index 0dd2682..cc23d04 100644
--- a/.bugs/407
+++ b/.bugs/407
@@ -4,7 +4,7 @@ Benefit: 1
State: open
Cost: 1
Date: 2011-10-28 10:10:23
-Targetversion: 1.1.12p1
+Targetversion: 1.2.0
Class: cleanup
New columns for normal/retry check interval for hosts and
diff --git a/.bugs/411 b/.bugs/411
index 5205b9e..f8663b2 100644
--- a/.bugs/411
+++ b/.bugs/411
@@ -1,4 +1,4 @@
-Title: Multisite: internationalization and localization docs missing
+Title: Multisite: i18n and l10n docs missing
Component: docu
Benefit: 1
State: open
diff --git a/.bugs/416 b/.bugs/416
index a0eb941..11deb0b 100644
--- a/.bugs/416
+++ b/.bugs/416
@@ -1,13 +1,17 @@
-Title: BI: Aggregation Groups snapin shows only agregations of local multisite instance
+Title: BI: Aggregation Groups snapin should show remote aggregates
Component: bi
Benefit: 2
State: open
Cost: 2
Date: 2011-11-29 13:08:56
Targetversion: 1.1.13i1
-Class: bug
+Class: wontfix
-The reason is clear: BI is a pure mulitisite feature. But the wish to have the aggregations
-groups of other sites shown is also clear. It could be solved like in the WATO folder snapin
-before 1.1.13. Simply create links to the other sites BI aggregation groups which open
-the multisite BI GUI of the other site.
+The reason is clear: BI is a pure mulitisite feature. But the wish to have
+the aggregations groups of other sites shown is also clear. It could be solved
+like in the WATO folder snapin before 1.1.13. Simply create links to the other
+sites BI aggregation groups which open the multisite BI GUI of the other site.
+
+This leaves many problems open, however. The frame from the remote site will
+contain inconsistent links. I thinks the whole idea of remote BI aggregates
+does not work well together with the concept of BI.
Module: check_mk
Branch: master
Commit: d5b6b559d10f2a9a1d1c84477641e08a62584b4d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5b6b559d10f2a…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Dec 23 15:12:34 2011 +0100
changelog update
---
ChangeLog | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c108704..93b6c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
* Inventory of SNMP devices: force implicit full scan if no services
are configured yet
* FIX: Calling activate_changes hook also in distributed WATO setups
+ * FIX: Fixed display bug in host tags drop down menu after POST of form
* FIX: Fixed javascript errors when doing replication in distributed
wato environments when not having the sidebar open
* FIX: Fixed search form dependant attribute handling
Module: check_mk
Branch: master
Commit: 766dd018242017fd5bffef74a2bf10317095e76a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=766dd018242017…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 23 14:20:32 2011 +0100
WATO: Prevent erros if no contactgroups defined for a user
---
web/htdocs/wato.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index db7efc3..78170b0 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -921,7 +921,7 @@ def check_folder_permissions(folder, how, exception=True, user = None):
if config.user_id not in users:
user_cgs = []
else:
- user_cgs = users[config.user_id]["contactgroups"]
+ user_cgs = users[config.user_id].get("contactgroups", [])
for c in user_cgs:
if c in cgs:
Module: check_mk
Branch: master
Commit: 3e7222e32cf5160bbb7007bd1535551164f71804
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e7222e32cf516…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Dec 23 15:06:37 2011 +0100
WATO: bugfix visibility of host tags dropdown menu after POST form
---
web/htdocs/htmllib.py | 2 +-
web/htdocs/wato.py | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 1572a03..faa9d8f 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -445,7 +445,7 @@ class html:
(onchange_code, varname, varname, attributes))
for value, text in options:
if value == None: value = ""
- sel = value.split('|')[0] == current and " selected" or ""
+ sel = value == current and " selected" or ""
self.write("<option value=\"%s\"%s>%s</option>\n" % (value, sel, text))
self.write("</select>\n")
if varname:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a39e220..a4d73bf 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3529,8 +3529,10 @@ class HostTagAttribute(Attribute):
# But case could occur if tags definitions have been changed.
def render_input(self, value):
+ varname = "attr_" + self.name()
if value == None:
- value = "" # Important for tag groups with an empty tag entry
+ value = html.var(varname,"") # "" is important for tag groups with an empty tag entry
+
# Tag groups with just one entry are being displayed
# as checkboxes
choices = []
@@ -3543,9 +3545,11 @@ class HostTagAttribute(Attribute):
else:
secondary_tags = []
choices.append(("|".join([ tagvalue ] + secondary_tags), e[1]))
- varname = "attr_" + self.name()
+ if value != "" and value == tagvalue:
+ value = value + "|" + "|".join(secondary_tags)
+
if len(choices) == 1:
- html.checkbox(varname, value != None, cssclass = '', onclick='wato_fix_visibility();', add_attr = ["tags=%s"%choices[0][0]])
+ html.checkbox(varname, value != "", cssclass = '', onclick='wato_fix_visibility();', add_attr = ["tags=%s"%choices[0][0]])
html.write(" " + choices[0][1])
else:
html.select(varname, choices, value, onchange='wato_fix_visibility();')