Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: Improved handling when displaying rules for folders

by Andreas Boesl

Module: check_mk Branch: master Commit: a2a6ebdc72488a00724fd6e1462812dd96fd816c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2a6ebdc72488a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 22 12:17:17 2013 +0200 Improved handling when displaying rules for folders - Main directory: display all rules of all subfolders - Any subfolder: display rules of this folder and all parents of this folder --- web/htdocs/wato.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1b76035..d897fd0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10510,8 +10510,7 @@ def mode_edit_ruleset(phase): alias_path = get_folder_aliaspath(folder, show_main = False) last_folder = folder - folder_filter = html.var('folder') - if folder_filter and folder['.name'] != folder_filter: + if g_folder != g_root_folder and not folder_is_parent_of(folder, g_folder): skip_this_folder = True continue

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1000

by Götz Golla

Module: check_mk Branch: master Commit: ee4887d10346359d86e0fb2ee000b62a2a95a134 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee4887d1034635… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 22 12:19:00 2013 +0200 Updated bug entries #1000 --- .bugs/1000 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/1000 b/.bugs/1000 index 0bd7c2b..a6c8a9f 100644 --- a/.bugs/1000 +++ b/.bugs/1000 @@ -1,5 +1,5 @@ Title: check ups_bat_temp uses upsIdentName as item name -Component: core +Component: checks State: open Date: 2013-08-22 12:07:41 Targetversion: future

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1000, #0999

by Götz Golla

Module: check_mk Branch: master Commit: 6f6b5f881f2d2142eaaec4ecc8855b73914da856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f6b5f881f2d21… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 22 12:11:52 2013 +0200 Updated bug entries #1000, #0999 --- .bugs/1000 | 9 +++++++++ .bugs/999 | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/.bugs/1000 b/.bugs/1000 new file mode 100644 index 0000000..0bd7c2b --- /dev/null +++ b/.bugs/1000 @@ -0,0 +1,9 @@ +Title: check ups_bat_temp uses upsIdentName as item name +Component: core +State: open +Date: 2013-08-22 12:07:41 +Targetversion: future +Class: nastiness + +it doesnt make sense to use an item for this test, but removing it would break existing rules +in group hw_temperature diff --git a/.bugs/999 b/.bugs/999 new file mode 100644 index 0000000..4946531 --- /dev/null +++ b/.bugs/999 @@ -0,0 +1,8 @@ +Title: Service Description of check ups_in_freq is in German +Component: checks +State: open +Date: 2013-08-22 12:00:53 +Targetversion: future +Class: nastiness + +the service description uses 'frequenz' instead of 'frequency'

11 years, 1 month

Check_MK Git: check_mk: wording improvments in status detail

by Götz Golla

Module: check_mk Branch: master Commit: bb27ce33e2f21fbd345ffcaaa2766094e2346356 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb27ce33e2f21f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 22 11:26:13 2013 +0200 wording improvments in status detail --- checks/ups_in_freq | 2 +- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- checks/ups_power | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/ups_in_freq b/checks/ups_in_freq index 4f98db0..12e6af8 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -37,7 +37,7 @@ def check_ups_in_freq(item, params, info): if line[0] == item: power = int(line[1]) / 10 perfdata = [ ( "in_freq", power, warn, crit, 30, 70 ) ] - infotext = "current in freq: %dHz (warn/crit at %d/%d Hz)" % \ + infotext = "in frequency: %dHz (warn/crit at %d/%d Hz)" % \ (power, warn, crit) if power <= crit: diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index b864245..6800576 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -37,7 +37,7 @@ def check_ups_in_voltage(item, params, info): if line[0] == item: power = int(line[1]) perfdata = [ ( "in_voltage", power, warn, crit, 150 ) ] - infotext = "current in voltage: %dV, (warn/crit at %dV/%dV)" % \ + infotext = "in voltage: %dV, (warn/crit at %dV/%dV)" % \ (power, warn, crit) if power <= crit: diff --git a/checks/ups_out_load b/checks/ups_out_load index 9f93411..4f4b971 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -37,7 +37,7 @@ def check_ups_out_load(item, params, info): if line[0] == item: power = int(line[1]) perfdata = [ ( "out_load", power, warn, crit, 100 ) ] - infotext = "current load: %d (warn/crit at %d/%d) " % \ + infotext = "load: %d (warn/crit at %d/%d) " % \ (power, warn, crit) if power >= crit: diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index b964e21..fa74095 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -37,7 +37,7 @@ def check_ups_out_voltage(item, params, info): if line[0] == item: power = int(line[1]) perfdata = [ ( "out_voltage", power, warn, crit, 200, 240 ) ] - infotext = "current in voltage: %dV (warn/crit at %dV/%dV)" % \ + infotext = "out voltage: %dV (warn/crit at %dV/%dV)" % \ (power, warn, crit) if power <= crit: diff --git a/checks/ups_power b/checks/ups_power index 0ae1818..aebd56c 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -40,7 +40,7 @@ def check_ups_power(item, params, info): if power < 0: power *= -1 perfdata = [ ( "power", power, warn, crit, 0 ) ] - infotext = "current power: %dW (warn/crit at %dW/%dW)" % \ + infotext = "power: %dW (warn/crit at %dW/%dW)" % \ (power, warn, crit) if power <= crit:

