Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65232 discussions

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: 3618dc99ff3b6eb793133a033b6e5bdeb22e12dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3618dc99ff3b6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 5 19:29:25 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 11 months

Check_MK Git: check_mk: Added missing reloading image

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60b48504e7cf46d4ba57ee6d1b94ecd0fbbcb7ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b48504e7cf46… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:48:15 2010 +0100 Added missing reloading image --- web/htdocs/images/icon_reloading.gif | Bin 0 -> 7696 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_reloading.gif b/web/htdocs/images/icon_reloading.gif new file mode 100644 index 0000000..5b30ae7 Binary files /dev/null and b/web/htdocs/images/icon_reloading.gif differ

13 years, 11 months

Check_MK Git: check_mk: Added new title for reschedule button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 322dc2e62cad9e88f5407f35e6c27812b2dab34f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=322dc2e62cad9e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:40:38 2010 +0100 Added new title for reschedule button --- web/plugins/views/painters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index ad2e5d5..bfb6c7f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -184,7 +184,7 @@ def paint_icons(what, row): # what is "host" or "service" if what == 'service': name2 = row['service_description'] output += '<a href=\"#\" onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ - '<img class=icon title="Reschedule and imediate check of this %s" ' \ + '<img class=icon title="Reschedule an immediate check of this %s" ' \ 'src="images/icon_reload.gif"></a>' % (what, row["site"], row["host_name"], name2, what) return "icons", output

13 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38dc1400974b380633940406c9d78472b0bac4d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38dc1400974b38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:40:50 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 11 months

Check_MK Git: check_mk: Multisite: fix reschedule problem for fast checks

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4aa9de9a931fef03ecf7850340b301dbea7e965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4aa9de9a931fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 3 17:50:54 2010 +0100 Multisite: fix reschedule problem for fast checks --- web/htdocs/actions.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 9bd247a..fc03700 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -42,6 +42,9 @@ def ajax_action(h): html.write("['ERROR', %r]\n" % str(e)) def action_reschedule(): + if not config.may("action.reschedule"): + raise MKGeneralException("You are not allowed to reschedule checks.") + site = html.var("site") host = html.var("host", "") if not host: @@ -65,14 +68,14 @@ def action_reschedule(): row = html.live.query_row( "GET %ss\n" "WaitObject: %s %s\n" - "WaitCondition: last_check > %d\n" + "WaitCondition: last_check >= %d\n" "WaitTimeout: %d\n" "WaitTrigger: check\n" "Columns: last_check state plugin_output\n" "Filter: host_name = %s\n%s" % (what, host, service, now, config.reschedule_timeout * 1000, host, add_filter)) last_check = row[0] - if last_check <= now: + if last_check < now: html.write("['TIMEOUT', 'Check not executed within %d seconds']\n" % (config.reschedule_timeout)) else:

13 years, 11 months

Check_MK Git: check_mk: Added new title for reschedule button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ff09fc4ca749b443568c26809b470e556f1e9de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ff09fc4ca749b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:39:25 2010 +0100 Added new title for reschedule button --- web/plugins/views/painters.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 5bf7e00..ad2e5d5 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -184,8 +184,8 @@ def paint_icons(what, row): # what is "host" or "service" if what == 'service': name2 = row['service_description'] output += '<a href=\"#\" onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ - '<img class=icon title="Reschedule a check of this service" ' \ - 'src="images/icon_reload.gif"></a>' % (what, row["site"], row["host_name"], name2) + '<img class=icon title="Reschedule and imediate check of this %s" ' \ + 'src="images/icon_reload.gif"></a>' % (what, row["site"], row["host_name"], name2, what) return "icons", output

13 years, 11 months

Check_MK Git: check_mk: Better error handling while performing actions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 493b251ac264f0360709b3f31040f67ca581c194 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=493b251ac264f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:35:18 2010 +0100 Better error handling while performing actions --- web/htdocs/check_mk.js | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/check_mk.js b/web/htdocs/check_mk.js index 1186fa8..277525c 100644 --- a/web/htdocs/check_mk.js +++ b/web/htdocs/check_mk.js @@ -213,16 +213,17 @@ function performAction(oLink, action, type, site, name1, name2) { } if(validResponse && response[0] === 'OK') { - oImg.src = 'images/icon_reload.gif'; + oImg.src = 'images/icon_reload.gif'; window.location.reload(); } else if(validResponse && response[0] === 'TIMEOUT') { - oImg.src = 'images/icon_reload_failed.gif'; + oImg.src = 'images/icon_reload_failed.gif'; + oImg.title = 'Timeout while performing action: ' + response[1]; } else if(validResponse) { - oImg.src = 'images/icon_reload_failed.gif'; - alert('Problem while processing - Response: ' + response.join(' ')); + oImg.src = 'images/icon_reload_failed.gif'; + oImg.title = 'Problem while processing - Response: ' + response.join(' '); } else { - oImg.src = 'images/icon_reload_failed.gif'; - alert('Invalid response: ' + response); + oImg.src = 'images/icon_reload_failed.gif'; + oImg.title = 'Invalid response: ' + response; } validResponse = null;

