Module: check_mk
Branch: master
Commit: e7b8df49f98a2a9cdd7c182c501751361bd05f9b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7b8df49f98a2a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Aug 18 18:35:36 2011 +0200
Allow host names to contain spaces
---
ChangeLog | 4 ++++
doc/check_mk_templates.cfg | 4 ++--
web/htdocs/actions.py | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eefc534..3db1c0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
1.1.11i3:
Core, Setup, etc.:
+ * FIX: allow host names to have spaces
* --snmpwalk: fix missing space in case of HEX strings
Checks & Agents:
@@ -12,6 +13,9 @@
* WaitObject: allow to separate host name and service with a semicolon.
That makes host names containing spaces possible.
+ Multisite:
+ * FIX: reschedule now works for host names containing spaces
+
1.1.11i2:
Core, Setup, etc.:
* FIX: sort output of cmk --list-hosts alphabetically
diff --git a/doc/check_mk_templates.cfg b/doc/check_mk_templates.cfg
index 803b4cb..c0a9397 100644
--- a/doc/check_mk_templates.cfg
+++ b/doc/check_mk_templates.cfg
@@ -259,7 +259,7 @@ define servicedependency {
# Calling check_mk with precompiled checks
define command {
command_name check-mk
- command_line python @VARDIR@/precompiled/$HOSTNAME$
+ command_line python @VARDIR@/precompiled/"$HOSTNAME$"
}
# Use this variant of if you are working without precompiled
@@ -272,7 +272,7 @@ define command {
# Inventory check
define command {
command_name check-mk-inventory
- command_line @BINDIR@/check_mk --cache --check-inventory $HOSTNAME$
+ command_line @BINDIR@/check_mk --cache --check-inventory "$HOSTNAME$"
}
define command {
diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py
index f1060f8..781fcf5 100644
--- a/web/htdocs/actions.py
+++ b/web/htdocs/actions.py
@@ -64,7 +64,7 @@ def action_reschedule():
html.live.set_only_sites([site])
row = html.live.query_row(
"GET %ss\n"
- "WaitObject: %s %s\n"
+ "WaitObject: %s;%s\n"
"WaitCondition: last_check >= %d\n"
"WaitTimeout: %d\n"
"WaitTrigger: check\n"