Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: WATO: fixed two typos

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5c0bd410e7a00b6876db374d288b643bd320f5bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c0bd410e7a00b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 15:26:59 2011 +0100 WATO: fixed two typos --- web/htdocs/wato.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7a8dd73..02cb90e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -204,7 +204,7 @@ def page_handler(): if not config.may("wato.use"): raise MKAuthException(_("You are not allowed to use WATO.")) - # Make information about current folder and hosts avaiable + # Make information about current folder and hosts available prepare_folder_info() current_mode = html.var("mode") or "main" @@ -283,7 +283,7 @@ def page_handler(): html.show_error("<b>%s</b><br>%s" % ( _("Primary system unreachable"), _("The primary system is currently unreachable. Please make sure " - "that you synchronize changes back as soon as it is avaiable " + "that you synchronize changes back as soon as it is available " "again."))) try: @@ -6701,7 +6701,7 @@ def do_peer_redirect(peer): if global_replication_state() != "clean": html.show_error(_("You are currently accessing a standby " "system while the primary system is available. " - "Furthermore you have local changes in the stanbdy system " + "Furthermore you have local changes in the standby system " "that are not replicated " "to all sites. Please first <a href='%s'>replicate</a> " "your changes before switching to the <a target=_parent href='%s'>primary system.</a>") %

12 years, 8 months

