Module: check_mk
Branch: master
Commit: 522b3e9d288aaaa7f09cc9f3a4fa1112c8d90d7e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=522b3e9d288aaa…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Nov 10 10:33:24 2011 +0100
FIX: Remove WATO Folder filter if WATO is disabled
---
ChangeLog | 3 +++
web/htdocs/views.py | 6 ++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 661397c..60a1bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
* New columns num_hosts and num_services in status table
* New aggregation functions suminv and avginv (see Documentation)
+1.1.12p2:
+ * FIX: Do not show WATO button in views if WATO is disabled
+ * FIX: Remove WATO Folder filter if WATO is disabled
1.1.12p1:
Core, Setup, etc.:
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 74e9fa0..7a1b648 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1151,6 +1151,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru
# add ubiquitary_filters that are possible for this datasource
for fn in ubiquitary_filters:
+ # Disable 'filename' filter, if WATO is disabled
+ if fn == "filename" and not config.wato_enabled:
+ continue
filter = multisite_filters[fn]
if not filter.info or filter.info in datasource["infos"]:
show_filters.append(filter)
@@ -1558,6 +1561,9 @@ def view_title(view):
title = view["title"] + " " + ", ".join(extra_titles)
for fn in ubiquitary_filters:
+ # Disable 'filename' filter, if WATO is disabled
+ if fn == "filename" and not config.wato_enabled:
+ continue
filt = multisite_filters[fn]
heading = filt.heading_info(tablename)
if heading:
Module: check_mk
Branch: master
Commit: dd40b1ec007339fb977c2d5b570d0644a2b327bc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd40b1ec007339…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Nov 10 11:53:52 2011 +0100
Updated bug entries #0433
---
.bugs/433 | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/.bugs/433 b/.bugs/433
new file mode 100644
index 0000000..814494a
--- /dev/null
+++ b/.bugs/433
@@ -0,0 +1,13 @@
+Title: cmk -II should keep services on error
+Component: core
+Benefit: 1
+State: open
+Cost: 2
+Date: 2011-11-10 11:52:56
+Targetversion: future
+Class: nastiness
+
+If you do a cmk -II on a host and no data can be
+fetched from the agent, then all services are removed
+anyway. Better would be to abort with an error and
+keep the services.