Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

windows agent: further work on wmi interface

by Sebastian Herbord

Module: check_mk Branch: master Commit: 462a58d6b7bca535941badad986869ace9fa9212 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=462a58d6b7bca5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 20 10:37:22 2015 +0100 windows agent: further work on wmi interface --- agents/windows/wmiHelper.cc | 9 ++++++++- agents/windows/wmiHelper.h | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 9137e07..aee2f79 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -309,6 +309,13 @@ template <> string Variant::get() template <> wstring Variant::get() { + if (_value.vt & VT_ARRAY) { + return L"<array>"; + } + if (_value.vt & VT_VECTOR) { + return L"<vector>"; + } + switch (_value.vt) { case VT_BSTR: return wstring(_value.bstrVal); @@ -324,7 +331,7 @@ template <> wstring Variant::get() case VT_BOOL: return std::to_wstring(get<bool>()); case VT_NULL: - return L"<null>"; + return L""; default: throw ComTypeException(string("wrong value type requested: ") + to_string(_value.vt)); } diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 48ed235..4695bd1 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -110,7 +110,6 @@ private: // not implemented ObjectWrapper &operator=(const ObjectWrapper &reference); - VARIANT getVarByKey(const wchar_t *key) const; };

8 years, 7 months

Updated bug entries #2322

by Lars Michelsen

Module: check_mk Branch: master Commit: 337a26cc26ea2e34b701f65362d3c93e41dd7343 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=337a26cc26ea2e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 20 09:06:18 2015 +0100 Updated bug entries #2322 --- .bugs/2322 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2322 b/.bugs/2322 new file mode 100644 index 0000000..e745d36 --- /dev/null +++ b/.bugs/2322 @@ -0,0 +1,10 @@ +Title: H/W-SW-Check consumes a lot of active check check helpers +Component: inv +State: open +Date: 2015-11-20 09:04:40 +Targetversion: 1.2.7 +Class: bug + +The HW/SW-Check is consuming a lot of load because it is realized as active +check. It is consuming a lot of time for starting the python interpreter, initializing +Check_MK etc. This should be better put into the Check_MK helper processes.

8 years, 7 months

#2844 FIX heartbeat_crm: Fixed problem processing the state of clone set resources

by Lars Michelsen

Module: check_mk Branch: master Commit: 0bdb7b5c8d9a0051fa9253c37195cce3139acc0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bdb7b5c8d9a00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 20 09:28:21 2015 +0100 #2844 FIX heartbeat_crm: Fixed problem processing the state of clone set resources --- .werks/2844 | 10 +++++++++ ChangeLog | 1 + checks/heartbeat_crm | 59 +++++++++++++++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/.werks/2844 b/.werks/2844 new file mode 100644 index 0000000..ece84dd --- /dev/null +++ b/.werks/2844 @@ -0,0 +1,10 @@ +Title: heartbeat_crm: Fixed problem processing the state of clone set resources +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1448008073 + + diff --git a/ChangeLog b/ChangeLog index b140801..88fa85e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 2712 FIX: winperf_processor: this check no longer requires multiple check cycles before counters are initialized * 2796 FIX: apc_symetra_ext_temp: now supports temperatures measured in fahrenheit * 2837 FIX: hitachi_hnas_temp: fixed ascii decode error, handles degree celsius now correct + * 2844 FIX: heartbeat_crm: Fixed problem processing the state of clone set resources Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index c82cd7b..b835b8c 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -188,42 +188,49 @@ def heartbeat_crm_parse_resources(info): resources = {} resource = '' mode = 'single' - for line in info: - if ' '.join(line) == 'Failed actions:': + for parts in info: + line = " ".join(parts) + + if line == 'Failed actions:': blockStart = False - elif not blockStart and ' '.join(line) == 'Full list of resources:': + elif not blockStart and line == 'Full list of resources:': blockStart = True elif blockStart: - if ' '.join(line[0:2]) == 'Resource Group:': + if line.startswith('Resource Group:'): # Resource group - resources[line[-1]] = [] - resource = line[-1] + resources[parts[2]] = [] + resource = parts[2] mode = 'resourcegroup' - elif ' '.join(line[0:2]) == 'Clone Set:': + elif line.startswith('Clone Set:'): # Clone set - resources[line[-2]] = [] - resource = line[-2] + resources[parts[2]] = [] + resource = parts[2] mode = 'cloneset' - elif ' '.join(line[0:2]) == 'Master/Slave Set:': + elif line.startswith('Master/Slave Set:'): # Master/Slave set - resources[line[-2]] = [] - resource = line[-2] + resources[parts[2]] = [] + resource = parts[2] mode = 'masterslaveset' elif line[0] == '_': + # Cleanup inconsistent agent output in clone set lines + if parts[0] != "_": + parts.insert(1, parts[0][1:]) + parts[0] = "_" + # Resource group or set member if mode == 'resourcegroup': - resources[resource].append(line[1:]) + resources[resource].append(parts[1:]) elif mode == 'cloneset': - if line[1] == 'Started:': - resources[resource].append([ resource, 'Clone', 'Started', line[3] ]) + if parts[1] == 'Started:': + resources[resource].append([ resource, 'Clone', 'Started', parts[3:-1] ]) elif mode == 'masterslaveset': - if line[1] == 'Masters:': - resources[resource].append([ resource, 'Master', 'Started', line[3] ]) - if line[1] == 'Slaves:': - resources[resource].append([ resource, 'Slave', 'Started', line[3] ]) + if parts[1] == 'Masters:': + resources[resource].append([ resource, 'Master', 'Started', parts[3] ]) + if parts[1] == 'Slaves:': + resources[resource].append([ resource, 'Slave', 'Started', parts[3] ]) else: # Single resource - resources[line[0]] = [ line ] + resources[parts[0]] = [ parts ] return resources @@ -261,8 +268,16 @@ def inventory_heartbeat_crm_resources(info): def check_heartbeat_crm_resources(item, target_node, info): output = '' status = 0 - for resource in [ resources for name, resources in heartbeat_crm_parse_resources(info).iteritems() if name == item ][0]: - output += ' '.join(resource) + + resources = None + for name, this_resources in heartbeat_crm_parse_resources(info).items(): + if name == item: + resources = this_resources + if resources == None: + return + + for resource in resources: + output += ' '.join([ type(p) == list and repr(p) or p for p in resource ]) if len(resource) == 3 or resource[2] != 'Started': status = 2 output += ' (Resource is in state "%s" (!!))' % resource[2]

8 years, 7 months

#2797 netscaler_vserver: now also shows tftp servers and health state of loadbalacing entities

by Andreas Boesl

Module: check_mk Branch: master Commit: 75f2596c1f4dcc4e8814ede9f39c25d1fa48f056 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75f2596c1f4dcc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 19 18:46:48 2015 +0100 #2797 netscaler_vserver: now also shows tftp servers and health state of loadbalacing entities --- .werks/2797 | 9 ++++ ChangeLog | 1 + checkman/netscaler_vserver | 3 ++ checks/netscaler_vserver | 112 +++++++++++++++++++++++++++----------------- 4 files changed, 82 insertions(+), 43 deletions(-) diff --git a/.werks/2797 b/.werks/2797 new file mode 100644 index 0000000..36ff1e7 --- /dev/null +++ b/.werks/2797 @@ -0,0 +1,9 @@ +Title: netscaler_vserver: now also shows tftp servers and health state of loadbalacing entities +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447955060 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a9da207..275a89c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 2710 arbor_peakflow_sp, arbor_peakflow_sp.cpu_load, arbor_peakflow_sp.disk_usage, arbor_peakflow_sp.flows, arbor_peakflow_tms, arbor_peakflow_tms.cpu_load, arbor_peakflow_tms.disk_usage, arbor_peakflow_tms.host_fault, arbor_peakflow_tms.updates, arbor_pravail, arbor_pravail.cpu_load, arbor_pravail.disk_usage, arbor_pravail.host_fault: new checks for various arbor devices * 2711 janitza_umg: added support for umg508... * 2792 check_mk_agent.aix: now able to use wildcards in the fileinfo.cfg + * 2797 netscaler_vserver: now also shows tftp servers and health state of loadbalacing entities * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checkman/netscaler_vserver b/checkman/netscaler_vserver index 8fb161e..b1db83c 100644 --- a/checkman/netscaler_vserver +++ b/checkman/netscaler_vserver @@ -11,6 +11,9 @@ description: state CRIT when the VServer is in the state {DOWN}. It is in the state WARN in all other cases. + For loadbalancing entities is also shows the health state. The check goes WARN if + the health is below 100 percent and CRIT when the health drops to zero. + inventory: One service per VServer will be created. diff --git a/checks/netscaler_vserver b/checks/netscaler_vserver index 72e12b9..b2f55ff 100644 --- a/checks/netscaler_vserver +++ b/checks/netscaler_vserver @@ -26,46 +26,57 @@ # netscaler_vserver_states = { - 0: ("unknown", 1), - 1: ("down", 2), - 2: ("unknown", 1), - 3: ("busy", 1), - 4: ("out of service", 1), - 5: ("transition to out of service", 1), - 7: ("up", 0), + "0": ("unknown", 1), + "1": ("down", 2), + "2": ("unknown", 1), + "3": ("busy", 1), + "4": ("out of service", 1), + "5": ("transition to out of service", 1), + "7": ("up", 0), +} + +netscaler_vserver_types = { + "0" :"http", + "1" :"ftp", + "2" :"tcp", + "3" :"udp", + "4" :"sslBridge", + "5" :"monitor", + "6" :"monitorUdp", + "7" :"nntp", + "8" :"httpserver", + "9" :"httpclient", + "10" :"rpcserver", + "11" :"rpcclient", + "12" :"nat", + "13" :"any", + "14" :"ssl", + "15" :"dns", + "16" :"adns", + "17" :"snmp", + "18" :"ha", + "19" :"monitorPing", + "20" :"sslOtherTcp", + "21" :"aaa", + "23" :"secureMonitor", + "24" :"sslvpnUdp", + "25" :"rip", + "26" :"dnsClient", + "27" :"rpcServer", + "28" :"rpcClient", + "62" :"serviceUnknown", + "69" :"tftp", +} + +netscaler_vserver_entitytypes = { + "0" :"unknown", + "1" :"loadbalancing", + "2" :"loadbalancinggroup", + "3" :"sslvpn", + "4" :"contentswitching", + "5" :"cacheredirection", } -netscaler_vserver_types = ( - "http", - "ftp", - "tcp", - "udp", - "sslBridge", - "monitor", - "monitorUdp", - "nntp", - "httpserver", - "httpclient", - "rpcserver", - "rpcclient", - "nat", - "any", - "ssl", - "dns", - "adns", - "snmp", - "ha", - "monitorPing", - "sslOtherTcp", - "aaa", - "secureMonitor", - "sslvpnUdp", - "rip", - "dnsClient", - "rpcServer", - "rpcClient", - "serviceUnknown", -) def inventory_netscaler_vserver(info): for line in info: @@ -75,11 +86,24 @@ def inventory_netscaler_vserver(info): def check_netscaler_vserver(item, _no_params, info): for line in info: if line[0] == item: - name, ip, port, srv_type, srv_state = line - infotext = "State: %s, Type: %s, Socket:%s:%s" % \ - (netscaler_vserver_states[int(srv_state)][0], netscaler_vserver_types[int(srv_type)], ip, port) - state = netscaler_vserver_states[int(srv_state)][1] - return state, infotext + state = 0 + name, ip, port, svr_type, svr_state, svr_health, svr_entitytype = line + + svr_state_info = netscaler_vserver_states.get(svr_state, ("unknown", 1)) + yield svr_state_info[1], "State: %s" % svr_state_info[0] + + if svr_entitytype in [ "1", "2" ]: + health_perc = int(svr_health) + health_state = 0 + if health_perc == 0: + health_state = 2 + elif health_perc < 100: + health_state = 1 + yield health_state, "Health at: %s%%" % health_perc + + yield 0, "Type: %s" % netscaler_vserver_entitytypes.get(svr_entitytype , "unknown") + yield 0, "Protocol: %s" % netscaler_vserver_types.get(svr_type, "serviceUnknown") + yield 0, "Socket: %s:%s" % (ip, port) check_info["netscaler_vserver"] = { "check_function" : check_netscaler_vserver, @@ -91,6 +115,8 @@ check_info["netscaler_vserver"] = { 3, # vsvrPort 4, # vsvrType 5, # vsvrState + 62, # vsvrHealth + 64, # vsvrEntityType ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), }

8 years, 7 months

New style for agent deployment

by Mathias Kettner

Module: check_mk Branch: master Commit: 43ff565eec788e63af16b41003f99cd4a5b13a37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43ff565eec788e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 19 18:28:48 2015 +0100 New style for agent deployment --- web/htdocs/check_mk.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9be01ef..2b5d787 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -692,3 +692,20 @@ td.nowiki table { td.nowiki table td, td.nowiki table th { border: 1px solid #888; } + + +/*--Deployment-------------------------------------------------------------. +| ____ _ _ | +| | _ \ ___ _ __ | | ___ _ _ _ __ ___ ___ _ __ | |_ | +| | | | |/ _ \ '_ \| |/ _ \| | | | '_ ` _ \ / _ \ '_ \| __| | +| | |_| | __/ |_) | | (_) | |_| | | | | | | __/ | | | |_ | +| |____/ \___| .__/|_|\___/ \__, |_| |_| |_|\___|_| |_|\__| | +| |_| |___/ | ++--------------------------------------------------------------------------+ +| Styles for agent deployment (used in CEE only) | +'-------------------------------------------------------------------------*/ + +.wato div.agent_deployment img.iconbutton { + width: 60px; + height: 16px; +}

8 years, 7 months

Removed unused obsolete function in wato/mkeventd.py

by Mathias Kettner

Module: check_mk Branch: master Commit: d9c773ea1c99894c72521103af5f0f920b76f2a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9c773ea1c9989… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 19 13:40:57 2015 +0100 Removed unused obsolete function in wato/mkeventd.py --- mkeventd/web/plugins/wato/mkeventd.py | 38 --------------------------------- 1 file changed, 38 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 511b0d0..702f50f 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1706,44 +1706,6 @@ def mode_mkeventd_status(phase): html.hidden_fields() html.end_form() -def mode_mkeventd_edit_configvar(phasee): - if phase == 'title': - return _('Event Console Configuration') - - elif phase == 'buttons': - home_button() - mkeventd_rules_button() - mkeventd_changes_button() - mkeventd_status_button() - return - - vs = [ (v[1], v[2]) for v in g_configvar_groups[_("Event Console")] ] - pending_func = g_configvar_domains['mkeventd']['pending'] - current_settings = load_configuration_settings() - - if phase == 'action': - if not html.check_transaction(): - return - - for (varname, valuespec) in vs: - valuespec = dict(vs)[varname] - new_value = valuespec.from_html_vars(varname) - valuespec.validate_value(new_value, varname) - if current_settings.get(varname) != new_value: - msg = _("Changed configuration of %s to %s.") \ - % (varname, valuespec.value_to_text(new_value)) - pending_func(msg) - current_settings[varname] = new_value - - save_configuration_settings(current_settings) - config.load_config() # make new configuration active - return - - html.begin_form('mkeventd_config', method = "POST", action = 'wato.py?mode=mkeventd_config') - - html.button("_save", _("Save")) - html.hidden_fields() - html.end_form() def mode_mkeventd_config(phase): if phase == 'title':

8 years, 7 months

#1304 mk_mysql: Agent plugin can now detect multiple instances running unter the same user

by Bastian Kuhn

Module: check_mk Branch: master Commit: d8a8229490da2a6fcde827fac9ba113bebd087eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8a8229490da2a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 19 17:16:32 2015 +0100 #1304 mk_mysql: Agent plugin can now detect multiple instances running unter the same user In case that the agent plugin detects more then one running instance, the Name of the socket will be used as item. --- .werks/1304 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_mysql | 9 ++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/1304 b/.werks/1304 new file mode 100644 index 0000000..6eba6b0 --- /dev/null +++ b/.werks/1304 @@ -0,0 +1,10 @@ +Title: mk_mysql: Agent plugin can now detect multiple instances running unter the same user +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447949700 +Class: feature + +In case that the agent plugin detects more then one running instance, the Name of the socket will be used as item. + diff --git a/ChangeLog b/ChangeLog index f1e39c5..bd617b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 2711 janitza_umg: added support for umg508... * 2792 check_mk_agent.aix: now able to use wildcards in the fileinfo.cfg * 1303 multipath, solaris_multipath: Level for needed paths can now be specified in percent + * 1304 mk_mysql: Agent plugin can now detect multiple instances running unter the same user... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index ebbba5c..8c6ee7d 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -26,7 +26,14 @@ # gets optional socket as argument function do_query() { INSTANCE=$(echo $1|awk -v FS="=" '{print $2}') - INSTANCE_NAME="[[$(ps -ef|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p')]]" + COUNT=$(ps -ef | grep [/]usr/sbin/mysqld | grep socket | wc -l) + if [ $COUNT -gt 1 ] + then + INSTANCE_NAME=$(ps -ef|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*socket=$[^.]*$.*/\1/p') + INSTANCE_NAME="[[${INSTANCE_NAME##*/}]]" + else + INSTANCE_NAME="[[$(ps -ef|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p')]]" + fi

8 years, 7 months

#2843 FIX Hanging notification scripts could prevent all other notifications

by Lars Michelsen

Module: check_mk Branch: master Commit: 449a6410d10f45d1ed0fd18f96cf1ddd405dabc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=449a6410d10f45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 19 14:18:37 2015 +0100 #2843 FIX Hanging notification scripts could prevent all other notifications Notification scripts are assumed to finish within short time like a couple of seconds. If a notification script takes longer or is hanging for ever, it prevent Check_MK from sending out other notifications. So one hanging notification could prevent all others. This has been fixed by introducing a global notification plugin timeout. All notification plugins which take more than 60 seconds will be killed so that other notifications can be done again. If you need a different timeout, you can configure it using the global setting "Notification plugin timeout". --- .werks/2843 | 17 ++++++++++ ChangeLog | 1 + modules/notify.py | 54 +++++++++++++++++++++++------- web/plugins/wato/globals_notification.py | 10 ++++++ 4 files changed, 70 insertions(+), 12 deletions(-) diff --git a/.werks/2843 b/.werks/2843 new file mode 100644 index 0000000..ce1739d --- /dev/null +++ b/.werks/2843 @@ -0,0 +1,17 @@ +Title: Hanging notification scripts could prevent all other notifications +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.7i4 +Date: 1447938942 +Class: fix + +Notification scripts are assumed to finish within short time like a couple +of seconds. If a notification script takes longer or is hanging for ever, +it prevent Check_MK from sending out other notifications. So one hanging +notification could prevent all others. + +This has been fixed by introducing a global notification plugin timeout. +All notification plugins which take more than 60 seconds will be killed +so that other notifications can be done again. If you need a different +timeout, you can configure it using the global setting "Notification plugin timeout". diff --git a/ChangeLog b/ChangeLog index d8bccc8..f1e39c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,7 @@ Notifications: * 2728 FIX: Removed debug notification script (was not executable)... + * 2843 FIX: Hanging notification scripts could prevent all other notifications... Event Console: * 2733 Visibility of Event Console events more flexible now... diff --git a/modules/notify.py b/modules/notify.py index 5be18a5..1acb97c 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -62,6 +62,7 @@ enable_rulebased_notifications = False notification_fallback_email = "" notification_rules = [] notification_bulk_interval = 10 # Check every 10 seconds for ripe bulks +notification_plugin_timeout = 60 # Notification Spooling. @@ -1116,6 +1117,9 @@ def path_to_notification_script(plugin): def call_notification_script(plugin, plugin_context): core_notification_log(plugin, plugin_context) + def plugin_log(s): + notify_log(" %s" % s) + # The "Pseudo"-Plugin None means builtin plain email if not plugin: return notify_via_email(plugin_context) @@ -1125,26 +1129,52 @@ def call_notification_script(plugin, plugin_context): if not path: return 2 - # Export complete context to have all vars in environment. - # Existing vars are replaced, some already existing might remain - add_context_to_environment(plugin_context, "NOTIFY_") + plugin_log("executing %s" % path) + try: + set_notification_timeout() + p = subprocess.Popen([path], shell=False, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, env=notification_script_env(plugin_context)) + + for line in p.stdout: + plugin_log("Output: %s" % line.rstrip().decode('utf-8')) + + exitcode = p.returncode + clear_notification_timeout() + except NotificationTimeout: + plugin_log("Notification plugin did not finish within %d seconds. Terminating." % + notification_plugin_timeout) + p.kill() + exitcode = 1 - notify_log(" executing %s" % path) - out = os.popen(path + " 2>&1 </dev/null") - for line in out: - notify_log("Output: %s" % line.rstrip().decode('utf-8')) - exitcode = out.close() if exitcode: - notify_log("Plugin exited with code %d" % (exitcode >> 8)) + plugin_log("Plugin exited with code %d" % exitcode) else: exitcode = 0 - # Clear environment again. - remove_context_from_environment(plugin_context, "NOTIFY_") - return exitcode +# Construct the environment for the notification script +def notification_script_env(plugin_context): + return dict([ ("NOTIFY_" + k, v.encode("utf-8")) + for k, v in plugin_context.items() ]) + + +class NotificationTimeout(Exception): + pass + + +def handle_notification_timeout(signum, frame): + raise NotificationTimeout() + + +def set_notification_timeout(): + signal.signal(signal.SIGALRM, handle_notification_timeout) + signal.alarm(notification_plugin_timeout) + + +def clear_notification_timeout(): + signal.alarm(0) #. # .--Spooling------------------------------------------------------------. diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index ad05e57..f63e8d0 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -87,6 +87,16 @@ register_configvar(group, need_restart = True) register_configvar(group, + "notification_plugin_timeout", + Age( + title = _("Notification plugin timeout"), + help = _("After the configured time notification plugins are being interrupted."), + default_value = 60, + minvalue = 1, + ), + domain = "check_mk") + +register_configvar(group, "notification_logging", Transform( DropdownChoice(

8 years, 7 months

Updated bug entries #2321

by Lars Michelsen

Module: check_mk Branch: master Commit: d3e0985821c759f41573ac0212d65a205b1b47a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3e0985821c759… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 19 14:13:52 2015 +0100 Updated bug entries #2321 --- .bugs/2321 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2321 b/.bugs/2321 new file mode 100644 index 0000000..59bc74c --- /dev/null +++ b/.bugs/2321 @@ -0,0 +1,7 @@ +Title: notify.py: subprocess p.communicate() calls may block when plugins output a lot +Component: notifcation +State: open +Date: 2015-11-19 13:38:58 +Targetversion: 1.2.7 +Class: bug +

8 years, 7 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 6619bc2a9b2dd1348cd7b316fe2fa0c28aa326d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6619bc2a9b2dd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 19 14:14:20 2015 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4f552a2..42b029a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2843 +2863

8 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015