Check_MK Git: check_mk: WATO: reload after replication only on success

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41feb0e4a3ffd8695c726696c8ea6b4d29f95978 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41feb0e4a3ffd8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 15:19:50 2011 +0100 WATO: reload after replication only on success --- web/htdocs/js/wato.js | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 8ea53f1..4041c5d 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -337,14 +337,12 @@ function update_bulk_moveto(val) { // | |_| | // +----------------------------------------------------------------------+ var replication_progress = new Array(); -var num_failedsites = 0; function wato_do_replication(siteid, est) { get_url("wato_ajax_replication.py?site=" + siteid, wato_replication_result, siteid); replication_progress[siteid] = 20; // 10 of 10 10ths setTimeout("replication_step('"+siteid+"',"+est+");", est/10); - num_failedsites = num_replsites; } function replication_step(siteid, est) { @@ -366,19 +364,18 @@ function wato_replication_result(siteid, code) { if (code.substr(0, 3) == "OK:") { oDiv.innerHTML = "<div class='repprogress ok' style='width: 160px;'>" + code.substr(3) + "</div>"; - num_failedsites--; + num_replsites--; } else oDiv.innerHTML = code; - if (0 == --num_replsites) { + + if (0 == num_replsites) { setTimeout(wato_replication_finish, 2000); } } function wato_replication_finish() { parent.frames[1].location.reload(); // reload sidebar - if (num_failedsites == 0) { - oDiv = document.getElementById("act_changes_button"); - oDiv.style.display = "none"; - } + oDiv = document.getElementById("act_changes_button"); + oDiv.style.display = "none"; }

12 years, 8 months

Check_MK Git: check_mk: WATO: fix layout of folder path

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 231d783dbdd6956e806fbfcae967d1f8cc4e68f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=231d783dbdd695… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 14:13:07 2011 +0100 WATO: fix layout of folder path --- web/htdocs/check_mk.css | 2 +- web/htdocs/wato.py | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 85ad5cd..f7891a6 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -2066,7 +2066,7 @@ table.add_snapin i { /* Path to current folder at top of screen */ .wato div.folderpath { - margin-bottom: 30px; + margin-bottom: 10px; } .wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 15fe5b0..7a8dd73 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9751,6 +9751,7 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo for var in keepvarnames: html.hidden_field(var, html.var(var)) html.write("</form>") + html.write("<div style='clear: both;'></div>") html.write("</div>") def may_see_hosts():

12 years, 8 months

Check_MK Git: check_mk: WATO: Restart of sites omit sync now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2691b8cbfcde0ad9ecd8a7e8496792603b2f59b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2691b8cbfcde0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 13:48:57 2011 +0100 WATO: Restart of sites omit sync now --- web/htdocs/wato.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 25b91c7..15fe5b0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2529,11 +2529,19 @@ def mode_changelog(phase): # the button text is just "Restart". We do a sync anyway. This # can be optimized in future but is the save way for now. site = config.site(site_id) - response = synchronize_site(site, restart = action == "restart") + if action in [ "sync", "sync_restart" ]: + response = synchronize_site(site, restart = action == "restart") + else: + try: + restart_site(site) + response = True + except Exception, e: + response = str(e) + if response == True: return None else: - raise MKUserError(None, _("Cannot synchronize site: %s") % response) + raise MKUserError(None, _("Error on remote access to site: %s") % response) except MKAutomationException, e: raise MKUserError(None, _("Remote command on site %s failed: <pre>%s</pre>") % (site_id, e)) @@ -2703,6 +2711,8 @@ def mode_changelog(phase): ("_site", site_id), ("_siteaction", "sync")]) restart_url = make_action_link([("mode", "changelog"), ("_site", site_id), ("_siteaction", "restart")]) + sync_restart_url = make_action_link([("mode", "changelog"), + ("_site", site_id), ("_siteaction", "sync_restart")]) if not site_is_local(site_id) and "secret" not in site: html.write("<b>%s</b>" % _("Not logged in.")) elif not uptodate: @@ -2710,7 +2720,7 @@ def mode_changelog(phase): if srs.get("need_sync"): html.buttonlink(sync_url, _("Sync")) if srs.get("need_restart"): - html.buttonlink(restart_url, _("Sync & Restart")) + html.buttonlink(sync_restart_url, _("Sync & Restart")) else: html.buttonlink(restart_url, _("Restart")) else:

12 years, 8 months

Check_MK Git: check_mk: WATO: better debugging of remote automation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a280d703f393b094ab31a4e20cd422d2811bc2f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a280d703f393b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 13:43:06 2011 +0100 WATO: better debugging of remote automation --- web/htdocs/wato.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9acf5a0..02cfade 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2536,11 +2536,11 @@ def mode_changelog(phase): raise MKUserError(None, _("Cannot synchronize site: %s") % response) except MKAutomationException, e: - raise MKUserError(None, _("Remote command on site %s failed: '%s'.") % (site_id, e)) + raise MKUserError(None, _("Remote command on site %s failed: <pre>%s</pre>") % (site_id, e)) except Exception, e: if config.debug: raise - raise MKUserError(None, _("Remote command on site %s failed: '%s'.") % (site_id, e)) + raise MKUserError(None, _("Remote command on site %s failed: <pre>%s</pre>") % (site_id, e)) elif html.check_transaction(): config.need_permission("wato.activate") @@ -6805,7 +6805,6 @@ def automation_push_snapshot(): raise MKGeneralException(_("Configuration error. You treat us as " "a peer, but we have no peer configuration!")) - # In peer mode, we have a replication configuration ourselves and # we have a site ID our selves. Let's make sure that ID matches # the ID our peer thinks we have. @@ -6835,7 +6834,10 @@ def automation_push_snapshot(): call_hook_activate_changes() return True except Exception, e: - return str(e) + if config.debug: + return _("Internal automation error: %s\n%s") % (str(e), format_exception()) + else: + return _("Internal automation error: %s") % e def create_only_hosts_file(siteid): out = file(defaults.check_mk_configdir + "/only_hosts.mk", "w")

12 years, 8 months

Check_MK Git: check_mk: WATO: only_sites: do append

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 05c781066fcf795de18e32d3bbc297a57f2f6447 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05c781066fcf79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 13:44:10 2011 +0100 WATO: only_sites: do append this makes modifications in main.mk possible --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ef7775c..25b91c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6849,7 +6849,7 @@ def create_only_hosts_file(siteid): "# push the configuration to us. It makes sure that\n" "# we only monitor hosts that are assigned to our site.\n\n") out.write("if only_hosts == None:\n only_hosts = []\n\n") - out.write("only_hosts = [( ['site:%s'], ALL_HOSTS )]\n" % siteid) + out.write("only_hosts += [( ['site:%s'], ALL_HOSTS )]\n" % siteid) def delete_only_hosts_file(): p = defaults.check_mk_configdir + "/only_hosts.mk"

12 years, 8 months

Check_MK Git: check_mk: WATO: fix automation push-snapshot

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6424a3762d7a8beaf247bba567b2fd97085c08e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6424a3762d7a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 13:43:44 2011 +0100 WATO: fix automation push-snapshot Hooks failed since folder information was not loaded --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 02cfade..ef7775c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6790,6 +6790,9 @@ def page_automation(): def automation_push_snapshot(): try: + # Initialise g_root_folder, load all folder information + prepare_folder_info() + site_id = html.var("siteid") if not site_id: raise MKGeneralException(_("Missing variable siteid"))

12 years, 8 months

Check_MK Git: check_mk: Facelift for Speed-O-Meter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ef4c9537b8eda5582884240884b0ca2f1c2483d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ef4c9537b8eda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 12:47:15 2011 +0100 Facelift for Speed-O-Meter --- web/htdocs/images/speedometer.png | Bin 97329 -> 96997 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/speedometer.png b/web/htdocs/images/speedometer.png index fb606f8..b73b148 100644 Binary files a/web/htdocs/images/speedometer.png and b/web/htdocs/images/speedometer.png differ

12 years, 8 months

Check_MK Git: check_mk: Performance snapin: omit cmd buffers on single site

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6db99314170cc01075b29aa8b8c3688cff9c12d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6db99314170cc0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 6 19:35:59 2011 +0100 Performance snapin: omit cmd buffers on single site The addition of the command buffer slots in multisite environment does not make much sense and creates ugly line breaks in the whole layout. --- web/plugins/sidebar/shipped.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a400d09..04a9154 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -571,11 +571,12 @@ def render_performance(): ("Cached log messages", 6, "%d")]: write_line(what + ":", format % sum([row[col] for row in data])) - data = html.live.query("GET status\nColumns: external_command_buffer_slots " - "external_command_buffer_max\n") - size = sum([row[0] for row in data]) - maxx = sum([row[1] for row in data]) - write_line(_('Com. buf. max/total'), "%d / %d" % (maxx, size)) + if len(config.allsites()) == 1: + data = html.live.query("GET status\nColumns: external_command_buffer_slots " + "external_command_buffer_max\n") + size = sum([row[0] for row in data]) + maxx = sum([row[1] for row in data]) + write_line(_('Com. buf. max/total'), "%d / %d" % (maxx, size)) html.write("</table>\n")

12 years, 8 months

Check_MK Git: check_mk: Image fix for Speed-O-Meter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea590c0739409fcee64fad63253ba9591b235a4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea590c0739409f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 6 19:35:02 2011 +0100 Image fix for Speed-O-Meter --- doc/treasures/speedometer.xcf | Bin 439348 -> 436850 bytes web/htdocs/images/speedometer.png | Bin 97031 -> 97329 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/treasures/speedometer.xcf b/doc/treasures/speedometer.xcf index 2acea09..193e4d4 100644 Binary files a/doc/treasures/speedometer.xcf and b/doc/treasures/speedometer.xcf differ diff --git a/web/htdocs/images/speedometer.png b/web/htdocs/images/speedometer.png index 617568f..fb606f8 100644 Binary files a/web/htdocs/images/speedometer.png and b/web/htdocs/images/speedometer.png differ

12 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011