Module: check_mk
Branch: master
Commit: e301514a0c0c865ba99834b1335b0bd9c21c8185
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e301514a0c0c86…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Mon Mar 23 13:58:54 2015 +0100
Merge conflict
---
.werks/1239 | 10 ++++++++++
ChangeLog | 1 +
doc/treasures/downtime | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1239 b/.werks/1239
new file mode 100644
index 0000000..2c7a869
--- /dev/null
+++ b/.werks/1239
@@ -0,0 +1,10 @@
+Title: Fixed /treasures/downtime script to work with the new visuals
+Level: 1
+Component: multisite
+Class: feature
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1427115417
+
+
diff --git a/ChangeLog b/ChangeLog
index da02b7d..13a9a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -290,6 +290,7 @@
* 2040 Allow commands for setting downtimes and acknowledging on BI aggregates...
* 2042 Services are now sorted in a natural way, this affects services containing
numbers...
* 2140 Remove PNP Timeranges from range selection, put these ranges directly into the
list...
+ * 1239 Fixed /treasures/downtime script to work with the new visuals
* 1781 FIX: Fix broken grouping by host/service group in availability
* 1783 FIX: Finish the view "History of Scheduled Downtimes"...
* 1206 FIX: Hostname not longer shown as column in host views
diff --git a/doc/treasures/downtime b/doc/treasures/downtime
index 262994d..5e50352 100755
--- a/doc/treasures/downtime
+++ b/doc/treasures/downtime
@@ -194,7 +194,7 @@ def set_downtime(variables, add_vars):
if arg_services:
for service in arg_services:
if opt_mode == "remove":
- set_downtime(variables, [("service_regex", service +
"$")])
+ set_downtime(variables, [("service_regex", service)])
else:
set_downtime(variables, [("service", service)])
else: