Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

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, 9 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, 9 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, 9 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, 9 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, 9 months

Check_MK Git: check_mk: Multisite: new ajax service for rescheduling a check

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: eca6c4e0f7ecc25a6c3d0e1ba508dcf72cb24afd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca6c4e0f7ecc2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 3 17:33:07 2010 +0100 Multisite: new ajax service for rescheduling a check --- web/htdocs/actions.py | 84 ++++++++++++++++++++++++++++++++++++++++++ web/htdocs/config.py | 3 + web/plugins/pages/.f12 | 4 +- web/plugins/pages/shipped.py | 2 + 4 files changed, 91 insertions(+), 2 deletions(-) diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py new file mode 100644 index 0000000..9bd247a --- /dev/null +++ b/web/htdocs/actions.py @@ -0,0 +1,84 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +from lib import * +import time +import config + +def ajax_action(h): + global html + html = h + + try: + action = html.var("action") + if action == "reschedule": + action_reschedule() + else: + raise MKGeneralException("Invalid action '%s'" % action) + except Exception, e: + html.write("['ERROR', %r]\n" % str(e)) + +def action_reschedule(): + site = html.var("site") + host = html.var("host", "") + if not host: + raise MKGeneralException("Action reschedule: missing host name") + service = html.var("service", "") + if service: + what = "service" + spec = "%s;%s" % (host, service) + cmd = "SVC" + add_filter = "Filter: service_description = %s\n" % service + else: + what = "host" + spec = host + cmd = "HOST" + 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)) + row = html.live.query_row( + "GET %ss\n" + "WaitObject: %s %s\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: + html.write("['TIMEOUT', 'Check not executed within %d seconds']\n" % (config.reschedule_timeout)) + + else: + html.write("['OK', %d, %d, %r]\n" % (row[0], row[1], row[2].encode("utf-8"))) + + except Exception, e: + raise MKGeneralException("Cannot reschedule check: %s" % e) + finally: + html.live.set_only_sites() diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 291afd7..9597e60 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -400,6 +400,9 @@ custom_style_sheet = None # URL for start page in main frame (welcome page) start_url = "main.py" +# Timeout for rescheduling of host- and servicechecks +reschedule_timeout = 10.0 + # __ __ _ __ # \ \ / /__| |__ ___ ___ _ __ / _| # \ \ /\ / / _ \ '_ \ / __/ _ \| '_ \| |_ diff --git a/web/plugins/pages/.f12 b/web/plugins/pages/.f12 index 334afec..eda8113 100644 --- a/web/plugins/pages/.f12 +++ b/web/plugins/pages/.f12 @@ -1,2 +1,2 @@ -sudo cp -pv *.py /omd/sites/webconf/local/share/check_mk/web/plugins/pages -sudo omd restart webconf apache +sudo cp -pv *.py /omd/versions/default/share/check_mk/web/plugins/pages +sudo omd restart wato apache diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index c89aad6..cdac2ed 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -31,6 +31,7 @@ import page_logwatch import views import sidebar import permissions +import actions # map URLs to page rendering functions @@ -54,4 +55,5 @@ pagehandlers.update({ "edit_bookmark" : sidebar.page_edit_bookmark, "view_permissions" : permissions.page_view_permissions, "edit_permissions" : permissions.page_edit_permissions, + "nagios_action" : actions.ajax_action, })

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 306813e3ffb91d10d3ad1e369f6ba2159cab8e38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=306813e3ffb91d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 30 12:42:41 2010 +0100 Updated internal doku --- LIESMICH.zutun | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index d0bd000..0214640 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -88,6 +88,7 @@ geloggt wird nur das Starten und Beenden (was ja im Hauptthread läuft). Windows-Agent: Memory-Check neu machen. Swap stimmt nicht. Evtl. zwei getrennte Checks für Memory and Pagefile. + ------------------------------------------------------------------------------- ab 1.1.9i1: -------------------------------------------------------------------------------- @@ -507,3 +508,4 @@ dies nur wenn wenn in config was ändert oder bei livestatus (wegen der persistenten Verbindungen). Sonst kanns einem egal sein, wenn man ein neues Modul bekommt. +Windows-Agent: VB-Scripts automatisch mit cscript ausführen.

13 years, 9 months

Check_MK Git: check_mk: wato: Fixed first inventory for services with spaces in item names

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 904ac8da2097d928201e4c7a177e85ad51a01895 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=904ac8da2097d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 13:25:23 2010 +0100 wato: Fixed first inventory for services with spaces in item names --- 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 1cb6c67..d84e751 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -420,7 +420,7 @@ def mode_inventory(phase, firsttime): elif (html.has_var("_activate_all") or html.has_var("_fixall")) and st == "new": active_checks[(ct, item)] = paramstring else: - varname = "_%s_%s" % (ct, item) + varname = ("_%s_%s" % (ct, item)).replace(' ', '+') if html.var(varname, "") != "": active_checks[(ct, item)] = paramstring

13 years, 9 months

Check_MK Git: check_mk: Fixed wato url when using multiple sites

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73a1cfd7664b02a43945eda9a6534fd98132dc74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73a1cfd7664b02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 13:07:00 2010 +0100 Fixed wato url when using multiple sites --- web/plugins/sidebar/wato.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index f40a7bb..86dc9e2 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -19,7 +19,7 @@ def render_wato_files(): state = html.site_status[sitename]["state"] if state != "disabled": html.write("<h3>%s</h3>\n" % site["alias"]) - ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py" + ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py?site=" + sitename html.javascript("document.write(get_url_sync('%s'));" % ajax_url) else: ajax_wato_files(html) @@ -27,10 +27,14 @@ def render_wato_files(): def ajax_wato_files(h): global html html = h + sitename = html.var('site', '') if config.may("use_wato"): for filename, title, roles in config.config_files: if config.role in roles: - bulletlink(title, "wato.py?filename=%s" % filename) + if sitename: + bulletlink(title, "/%s/check_mk/wato.py?filename=%s" % (sitename, filename)) + else: + bulletlink(title, "wato.py?filename=%s" % filename) sidebar_snapins["wato"] = {

13 years, 9 months

Check_MK Git: check_mk: Fixed undefined var after non sudo exception during --automation call

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68f14653c0ceb35abc8564ce1c451d9f87c0c3b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68f14653c0ceb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 12:48:08 2010 +0100 Fixed undefined var after non sudo exception during --automation call --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 11f5921..1cb6c67 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -501,6 +501,7 @@ def check_mk_automation(command, args=[], indata=""): commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] cmd = commandargs[:-1] + [ commandargs[-1] + ' ' + ' '.join([ command ] + args) ] + sudo_msg = '' if commandargs[0] == 'sudo': sudo_msg = ("<p>The webserver is running as user which has no rights on the " "needed Check_MK/Nagios files.<br />Please ensure you have set-up "

13 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010