Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: Avoid recursive locks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0c72e072f41439350bf8de8cb3fc1939ea6ea504 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c72e072f41439… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 17:40:03 2012 +0200 Avoid recursive locks --- web/htdocs/lib.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index b448f55..f59c3b3 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -228,15 +228,20 @@ def set_is_disjoint(a, b): # has terminated (in good or in bad manner). Currently only exclusive # locks are implemented and they always will wait for ever. g_aquired_locks = [] +g_locked_paths = [] def aquire_lock(path): + if path in g_locked_paths: + return # No recursive locking fd = os.open(path, os.O_RDONLY) fcntl.flock(fd, fcntl.LOCK_EX) g_aquired_locks.append(fd) + g_locked_paths.append(path) def release_all_locks(): global g_aquired_locks for fd in g_aquired_locks: os.close(fd) g_aquired_locks = [] + g_locked_paths = []

12 years, 5 months

Check_MK Git: check_mk: Provide simple file locking API for applications

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82242972f6f185af35641ebb1f92546703f7632b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82242972f6f185… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 16:43:07 2012 +0200 Provide simple file locking API for applications --- web/htdocs/index.py | 4 ++-- web/htdocs/lib.py | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ac1ecd5..19f6074 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -376,8 +376,8 @@ def handler(req, profiling = True): html.footer() response_code = apache.OK - # Disconnect from livestatus! - html.live = None + release_all_locks() + html.live = None # disconnects from livestatus return response_code def page_not_found(): diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 4ad5246..b448f55 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import grp, defaults, pprint, os, errno, gettext, marshal, __builtin__ +import grp, defaults, pprint, os, errno, gettext, marshal, fcntl, __builtin__ nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN", 4: "DEPENDENT" } nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN", 4: "DEP" } @@ -223,3 +223,20 @@ def set_is_disjoint(a, b): if elem in b: return False return True + +# Functions for locking files. All locks must be freed if a request +# has terminated (in good or in bad manner). Currently only exclusive +# locks are implemented and they always will wait for ever. +g_aquired_locks = [] +def aquire_lock(path): + fd = os.open(path, os.O_RDONLY) + fcntl.flock(fd, fcntl.LOCK_EX) + g_aquired_locks.append(fd) + +def release_all_locks(): + global g_aquired_locks + for fd in g_aquired_locks: + os.close(fd) + g_aquired_locks = [] + +

12 years, 5 months

Check_MK Git: check_mk: Switched version to 1.2.0b3

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9928a4a2b4ef54610a8aaa03aa8f459194c73a95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9928a4a2b4ef54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 15:49:25 2012 +0200 Switched version to 1.2.0b3 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124977 -> 124977 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 20385f1..b6a9903 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0b2 +VERSION = 1.2.0b3 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index ee9f99b..ba89399 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0b2 +echo Version: 1.2.0b3 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 8912e5e..0bfd8b2 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0b2 +echo Version: 1.2.0b3 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 215e095..f5850d8 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.2.0b2 +echo Version: 1.2.0b3 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index aae12c0..22d7ced 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0b2 +echo Version: 1.2.0b3 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index af0c4bd..8a6c9ba 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0b2 +echo Version: 1.2.0b3 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d2c2651..43ca8c8 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -73,7 +73,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.0b2" +#define CHECK_MK_VERSION "1.2.0b3" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b72b5c3..b8981f7 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 70eb6ad..96628ba 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 4d98fca..978c409 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index deff1e2..3dab646 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.0b2" +!define CHECK_MK_VERSION "1.2.0b3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index 16d4c39..7614cfe 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0b2-1_all.deb net optional +check-mk_1.2.0b3-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 533b25b..5786253 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.0b2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0b3], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index 01f3fad..093b061 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0b2 +VERSION=1.2.0b3 NAME=check_mk LANG= LC_ALL=

12 years, 5 months