11 years, 1 month

Check_MK Git: check_mk: extra check for batteries of liebert devices

by Götz Golla

Module: check_mk Branch: master Commit: 08da92c2fde2a00ba318ae03b2c10820bf1226d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08da92c2fde2a0… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 22 11:24:46 2013 +0200 extra check for batteries of liebert devices --- checks/liebert_bat_temp | 62 +++++++++++++++++++++++++++++++++++++++++++++++ checks/ups_bat_temp | 9 +++---- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/checks/liebert_bat_temp b/checks/liebert_bat_temp new file mode 100644 index 0000000..06389e6 --- /dev/null +++ b/checks/liebert_bat_temp @@ -0,0 +1,62 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + + +liebert_bat_temp_default = (40, 50) # warning / critical + +def inventory_liebert_bat_temp(info): + if info: + return [ ( None, "liebert_bat_temp_default") ] + +def check_liebert_bat_temp(item, params, info): + warn, crit = params + if not info: + return 3, "Data Missing in SNMP Output" + line = info[0] + temp = saveint(line[0]) + perfdata = [ ( "temp", temp, warn, crit, 80 ) ] + infotext = "temperature: %d°C , (warn/crit at %d°C/%d°C) " % \ + (temp, warn, crit) + + if temp >= crit: + return (2, infotext, perfdata) + elif temp >= warn: + return (1, infotext, perfdata) + else: + return (0, infotext, perfdata) + + +check_info['liebert_bat_temp'] = { + "inventory_function" : inventory_liebert_bat_temp, + "check_function" : check_liebert_bat_temp, + "service_description" : "Battery Temp", + "has_perfdata" : True, + "group" : "hw_temperature", + "snmp_info" : (".1.3.6.1.4.1.476.1.42.3.4.1.3.3.1.3", "1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ + [".1.3.6.1.4.1.476.1.42"] + +} diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index b3be01e..022536c 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -35,9 +35,9 @@ def check_ups_bat_temp(item, params, info): warn, crit = params for line in info: if line[0] == item: - power = int(line[1]) + power = saveint(line[1]) perfdata = [ ( "temp", power, warn, crit, 80 ) ] - infotext = "current: %d°C , (warn/crit at %d°C/%d°C) " % \ + infotext = "temperature: %d°C , (warn/crit at %d°C/%d°C) " % \ (power, warn, crit) if power >= crit: @@ -47,7 +47,7 @@ def check_ups_bat_temp(item, params, info): else: return (0, infotext, perfdata) - return (3, "Temperatur %s not found in SNMP output" % item) + return (3, "Temperature %s not found in SNMP output" % item) check_info['ups_bat_temp'] = { "inventory_function" : inventory_ups_bat_temp, @@ -57,8 +57,7 @@ check_info['ups_bat_temp'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", - ".1.3.6.1.4.1.476.1.42" ] \ + [".1.3.6.1.4.1.818.1.100.1.1",".1.3.6.1.2.1.33",".1.3.6.1.2.1.33.2"] \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), }

11 years, 1 month

Check_MK Git: check_mk: various wording fixes

by Götz Golla

