Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: WATO: Do not focus alias on editing user

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8d717e54835fdd0c2dc99c1f68c770efa07910bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d717e54835fdd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 11:38:23 2012 +0200 WATO: Do not focus alias on editing user --- web/htdocs/wato.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dba1728..8afed2a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7751,8 +7751,6 @@ def mode_edit_user(phase): # Full name forms.section(_("Full name")) html.text_input("alias", user.get("alias", userid), size = 50) - if not new: - html.set_focus("alias") html.help(_("Full name or alias of the user")) # Email address

11 years, 11 months

Check_MK Git: check_mk: Cleaned up Changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 615aa08e2ddf91fc3c2e756dfc993655bb5f747e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615aa08e2ddf91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 4 10:58:26 2012 +0200 Cleaned up Changelog --- ChangeLog | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a214ef8..ac328ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,17 +5,19 @@ Multisite: * Enable automation login with _username= and _secret=, while _secret is the content of var/check_mk/web/$USER/automation.secret - * BI: Added missing localizations - * BI: Added option bit_precompile_on_demand to split compilations of - the aggregations in several fragments. If possible only the needed - aggregations are compiled to reduce the time a user has to wait for - BI based view. This optimizes BI related views which display - information for a specific list of hosts or aggregation groups. - * BI: Added new config option bi_compile_log to collect statistics about - aggregation compilations * FIX: Fixed releasing of locks and livestatus connections when logging out * FIX: Fixed login/login confusions with index page caching + BI: + * Added missing localizations + * Added option bit_precompile_on_demand to split compilations of + the aggregations in several fragments. If possible only the needed + aggregations are compiled to reduce the time a user has to wait for + BI based view. This optimizes BI related views which display + information for a specific list of hosts or aggregation groups. + * Added new config option bi_compile_log to collect statistics about + aggregation compilations + WATO: * Added progress indicator in single site WATO "Activate Changes" * FIX: Implemented basic non HTTP 200 status code response handling in interactive

11 years, 11 months

Check_MK Git: check_mk: Cleaned up Changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9245fe3dadb0d622ee4c6af009924b76a2cda7e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9245fe3dadb0d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 4 10:58:56 2012 +0200 Cleaned up Changelog --- ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac328ef..679062f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -571,8 +571,6 @@ Multisite * Added config option default_ts_format to configure default timestamp output format in multisite - * BI: Added new painter "affected hosts (link to host page)" to show all - host names with links to the "hosts" view * Layout and design update * Quicksearch: display site name if more than one different site is present in the current search result list @@ -589,7 +587,9 @@ logged in * FIX: Updating the dashboard header time when the dashlets refresh - BI + BI: + * Added new painter "affected hosts (link to host page)" to show all + host names with links to the "hosts" view * FIX: Fixed filtering of Single-Host Aggregations * New sorter for aggregation group * FIX: fix sorting of Single-Host Aggregations after group

11 years, 11 months

Check_MK Git: check_mk: FIX: Windows agent: quote '%' in plugin output correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 71eb0f3ce7280319249d58e0cd2e1a86e2506819 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71eb0f3ce72803… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 4 10:55:45 2012 +0200 FIX: Windows agent: quote '%' in plugin output correctly Conflicts: agents/windows/check_mk_agent.exe agents/windows/install_agent.exe --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes agents/windows/install_agent.exe | Bin 127802 -> 126273 bytes 4 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e92aa1..a214ef8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used + * FIX: Windows agent: quote '%' in plugin output correctly 1.2.1i1: Core: diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 70ff29c..4fe8134 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1490,7 +1490,7 @@ void run_plugin(SOCKET &out, char *path) if (f) { char line[4096]; while (0 != fgets(line, sizeof(line), f)) { - output(out, line); + output(out, "%s", line); } pclose(f); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a1831b2..16eb20d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 0eeee29..3c820af 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0745

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7175463212d56d87ec92df2c9ae880d05e95ec63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7175463212d56d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 2 14:38:32 2012 +0200 Updated bug entries #0745 --- .bugs/745 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/745 b/.bugs/745 new file mode 100644 index 0000000..e502756 --- /dev/null +++ b/.bugs/745 @@ -0,0 +1,9 @@ +Title: New role permission +Component: wato +State: open +Date: 2012-10-02 14:32:30 +Targetversion: future +Class: feature + +The wish is that a role can see all nagios objects, but only perform commands +on that one, the role is a contact for

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 30c3daf0543a33edb6de3dd866337edd86a13755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30c3daf0543a33… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 4 10:24:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0772

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f93cabafe420a698064757317e4d2e5d4a21937e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f93cabafe420a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 2 15:15:15 2012 +0200 Updated bug entries #0772 --- .bugs/772 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/772 b/.bugs/772 index 3e7989f..45aad40 100644 --- a/.bugs/772 +++ b/.bugs/772 @@ -1,9 +1,12 @@ Title: Try-Out mode in view editor should not display butons Component: multisite -State: open +Class: nastiness +State: done Date: 2012-06-14 14:51:49 Targetversion: 1.2.0 -Class: nastiness When hitting "Try out" in the edit mode of a view then the buttons for commands etc are shown but shouldn't. + +2012-10-02 15:15:02: changed state open -> done +Has been solved.

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0700

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b26f5971e7e5bba4c8bc55fe609c7227c410f67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b26f5971e7e5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 2 14:58:12 2012 +0200 Updated bug entries #0700 --- .bugs/700 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.bugs/700 b/.bugs/700 index 4e1a985..ee5da76 100644 --- a/.bugs/700 +++ b/.bugs/700 @@ -6,3 +6,7 @@ Targetversion: 1.2.0 Class: nastiness Seems the config option has not been added. + +LM: Maybe this has been excluded for a good reason: To + activate the basic auth there is also some apache config + modification needed.

11 years, 11 months

Check_MK Git: check_mk: Added progress indicator in single site WATO " Activate Changes"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 46995a940b18296fd3483143e203bfdf70a87c14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46995a940b1829… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 2 14:54:24 2012 +0200 Added progress indicator in single site WATO "Activate Changes" --- ChangeLog | 1 + web/htdocs/js/wato.js | 58 +++++++++++++++++++++++++++++++++- web/htdocs/wato.css | 10 ++++++ web/htdocs/wato.py | 76 +++++++++++++++++++++++++++++++++------------ web/plugins/pages/wato.py | 1 + 5 files changed, 125 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 734e22f..a781264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * FIX: Fixed login/login confusions with index page caching WATO: + * Added progress indicator in single site WATO "Activate Changes" * FIX: Implemented basic non HTTP 200 status code response handling in interactive progress dialogs (e.g. bulk inventory mode) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index e3da0f4..908683b 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -479,6 +479,54 @@ function update_bulk_moveto(val) { fields = null; } +// .----------------------------------------------------------------------. +// | _ _ _ _ _ | +// | / \ ___| |_(_)_ ____ _| |_(_) ___ _ __ | +// | / _ \ / __| __| \ \ / / _` | __| |/ _ \| '_ \ | +// | / ___ \ (__| |_| |\ V / (_| | |_| | (_) | | | | | +// | /_/ \_\___|\__|_| \_/ \__,_|\__|_|\___/|_| |_| | +// | | +// +----------------------------------------------------------------------+ + +function wato_do_activation(siteid, est) { + // Hide the activate changes button + var button = document.getElementById('act_changes_button'); + if(button) { + button.style.display = 'none'; + button = null; + } + + get_url("wato_ajax_activation.py", + wato_activation_result, siteid); + replication_progress[siteid] = 20; // 10 of 10 10ths + setTimeout("replication_step('"+siteid+"',"+est+");", est/10); +} + +function wato_activation_result(siteid, code) { + replication_progress[siteid] = 0; + var oState = document.getElementById("repstate_" + siteid); + var oMsg = document.getElementById("repmsg_" + siteid); + if (code.substr(0, 3) == "OK:") { + oState.innerHTML = "<div class='repprogress ok' style='width: 160px;'>OK</div>"; + oMsg.innerHTML = code.substr(3); + + // Reload page after 2 secs + setTimeout(wato_replication_finish, 2000); + } else { + oState.innerHTML = ''; + oMsg.innerHTML = code; + + // Show the activate changes button again + var button = document.getElementById('act_changes_button'); + if(button) { + button.style.display = ''; + button = null; + } + } + oState = null; + oMsg = null; +} + // +----------------------------------------------------------------------+ // | ____ _ _ _ _ | // | | _ \ ___ _ __ | (_) ___ __ _| |_(_) ___ _ __ | @@ -528,8 +576,16 @@ function wato_replication_result(siteid, code) { function wato_replication_finish() { if(parent && parent.frames[1]) parent.frames[1].location.reload(); // reload sidebar - oDiv = document.getElementById("act_changes_button"); + var oDiv = document.getElementById("act_changes_button"); oDiv.style.display = "none"; + oDiv = null + + // Hide the pending changes container + var oPending = document.getElementById("pending_changes"); + if(oPending) { + oPending.style.display = "none"; + oPending = null + } } function wato_randomize_secret(id, len) { diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 9a8ab58..33c56b6 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -804,6 +804,16 @@ div.varname { width: 300px; } +/* activation */ +.wato table.data div.act_success { +} + +.wato table.data div.act_success img { + width: 18px; + height: 18px; + vertical-align: middle; +} + /* Replication */ .wato table.data td.repprogress { width: 160px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8541e6a..2a0e216 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3381,26 +3381,16 @@ def mode_changelog(phase): elif transaction_already_checked or html.check_transaction(): config.need_permission("wato.activate") create_snapshot() - if is_distributed(): - # Do nothing here, but let site status table be shown in a mode - # were in each site that is not up-to-date an asynchronus AJAX - # job is being startet that updates that site - sitestatus_do_async_replication = True - else: - try: - check_mk_local_automation(config.wato_activation_method) - except Exception, e: - if config.debug: - raise - else: - raise MKUserError(None, "Error executing hooks: %s" % str(e)) - log_commit_pending() # flush logfile with pending actions - log_audit(None, "activate-config", _("Configuration activated, monitoring server restarted")) - return None, _("The new configuration has been successfully activated.") - else: - # Distributed WATO: Show replication state of each site + # Do nothing here, but let site status table be shown in a mode + # were in each site that is not up-to-date an asynchronus AJAX + # job is being startet that updates that site + sitestatus_do_async_replication = True + + else: # phase: regular page rendering + if is_distributed(): + # Distributed WATO: Show replication state of each site # During bulk replication we rather create the sync snapshot now. Otherwise # there is the danger, that it is created multiple times in parallel, thus @@ -3568,19 +3558,35 @@ def mode_changelog(phase): html.write("</tr>") html.write("</table>") - # The Javascript world needs to know, how many asynchronous # replication jobs it should wait to be finished. - if num_replsites > 0: + if sitestatus_do_async_replication and num_replsites > 0: html.javascript("var num_replsites = %d;\n" % num_replsites) + elif sitestatus_do_async_replication: + # Single site setup + + # Is rendered on the page after hitting the "activate" button + # Renders the html to show the progress and starts the sync via javascript + html.write("<table class=data>") + html.write("<tr><th class=left>%s</th><th>%s</th></tr>" % (_('Progress'), _('Status'))) + html.write('<tr class="data odd0"><td class=repprogress><div id="repstate_local"></div></td>') + html.write('<td id="repmsg_local"><i>%s</i></td></tr></table>' % _('activating...')) + + srs = load_replication_status().get('local', {}) + estimated_duration = srs.get("times", {}).get('act', 2.0) + html.javascript("wato_do_activation('local', %d);" % + (int(estimated_duration * 1000.0))) + sitestatus_do_async_replication = None # could survive in global context! pending = parse_audit_log("pending") if len(pending) == 0: html.write("<div class=info>" + _("There are no pending changes.") + "</div>") else: + html.write('<div id=pending_changes>') render_audit_log(pending, "pending", hilite_others=True) + html.write('</div>') # Determine if other users have made pending changes def foreign_changes(): @@ -7170,6 +7176,36 @@ def push_snapshot_to_site(site, do_restart): raise MKAutomationException(_("Garbled automation response from site %s: '%s'") % (site["id"], response_text)) +# AJAX handler for javascript triggered wato activation +def ajax_activation(): + try: + if is_distributed(): + raise MKUserError(None, _('Call not supported in distributed setups.')) + + config.need_permission("wato.activate") + + # Initialise g_root_folder, load all folder information + prepare_folder_info() + + # This is the single site activation mode + try: + start = time.time() + check_mk_local_automation(config.wato_activation_method) + duration = time.time() - start + update_replication_status('local', {}, { 'act': duration }) + except Exception: + import traceback + raise MKUserError(None, "Error executing hooks: %s" % + traceback.format_exc().replace('\n', '<br />')) + + log_commit_pending() # flush logfile with pending actions + log_audit(None, "activate-config", _("Configuration activated, monitoring server restarted")) + + # html.message + html.write('OK: ') + html.write('<div class=act_success><img src="images/icon_apply.png" /> %s</div>' % _("The new configuration has been successfully activated.")) + except Exception, e: + html.show_error(str(e)) # AJAX handler for asynchronous site replication def ajax_replication(): diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 1fb4a37..19ab792 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -29,6 +29,7 @@ import wato pagehandlers.update({ "wato" : wato.page_handler, "wato_ajax_replication" : wato.ajax_replication, + "wato_ajax_activation" : wato.ajax_activation, "automation_login" : wato.page_automation_login, "automation" : wato.page_automation, "user_profile" : wato.page_user_profile,

11 years, 11 months

Check_MK Git: check_mk: FIX: Fixed error in makeuri() calls when no parameters in URL

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97474d632e3ddceb0f43c05aecc6a2c5c4f0a34b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97474d632e3ddc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 2 12:23:01 2012 +0200 FIX: Fixed error in makeuri() calls when no parameters in URL --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73a9dac..734e22f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice * FIX: BI: Assuming "OK" for hosts is now possible + * FIX: Fixed error in makeuri() calls when no parameters in URL WATO * Added "profile" option to be configurable via browser diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 9658447..9e83337 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -272,8 +272,16 @@ function getUrlParam(name) { function makeuri(addvars) { var tmp = window.location.href.split('?'); var base = tmp[0]; - tmp = tmp[1].split('#'); - tmp = tmp[0].split('&'); + if(tmp.length > 1) { + // Remove maybe existing anchors + tmp = tmp[1].split('#'); + // Split to array of param-strings (key=val) + tmp = tmp[0].split('&'); + } else { + // Uri has no parameters + tmp = []; + } + var len = tmp.length; var params = []; var pair = null;

11 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012