Check_MK Git: check_mk: Changed Icons for auth in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3dc9d2f3766a271b3b518f1f3c21493e7b5e6594 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dc9d2f3766a27… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 15:48:03 2012 +0200 Changed Icons for auth in WATO --- web/htdocs/images/icon_autherr.png | Bin 3062 -> 3170 bytes web/htdocs/images/icon_authok.png | Bin 3352 -> 2339 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_autherr.png b/web/htdocs/images/icon_autherr.png index b7e2f90..7d3e1ef 100644 Binary files a/web/htdocs/images/icon_autherr.png and b/web/htdocs/images/icon_autherr.png differ diff --git a/web/htdocs/images/icon_authok.png b/web/htdocs/images/icon_authok.png index 4fa7e01..eade0c6 100644 Binary files a/web/htdocs/images/icon_authok.png and b/web/htdocs/images/icon_authok.png differ

12 years, 5 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: 9a65d1ca69292cc1f0afb2249f2f705d67a843f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a65d1ca69292c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 15:48:07 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: FIX: Fixed login redirection problem after relogging

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d034d6bed5dd860817276fe772648249d55ac96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d034d6bed5dd8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 15:47:37 2012 +0200 FIX: Fixed login redirection problem after relogging --- ChangeLog | 1 + web/htdocs/login.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37ebee1..156f9b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ are preferred over *.py if existing * View Editor: Fixed jump to top of the page after moving painters during editing views + * FIX: Fixed login redirection problem after relogging Checks & Agents: * FIX: Made logwatch parsing mechanism a little more robust diff --git a/web/htdocs/login.py b/web/htdocs/login.py index ba371f2..0d7b2d1 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -224,16 +224,17 @@ def normal_login_page(called_directly = True): if not origtarget and not html.req.myfile == 'login': origtarget = html.makeuri([]) + # Never allow the login page to be opened in a frameset. Redirect top page to login page. + # This will result in a full screen login page. + html.javascript('''if(top != self) { + window.top.location.href = location; +}''') + # When someone calls the login page directly and is already authed redirect to main page if html.req.myfile == 'login' and check_auth() != '': html.immediate_browser_redirect(0.5, origtarget and origtarget or 'index.py') return - # Never allow the login page to be opened in a frameset. Redirect top page to login page - html.javascript('''if(top != self) { - window.top.location.href = location; -}''') - html.write("<div id=login>") html.write("<img id=login_window src=\"images/login_window.png\">") html.write("<div id=version>%s</div>" % defaults.check_mk_version)

12 years, 5 months

Check_MK Git: check_mk: FIX: Made logwatch parsing mechanism a little more robust

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bda40546106084c8cce533582353b5ab0731856a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bda40546106084… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 10:58:56 2012 +0000 FIX: Made logwatch parsing mechanism a little more robust (Had problems with emtpy sections from windows agent) --- ChangeLog | 4 ++++ checks/logwatch | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d68f4a9..37ebee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ * View Editor: Fixed jump to top of the page after moving painters during editing views + Checks & Agents: + * FIX: Made logwatch parsing mechanism a little more robust + (Had problems with emtpy sections from windows agent) + 1.2.0b2: Core: * FIX: Cluster host checks were UNKNOWN all the time diff --git a/checks/logwatch b/checks/logwatch index 7714d87..43d3fca 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -123,6 +123,7 @@ def logwatch_precompile(hostname, item, _unused): continue params.append((level, pattern)) + return params @@ -262,6 +263,7 @@ def check_logwatch(item, params, info): block_header = None block_worst = 0 block_lines = [] + block_last_worst_line = '' def finish_block(header, block_worst, block_lines): start = ' '.join(header.split(' ')[0:2]) @@ -270,6 +272,9 @@ def check_logwatch(item, params, info): if os.path.exists(logfile): for line in file(logfile): line = line.rstrip('\n') + # Skip empty lines + if not line: + continue if line.startswith('<<<') and line.endswith('>>>'): if block_header: # The section is finished here. Add it to the list of reclassified lines

12 years, 5 months

