Module: check_mk
Branch: master
Commit: 523fe6b7f72e0652f47b528fd4a5413fd9819612
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=523fe6b7f72e06…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Apr 19 13:41:23 2016 +0200
3029 FIX rule editor icon: fixed query of invalid livestatus column
The cmc.log file regularly showed <i>"Replacing non-existing column
'host_host_name' with null column"</i>
whenever a multisite page with icons was shown. Most of the time it had no effect and did
not brake anything,
because the correct data was already queried through an other function. Nevertheless, this
bug has been fixed.
---
.werks/3029 | 11 +++++++++++
ChangeLog | 1 +
web/plugins/icons/builtin.py | 3 ++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/3029 b/.werks/3029
new file mode 100644
index 0000000..cb6c8d5
--- /dev/null
+++ b/.werks/3029
@@ -0,0 +1,11 @@
+Title: rule editor icon: fixed query of invalid livestatus column
+Level: 1
+Component: multisite
+Compatible: compat
+Version: 1.2.9i1
+Date: 1461065867
+Class: fix
+
+The cmc.log file regularly showed <i>"Replacing non-existing column
'host_host_name' with null column"</i>
+whenever a multisite page with icons was shown. Most of the time it had no effect and did
not brake anything,
+because the correct data was already queried through an other function. Nevertheless,
this bug has been fixed.
diff --git a/ChangeLog b/ChangeLog
index 1424068..2ad53e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -217,6 +217,7 @@
* 3401 FIX: Fix sorting and grouping hosts by their IPv4 address
* 3402 FIX: Using information from inventory in column tooltips now longer crashes
* 3413 FIX: Correctly display non-Ascii-characters in host tag values in host tag
filter
+ * 3029 FIX: rule editor icon: fixed query of invalid livestatus column...
WATO:
* 3244 WATO BI Module: swap order of aggregation function and child node
selection...
diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py
index 29e84c7..93ed044 100644
--- a/web/plugins/icons/builtin.py
+++ b/web/plugins/icons/builtin.py
@@ -198,7 +198,8 @@ def paint_rule_editor(what, row, tags, host_custom_vars):
return 'rulesets', title, html.makeuri_contextless(urlvars,
"wato.py")
multisite_icons_and_actions['rule_editor'] = {
- 'columns': [ 'check_type', "host_name" ],
+ 'columns': [ 'check_type' ],
+ 'host_columns' : [ 'name' ],
'service_columns': [ 'description' ],
'paint': paint_rule_editor,
}