Module: check_mk Branch: master Commit: 233a0db12a7f13ab2c508754d3015192bb613afb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=233a0db12a7f13… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Dec 1 08:31:26 2014 +0100 #1540 FIX Host diagnose page: Some tests were failing randomly --- .bugs/2225 | 7 +++++-- .werks/1540 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/wato.js | 5 ++--- web/htdocs/wato.py | 9 +++------ 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.bugs/2225 b/.bugs/2225 index ce19421..0794481 100644 --- a/.bugs/2225 +++ b/.bugs/2225 @@ -1,10 +1,13 @@ Title: Host diagnostics partially broken Component: wato -State: open +Class: bug +State: done Date: 2014-11-17 15:26:35 Targetversion: 1.2.5i1 -Class: bug The host diagnostics in WATO only refreshes two of the five boxes. Always the first and by random one of the others. By clicking on the arrows you can force updates - however. + +2014-12-01 08:30:50: changed state open -> done +Fixed. Transid handling has been removed for the diag requests. diff --git a/.werks/1540 b/.werks/1540 new file mode 100644 index 0000000..4446559 --- /dev/null +++ b/.werks/1540 @@ -0,0 +1,9 @@ +Title: Host diagnose page: Some tests were failing randomly +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417419056 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 71ab468..2552865 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 1498 FIX: Fixed displaying of global settings titles / help texts... * 1502 FIX: Fixed removing elements from ListOf choices during complain phase * 1505 FIX: Snapshots are now bound to the used monitoring core... + * 1540 FIX: Host diagnose page: Some tests were failing randomly Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index a6304f6..9961431 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -819,7 +819,7 @@ function handle_host_diag_result(ident, response_text) { retry.style.display = 'inline'; } -function start_host_diag_test(ident, hostname, transid) { +function start_host_diag_test(ident, hostname) { var log = document.getElementById(ident + '_log'); var img = document.getElementById(ident + '_img'); var retry = document.getElementById(ident + '_retry'); @@ -836,8 +836,7 @@ function start_host_diag_test(ident, hostname, transid) { img.src = "images/icon_loading.gif"; log.innerHTML = "..."; - get_url("wato_ajax_diag_host.py?host=" + escape(hostname) + "&_test=" + escape(ident) - + '&_transid=' + transid + vars, + get_url("wato_ajax_diag_host.py?host=" + escape(hostname) + "&_test=" + escape(ident) + vars, handle_host_diag_result, ident); } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d860fb9..d2d4415 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2995,13 +2995,13 @@ def mode_diag_host(phase): html.write('<table class="data test"><tr class="data odd0">') html.write('<td class="icons"><div>') html.write('<img class="icon" id="%s_img" src="">' % ident) - html.write('<a href="javascript:start_host_diag_test(\'%s\', \'%s\', \'%s\');">' + html.write('<a href="javascript:start_host_diag_test(\'%s\', \'%s\');">' '<img class="icon retry" id="%s_retry" src="images/icon_retry_disabled.gif" title="%s"></a>' % - (ident, hostname, html.fresh_transid(), ident, _('Retry this test'))) + (ident, hostname, ident, _('Retry this test'))) html.write('</div></td>') html.write('<td><div class="log" id="%s_log"></div>' % ident) html.write('</tr></table>') - html.javascript('start_host_diag_test("%s", "%s", "%s")' % (ident, hostname, html.fresh_transid())) + html.javascript('start_host_diag_test("%s", "%s")' % (ident, hostname)) html.write('</td></tr></table>') html.write('</div>') @@ -3010,9 +3010,6 @@ def ajax_diag_host(): try: prepare_folder_info() - if not html.check_transaction(): - return - if not config.may('wato.diag_host'): raise MKAuthException(_('You are not permitted to perform this action.'))