Check_MK Git: check_mk: View Editor: Fixed jump to top of the page after moving painters during editing views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4df0a2481717621a70afae7b8419d2d780b326b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4df0a248171762… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 12:17:58 2012 +0200 View Editor: Fixed jump to top of the page after moving painters during editing views --- ChangeLog | 2 ++ web/htdocs/htmllib.py | 2 +- web/htdocs/views.py | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00fac6d..d68f4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Multisite: * FIX: allow web plugins to be byte compiled (*.pyc). Those are preferred over *.py if existing + * View Editor: Fixed jump to top of the page after moving painters during + editing views 1.2.0b2: Core: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4163ec0..2a3b036 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -365,7 +365,7 @@ class html: if onclick: onclick = 'onclick="%s" ' % onclick - url = "#" + url = "javascript:void(0)" if style: style = 'style="%s" ' % style diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d4f48af..0bd61ea 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -750,13 +750,13 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []): # Buttons for deleting and moving around html.write('<td class="cebuttons" rowspan=5>') - html.icon_button("#", _("Delete this column"), "delete", onclick="delete_view_column(this);") + html.icon_button("javascript:void(0)", _("Delete this column"), "delete", onclick="delete_view_column(this);") display = n == 1 and 'display:none;' or '' - html.icon_button("#", _("Move this column up"), "up", onclick="move_column_up(this);", + html.icon_button("javascript:void(0)", _("Move this column up"), "up", onclick="move_column_up(this);", id="%sup_%d" % (var_prefix, n), style=display) display = n == maxnum - 1 and 'display:none;' or '' - html.icon_button("#", _("Move this column down"), "down", onclick="move_column_down(this);", + html.icon_button("javascript:void(0)", _("Move this column down"), "down", onclick="move_column_down(this);", id="%sdown_%d" % (var_prefix, n), style=display) html.write('</td>')

12 years, 5 months

Check_MK Git: check_mk: Multisite: allow byte compiled *.pyc files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73b24b13fc5a813db268ef4c9dae7cdabe6416fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73b24b13fc5a81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 15:04:35 2012 +0200 Multisite: allow byte compiled *.pyc files --- ChangeLog | 5 +++++ web/htdocs/lib.py | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 522e9de..00fac6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.2.0b3: + Multisite: + * FIX: allow web plugins to be byte compiled (*.pyc). Those + are preferred over *.py if existing + 1.2.0b2: Core: * FIX: Cluster host checks were UNKNOWN all the time diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 0f07142..4ad5246 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import grp, defaults, pprint, os, errno, gettext, __builtin__ +import grp, defaults, pprint, os, errno, gettext, marshal, __builtin__ nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN", 4: "DEPENDENT" } nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN", 4: "DEP" } @@ -124,8 +124,14 @@ def load_web_plugins(forwhat, globalvars): fns = os.listdir(plugins_path) fns.sort() for fn in fns: + file_path = plugins_path + "/" + fn if fn.endswith(".py"): - execfile(plugins_path + "/" + fn, globalvars) + if not os.path.exists(file_path + "c"): + execfile(file_path, globalvars) + elif fn.endswith(".pyc"): + code_bytes = file(file_path).read()[8:] + code = marshal.loads(code_bytes) + exec code in globalvars if defaults.omd_root: local_plugins_path = defaults.omd_root + "/local/share/check_mk/web/plugins/" + forwhat

12 years, 5 months