Module: check_mk Branch: master Commit: 5e7faf24c147c51d5e33d3881d62c5e65aea6956 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e7faf24c147c5… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Aug 21 16:20:45 2013 +0200 various wording fixes --- web/plugins/wato/active_checks.py | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index bc129e8..20bfb12 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -60,16 +60,23 @@ register_rule(group, help = _("Optional expect the DNS server to be authoriative" "for the lookup ")), ), + #( "expected_authority", + # FixedValue( + # value = True, + # title = _("Expect Authoritative DNS Server"), + # totext = _("DNS Server must be authoritative for the lookup"), + # ) + ( "response_time", Tuple( title = _("Expected response time"), elements = [ Float( - title = _("Warning at"), + title = _("Warning if above"), unit = "sec", default_value = 1), Float( - title = _("Critical at"), + title = _("Critical if above"), unit = "sec", default_value = 2), ]) @@ -109,11 +116,11 @@ register_rule(group, title = _("Expected response time"), elements = [ Float( - title = _("Warning at"), + title = _("Warning if above"), unit = "ms", default_value = 100.0), Float( - title = _("Critical at"), + title = _("Critical if above"), unit = "ms", default_value = 200.0), ]) @@ -298,11 +305,11 @@ register_rule(group, title = _("Expected response time"), elements = [ Float( - title = _("Warning at"), + title = _("Warning if above"), unit = "ms", default_value = 100.0), Float( - title = _("Critical at"), + title = _("Critical if above"), unit = "ms", default_value = 200.0), ]) @@ -581,11 +588,11 @@ register_rule(group, title = _("Expected response time"), elements = [ Float( - title = _("Warning at"), + title = _("Warning if above"), unit = "ms", default_value = 1000.0), Float( - title = _("Critical at"), + title = _("Critical if above"), unit = "ms", default_value = 2000.0), ]) @@ -700,7 +707,7 @@ register_rule(group, ("starttls", FixedValue( True, - totext = "STARTTLS enabled.", + totext = _("STARTTLS enabled."), title = _("Use STARTTLS for the connection.") ) ), @@ -725,11 +732,11 @@ register_rule(group, title = _("Expected response time"), elements = [ Integer( - title = _("Warning at"), + title = _("Warning if above"), unit = "sec" ), Integer( - title = _("Critical at"), + title = _("Critical if above"), unit = "sec" ), ]) @@ -786,8 +793,8 @@ register_rule(group, Tuple( title = _("Levels for used disk space"), elements = [ - Percentage(title = _("Warning at"), default_value = 85, unit=_("% used space"), allow_int = True), - Percentage(title = _("Critical at"), default_value = 95, unit=_("% used space"), allow_int = True), + Percentage(title = _("Warning if above"), default_value = 85, allow_int = True), + Percentage(title = _("Critical if above"), default_value = 95, allow_int = True), ] )), ( "auth",

11 years, 1 month

Check_MK Git: check_mk: new check for cisco ipsec tunnels added

by Götz Golla

Module: check_mk Branch: master Commit: 4fef66a44dfd871c164571cc4030b3c4b0faa811 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fef66a44dfd87… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Aug 21 16:18:56 2013 +0200 new check for cisco ipsec tunnels added --- checks/cisco_vpn_tunnel | 67 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 38 +++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/checks/cisco_vpn_tunnel b/checks/cisco_vpn_tunnel new file mode 100644 index 0000000..828c20c --- /dev/null +++ b/checks/cisco_vpn_tunnel @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# OID: 1.3.6.1.4.1.9.9.171.1.2.3.1.7.### +# cikeTunRemoteValue +# Description +# "The value of the remote peer identity. +# If the remote peer type is an IP Address, then this +# is the IP Address used to identify the remote peer. +# If the remote peer type is a host name, then +# this is the host name used to identify the +# remote peer." + +def check_cisco_vpn_tunnel(item, params, info): + if not info: + return 3, "SNMP Data for VPN Tunnel Missing" + + tunnels = params.get('tunnels',[]) + tunnel_alias = "" + tunnel_state = params.get('state',0) + if item in [tunnel[0] for tunnel in tunnels]: + if tunnel[1]: + tunnel_alias = " (%s)" % tunnel[1] + tunnel_state = tunnel[2] + + extra_info = "" + state = 0 + if [item] not in info: + extra_info = " - Tunnel is missing" + state = tunnel_state + + result = "%s%s%s" % (item, tunnel_alias, extra_info) + return state, result + +check_info["cisco_vpn_tunnel"] = { + "check_function" : check_cisco_vpn_tunnel, + "inventory_function" : lambda info: [(item[0], None) for item in info], + "service_description" : "VPN Tunnel %s", + "has_perfdata" : False, + "group" : "vpn_tunnel", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security"), + "snmp_info" : ( ".1.3.6.1.4.1.9.9.171.1.2.3.1", [ 7 ] ), +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7e49bf3..bcf0b2a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1062,6 +1062,44 @@ register_check_parameters( None ) +register_check_parameters( + subgroup_networking, + "vpn_tunnel", + _("VPN Tunnel"), + Dictionary( + elements = [ + ( "tunnels", + ListOf( + Tuple( + title = ("VPN Tunnel Endpoints"), + elements = [ + IPv4Address( + title = _("IP-Address of Tunnel Endpoint"), + allow_empty = False, + ), + TextAscii( + title = _("Name of Tunnel"), + ), + MonitoringState( + default_value = 2, + title = _("State if this tunnel is not found"), + )]), + add_label = _("Add another Tunnel"), + movable = False, + title = _("VPN Tunnel"), + )), + ( "state", + MonitoringState( + title = _("Default state if inventorized, unregistered tunnel is not found"), + help = _("Default state if a tunnel, which was inventorized but is not listed in this rule, " + "is not longer present in the snmp data"), + ), + ), + ], + ), + TextAscii( title = _("IP-Address of Tunnel Endpoint")), + "first" +) register_check_parameters( subgroup_networking,

11 years, 1 month

Check_MK Git: check_mk: mknotifyd: fixed recv() of notification messages in multiple chunks

by Andreas Boesl

Module: check_mk Branch: master Commit: fd3603e0cd0db2cd798cef0b19addbe1ba5be686 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd3603e0cd0db2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 20 16:16:31 2013 +0200 mknotifyd: fixed recv() of notification messages in multiple chunks --- doc/treasures/mknotifyd | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 042cce2..f5be9f4 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -232,10 +232,25 @@ class TcpServer: while not self._should_terminate: readable = select.select([self._tcp_socket], [], [], 0.5)[0] for s in readable: + client_data = "" + chunk_count = 0 client_socket, addr_info = s.accept() - client_data = client_socket.recv(8192) + while True: + try: + data_ready = select.select([client_socket], [], [], 2)[0] + if data_ready: + chunk = client_socket.recv(8192) + if not chunk: + break + chunk_count += 1 + client_data += chunk + else: + break + except: + break # Error while reading + if opt_verbose > 1: - verbose("Received notification %d from %s" % ( handled_connections, pprint.pformat(addr_info)), 2) + verbose("Received notification %d from %s in %d chunks" % ( handled_connections, pprint.pformat(addr_info), chunk_count), 2) handled_connections = handled_connections + 1 try:

11 years, 1 month

Check_MK Git: check_mk: jolokia_metrics: fixed incorrect plugin output

by Andreas Boesl

Module: check_mk Branch: master Commit: cb9e1dd8f183cc1ce86a39c988db53c2574aef49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb9e1dd8f183cc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 20 12:25:26 2013 +0200 jolokia_metrics: fixed incorrect plugin output --- ChangeLog | 1 + checks/jolokia_metrics | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 365a5f1..91e5a8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ new script caching options "off", "async", "sync" * windows_agent: increased maximum local/plugin script output length to 512kB (output buffer now grows dynamically) + * jolokia_metrics: fixed incorrect plugin output for high warn/crit levels Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 35a1802..eb00e4b 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -346,10 +346,10 @@ def check_jolokia_metrics_app_sess(item, params, info): status_txt = ' (Below or equal %d)' % lo_warn elif hi_crit is not None and sess >= hi_crit: status = 2 - status_txt = ' (Above or equal %d)' % lo_warn + status_txt = ' (Above or equal %d)' % hi_crit elif hi_warn is not None and sess >= hi_warn: status = 1 - status_txt = ' (Above or equal %d)' % lo_crit + status_txt = ' (Above or equal %d)' % hi_warn if maxActive and maxActive > 0: status_txt += " (max active sessions: %d)" % maxActive

11 years, 1 month

Check_MK Git: check_mk: notify.py: fixed bug with local notification spooling

by Andreas Boesl

Module: check_mk Branch: master Commit: cf9c14425541236fe69d13e6adab99b3ba1e249c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf9c1442554123… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 20 10:16:58 2013 +0200 notify.py: fixed bug with local notification spooling --- ChangeLog | 1 + modules/notify.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7497da1..365a5f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ Notifications: * notify.py: Matching service level: Use the hosts service level if a service has no service level set + * notify.py: fixed bug with local notification spooling Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/modules/notify.py b/modules/notify.py index 5ac931f..4f5a12e 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -508,7 +508,7 @@ def notify_notify(context): "that are prefixed with NOTIFY_\n") sys.exit(1) - if notification_spooling: + if notification_spool_to: # Create spoolfile target_site = "%s:%s" % notification_spool_to[0:2] create_spoolfile({"context": context, "forward": target_site})

11 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits