Module: check_mk Branch: master Commit: 66dbd3bfdb3360682162d5f4768bac6a5b5c86f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66dbd3bfdb3360… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 14:31:44 2011 +0100 Multisite: fix reschedule bugs for non-local sites --- ChangeLog | 3 +++ web/.f12 | 2 +- web/htdocs/.f12 | 2 +- web/htdocs/actions.py | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7169b3..30948db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * added missing 'register 0' to host template * setup: fix creation of symlink cmk if already existing + Multisite: + * New reschedule icon now also works for non-local sites. + 1.1.9i3: INCOMPATIBLE CHANGES: * You need a current version of Livestatus for Multisite to work! diff --git a/web/.f12 b/web/.f12 index 8c90ab2..c49acf6 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,2 @@ sudo cp -prv * /omd/versions/default/share/check_mk/web/ -sudo su - -c 'omd reload wato apache' +sudo su - -c 'omd reload eins apache' diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index c52f4b1..85d9910 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -4,4 +4,4 @@ sudo cp -r images *.css *.py js /omd/versions/default/share/check_mk/web/htdocs sudo cp ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ sudo cp ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ sudo cp ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ -sudo omd restart wato apache +sudo omd restart eins apache diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 10b3f2f..301e207 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -62,9 +62,9 @@ def action_reschedule(): add_filter = "" try: - html.live.set_only_sites([site]) now = int(time.time()) - html.live.command("[%d] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (now, cmd, spec, now)) + html.live.command("[%d] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (now, cmd, spec, now), site) + html.live.set_only_sites([site]) row = html.live.query_row( "GET %ss\n" "WaitObject: %s %s\n"