Check_MK Git: check_mk: New hook for pre-distribution

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9101125a7588a34bb383c88b4fbf18e285dd4569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9101125a7588a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 18 12:29:07 2012 +0200 New hook for pre-distribution --- web/htdocs/wato.py | 82 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 54 insertions(+), 28 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a91f7a5..f9e0c8f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2792,13 +2792,24 @@ def mode_changelog(phase): html.context_button(_("Site Configuration"), make_link([("mode", "sites")]), "sites") elif phase == "action": + + # Let host validators do their work defective_hosts = validate_all_hosts([], force_all = True) if defective_hosts: raise MKUserError(None, _("You cannot activate changes while some hosts have " "an invalid configuration: ") + ", ".join( [ '<a href="%s">%s</a>' % (make_link([("mode", "edithost"), ("host", hn)]), hn) for hn in defective_hosts.keys() ])) - + + # Give hooks chance to do some pre-activation things (and maybe stop + # the activation) + try: + call_hook_pre_distribute_changes() + except Exception, e: + if config.debug: + raise + else: + raise MKUserError(None, "<h3>%s</h3>%s" % (_("Cannot activate changes"), e)) sitestatus_do_async_replication = False # see below if html.has_var("_siteaction"): @@ -3381,7 +3392,14 @@ def check_mk_local_automation(command, args=[], indata=""): (html.apache_user(), sudoline)) if command == 'restart': - call_hook_pre_activate_changes() + try: + call_hook_pre_activate_changes() + except Exception, e: + if config.debug: + raise + html.show_error("<h3>Cannot activate changes</h3>%s" % e) + return + if config.debug: log_audit(None, "automation", "Automation: %s" % " ".join(cmd)) @@ -10361,11 +10379,15 @@ def call_hooks(name, *args): try: hk(*args) except Exception, e: - import traceback, StringIO - txt = StringIO.StringIO() - t, v, tb = sys.exc_info() - traceback.print_exception(t, v, tb, None, txt) - html.show_error("<h3>" + _("Error executing hook") + " %s #%d: %s</h3><pre>%s</pre>" % (name, n, e, txt.getvalue())) + if config.debug: + import traceback, StringIO + txt = StringIO.StringIO() + t, v, tb = sys.exc_info() + traceback.print_exception(t, v, tb, None, txt) + html.show_error("<h3>" + _("Error executing hook") + " %s #%d: %s</h3><pre>%s</pre>" % (name, n, e, txt.getvalue())) + else: + raise + def call_hook_hosts_changed(folder): if "hosts-changed" in g_hooks: @@ -10385,32 +10407,36 @@ def call_hook_folder_deleted(folder): if 'folder-deleted' in g_hooks: call_hooks("folder-deleted", folder) -def call_hook_pre_activate_changes(): - """ - This hook is executed when one applies the pending configuration changes - from wato but BEFORE the nagios restart is executed. - - It can be used to create custom input files for nagios/Check_MK. +# This hook is executed before distributing changes to the remote +# sites (in distributed WATO) or before activating them (in single-site +# WATO). If the hook raises an exception, then the distribution and +# activation is aborted. +def call_hook_pre_distribute_changes(): + if hook_registered('pre-distribute-changes'): + call_hooks("pre-distribute-changes", collect_hosts(g_root_folder)) - The registered hooks are called with a dictionary as parameter which - holds all available with the hostnames as keys and the attributes of - the hosts as values. - """ +# This hook is executed when one applies the pending configuration changes +# from wato but BEFORE the nagios restart is executed. +# +# It can be used to create custom input files for nagios/Check_MK. +# +# The registered hooks are called with a dictionary as parameter which +# holds all available with the hostnames as keys and the attributes of +# the hosts as values. +def call_hook_pre_activate_changes(): if hook_registered('pre-activate-changes'): call_hooks("pre-activate-changes", collect_hosts(g_root_folder)) +# This hook is executed when one applies the pending configuration changes +# from wato. +# +# But it is only excecuted when there is at least one function +# registered for this host. +# +# The registered hooks are called with a dictionary as parameter which +# holds all available with the hostnames as keys and the attributes of +# the hosts as values. def call_hook_activate_changes(): - """ - This hook is executed when one applies the pending configuration changes - from wato. - - But it is only excecuted when there is at least one function - registered for this host. - - The registered hooks are called with a dictionary as parameter which - holds all available with the hostnames as keys and the attributes of - the hosts as values. - """ if hook_registered('activate-changes'): call_hooks("activate-changes", collect_hosts(g_root_folder))

12 years, 5 months

← Newer
1
...
4
5
6
7
8
9
10
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012