13 years, 11 months

Check_MK Git: check_mk: Added javascript code to new active service reschedule feature

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 337e8d5b61ad41fcc91479e8bd49cb32d169706e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=337e8d5b61ad41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:27:54 2010 +0100 Added javascript code to new active service reschedule feature --- web/htdocs/check_mk.js | 44 ++++++++++++++++++++++++++++++ web/htdocs/images/icon_reload.gif | Bin 0 -> 1852 bytes web/htdocs/images/icon_reload_failed.gif | Bin 0 -> 1869 bytes web/plugins/views/painters.py | 8 +++++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.js b/web/htdocs/check_mk.js index c3ee791..1186fa8 100644 --- a/web/htdocs/check_mk.js +++ b/web/htdocs/check_mk.js @@ -185,3 +185,47 @@ function render_pnp_graphs(container, site, host, service, base_url, pnp_url) { get_url(pnp_url + 'index.php/json?&host=' + host + '&srv=' + service + '&source=0', pnp_response_handler, data, pnp_error_response_handler); } + +// ---------------------------------------------------------------------------- +// Synchronous action handling +// ---------------------------------------------------------------------------- +// Protocol is: +// For regular response: +// [ 'OK', 'last check', 'exit status plugin', 'output' ] +// For timeout: +// [ 'TIMEOUT', 'output' ] +// For error: +// [ 'ERROR', 'output' ] +// Everything else: +// <undefined> - Unknown format. Simply echo. + +function performAction(oLink, action, type, site, name1, name2) { + var oImg = oLink.childNodes[0]; + oImg.src = 'images/icon_reloading.gif'; + + var validResponse = true; + var response = get_url_sync('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2); + + try { + response = eval(response); + } catch(e) { + validResponse = false; + } + + if(validResponse && response[0] === 'OK') { + oImg.src = 'images/icon_reload.gif'; + window.location.reload(); + } else if(validResponse && response[0] === 'TIMEOUT') { + oImg.src = 'images/icon_reload_failed.gif'; + } else if(validResponse) { + oImg.src = 'images/icon_reload_failed.gif'; + alert('Problem while processing - Response: ' + response.join(' ')); + } else { + oImg.src = 'images/icon_reload_failed.gif'; + alert('Invalid response: ' + response); + } + + validResponse = null; + response = null; + oImg = null; +} diff --git a/web/htdocs/images/icon_reload.gif b/web/htdocs/images/icon_reload.gif new file mode 100644 index 0000000..db29279 Binary files /dev/null and b/web/htdocs/images/icon_reload.gif differ diff --git a/web/htdocs/images/icon_reload_failed.gif b/web/htdocs/images/icon_reload_failed.gif new file mode 100644 index 0000000..32e5f0e Binary files /dev/null and b/web/htdocs/images/icon_reload_failed.gif differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 0df84ef..5bf7e00 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -179,6 +179,14 @@ def paint_icons(what, row): # what is "host" or "service" if wato_filename: output += wato_link(wato_filename, row["site"], row["host_name"], "inventory") + if row[prefix + "active_checks_enabled"] == 1 and config.may('action.reschedule'): + name2 = '' + if what == 'service': + name2 = row['service_description'] + output += '<a href=\"#\" onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ + '<img class=icon title="Reschedule a check of this service" ' \ + 'src="images/icon_reload.gif"></a>' % (what, row["site"], row["host_name"], name2) + return "icons", output def iconpainter_columns(what):

13 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4726ae4f25ba100f5b62abe38a82c1ed3b39eca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4726ae4f25ba10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:28:04 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 11 months

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

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: dc16b4cde9ab2ea0fd0a79485e9a88a62d1c4faa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc16b4cde9ab2e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 3 16:45:16 2010 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: LIESMICH.zutun ---

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits