Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: Fixed copy and paste bug

by Bastian Kuhn

Module: check_mk Branch: master Commit: d7aa7e4766f9e1aeecaed05d2fab2b7e6ff58be5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7aa7e4766f9e1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 15 16:52:23 2014 +0100 Fixed copy and paste bug --- checks/apc_humidity | 4 ++-- checks/stulz_humidity | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/apc_humidity b/checks/apc_humidity index 0b9b4b3..9dc67be 100644 --- a/checks/apc_humidity +++ b/checks/apc_humidity @@ -36,8 +36,8 @@ def check_apc_humidity(item, params, info): if line[0] == item: humidity = saveint(line[1]) warnlow, critlow, warnhigh, crithigh = params - infotext = "%s%%" % humidity + " (warn/crit below %.1f/%.1f or above %.1f/%.1f %%" % \ - (critlow, warnlow, warnhigh, crithigh) + ")" + infotext = "%s%% (warn/crit below %.1f/%.1f or above %.1f/%.1f %%)" % \ + ( humidity, critlow, warnlow, warnhigh, crithigh) perfdata = [ ( "humidity", humidity, critlow, warnlow, warnhigh, crithigh ) ] if humidity <= critlow or humidity >= crithigh: return (2, "Humidity is: " + infotext, perfdata ) diff --git a/checks/stulz_humidity b/checks/stulz_humidity index 87e267c..53ce479 100644 --- a/checks/stulz_humidity +++ b/checks/stulz_humidity @@ -34,7 +34,8 @@ def check_stulz_humidity(item, params, info): if line[0] == item: warnlow, critlow, warnhigh, crithigh = params humidity = savefloat(line[1])/10 - infotext = "%s%%" % humidity + " (warn/crit below %.1f/%.1f or above %.1f/%.1f %%" % \ + infotext = "%s%% (warn/crit below %.1f/%.1f or above %.1f/%.1f %%)" % \ + ( humidity, critlow, warnlow, warnhigh, crithigh) perfdata = [ ('humidity', humidity, critlow, warnlow, warnhigh, crithigh ) ] if humidity <= critlow or humidity >= crithigh:

10 years, 5 months

Check_MK Git: check_mk: f5_big_ip_conns: check now supports predictive monitoring and both connections types are merged in one check

by Götz Golla

Module: check_mk Branch: master Commit: 7b593377ad8da5a448f6f519703a31cfbeadc344 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b593377ad8da5… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 15 16:29:04 2014 +0100 f5_big_ip_conns: check now supports predictive monitoring and both connections types are merged in one check --- .werks/568 | 8 ++++ ChangeLog | 1 + checkman/f5_bigip_conns | 21 ++++----- checks/f5_bigip_conns | 84 ++++++++++++++++++++++------------ web/plugins/wato/check_parameters.py | 20 ++++---- 5 files changed, 81 insertions(+), 53 deletions(-) diff --git a/.werks/568 b/.werks/568 new file mode 100644 index 0000000..164b5d4 --- /dev/null +++ b/.werks/568 @@ -0,0 +1,8 @@ +Title: f5_big_ip_conns: check now supports predictive monitoring and both connections types are merged in one check +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1389799642 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d98f91b..2a51fe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 0445 mem.win: Allow time-averaging of values before applying levels... * 0446 mem.used, solaris_mem: Introduce optional averaging of used memory... * 0566 services.summary: new check to monitor stopped services of mode autostart in windows + * 0568 f5_big_ip_conns: check now supports predictive monitoring and both connections types are merged in one check * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/f5_bigip_conns b/checkman/f5_bigip_conns index 6629dd8..5c866cc 100644 --- a/checkman/f5_bigip_conns +++ b/checkman/f5_bigip_conns @@ -5,30 +5,25 @@ license: GPL distribution: check_mk description: The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) - for the number of current connections and the number of current ssl connections. + for the number of current connections {sysStatClientCurConns} and the number of current + ssl connections {sysClientsslStatCurConns}. + Warning and critical limits can be given for both types of data. It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 devices. - Warning and critical limits can be given for both types of data. - The check is supported by WATO. -inventory: - The check has two items per host, the number of connections, and the number of ssl connections - perfdata: - The value: the number of current connections + At least two values: the number of current connections and ssl connections [parameters] -parameters(dict): parameters is a dictionary with two keys - - {"conns"}: the number of connections from {sysStatClientCurConns } - - {"sslconns"}: the number of ssl connections from {sysClientsslStatCurConns } +parameters(dict): parameters is a dictionary with two keys {"conns"} and {"ssl_conns"}. +The keys may be a tuple of warning and critical levels. However, when using predictive levels +via WATO, the keys are dictionaries themselves with several keys and values. [configuration] -f5_bigip_conns_default_levels(dict): This variable is preset to {{ "conns": ( 25000, 30000 ) }, "sslconns": ( 25000, 30000 )} +f5_bigip_conns_default_levels(dict): This variable is preset to {{ "conns": ( 25000, 30000 ) }, "ssl_conns": ( 25000, 30000 )} diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index 09e6eb1..1b4039e 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -29,41 +29,68 @@ # {iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 3375 bigipTrafficMgmt(2) bigipSystem(1) sysGlobals(1) sysGlobalStats(2) sysGlobalClientSslStat(9) sysClientsslStatCurConns(2)} - -# f5_bigip_conns_default_levels = ( 25000, 30000 ) factory_settings["f5_bigip_conns_default_levels"] = { "conns": ( 25000, 30000 ), - "sslconns": ( 25000, 30000 ), + "ssl_conns": ( 25000, 30000 ), } - def inventory_f5_bigip_conns(info): - inventory = [] - if info[0][0]: - inventory.append( ( "Open Connections", {} ) ) - if info[0][1]: - inventory.append( ( "Open SSL Connections", {} ) ) - - return inventory + #inventory = [] + #if info[0][0]: + # inventory.append( ( "Open Connections", {} ) ) + #if info[0][1]: + # inventory.append( ( "Open SSL Connections", {} ) ) + #return inventory + if info: + return [ ( None, {} ) ] def check_f5_bigip_conns(item, params, info): - if item == "Open Connections": - warn, crit = params.get("conns") - conns = int(info[0][0]) - elif item == "Open SSL Connections": - warn, crit = params.get("sslconns") - conns = int(info[0][1]) - else: - return 3, "no such item" + type_list = { 'conns': ('Connections', 0), + 'ssl_conns': ('SSL Connections', 1), + } + perfdata = [] + infotext = "" + state = 0 - infotext = "Number %d (limits %d/%d)" % (conns, warn, crit) - perfdata = [ ("conns", conns, warn, crit ) ] - if conns > crit: - state = 2 - elif conns > warn: - state = 1 - else: - state = 0 + separator = "" + for typ, values in type_list.iteritems(): + param = params.get(typ) + desc = values[0] + index = values[1] + conns = int(info[0][index]) + infotext += separator + separator = " - " + if type(param) == tuple: + warn, crit = param + perfdata.append( (typ, conns, warn, crit) ) + if conns >=crit: + sstate = 2 + sym = "(!!)" + elif conns >= warn: + sstate = 1 + sym = "(!)" + else: + sstate = 0 + sym = "" + infotext += "%d %s%s (%d/%d)" % (conns, desc, sym, warn, crit) + else: + warn, crit = None, None + perf = ( (typ, conns, warn, crit) ) + sstate, text, extraperf = check_levels(conns, typ, param) + if sstate == 2: + sym == "(!!)" + elif sstate == 1: + sym = "(!)" + else: + sym = "" + perfdata.append(perf) + if len(extraperf) > 0: + perfdata.append(extraperf[0]) + infotext += "%d %s%s" % (conns, desc, sym) + if text: + infotext += ", " + text + if state < sstate: + state = sstate return (state, infotext, perfdata) @@ -72,7 +99,8 @@ check_info["f5_bigip_conns"] = { 'inventory_function' : inventory_f5_bigip_conns, 'service_description' : 'Open Connections', 'has_perfdata' : True, - 'default_levels_variable' : "f5_bigip_conns_default_levels", + 'group' : 'f5_connections', + 'default_levels_variable' : 'f5_bigip_conns_default_levels', 'snmp_info' : ( '.1.3.6.1.4.1.3375.2.1.1.2', [ '1.8', # sysStatServerCurConns '9.2', # sysClientsslStatCurConns diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5729bfd..b62ee2b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2736,21 +2736,17 @@ register_check_parameters( Dictionary( elements = [ ( "conns", - Tuple( - title = _("Max. number of connections"), - elements = [ - Integer(title = _("Warning if above"), default_value = 25000 ), - Integer(title = _("Critical if above"), default_value = 30000 ) , - ] + Levels( + title = _("Max. number of connections"), + default_value = None, + default_levels = (25000, 30000) ) ), ( "ssl_conns", - Tuple( - title = _("Max. number of ssl connections"), - elements = [ - Integer(title = _("Warning if above"), default_value = 25000 ), - Integer(title = _("Critical if above"), default_value = 30000 ), - ] + Levels( + title = _("Max. number of connections"), + default_value = None, + default_levels = (25000, 30000) ) ), ]),

10 years, 5 months

Check_MK Git: check_mk: Fix: stulz_humidity output and apc_humidity template

by Bastian Kuhn

Module: check_mk Branch: master Commit: e70900157d51ba41ef27e98ad6254c17d0b80221 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e70900157d51ba… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 15 11:22:12 2014 +0100 Fix: stulz_humidity output and apc_humidity template --- checks/stulz_humidity | 27 ++++++++------------- pnp-templates/check_mk-apc_humidity.php | 39 +------------------------------ 2 files changed, 11 insertions(+), 55 deletions(-) diff --git a/checks/stulz_humidity b/checks/stulz_humidity index dad7c61..87e267c 100644 --- a/checks/stulz_humidity +++ b/checks/stulz_humidity @@ -34,23 +34,16 @@ def check_stulz_humidity(item, params, info): if line[0] == item: warnlow, critlow, warnhigh, crithigh = params humidity = savefloat(line[1])/10 - state = 0 - msg = "" - if humidity >= crithigh: - state = 2 - msg = "to high (Levels Warning/Critical %d/%d) " % ( warnhigh, crithigh ) - elif humidity >= warnhigh: - state = 1 - msg = "to high (Levels Warning/Critical %d/%d) " % ( warnhigh, crithigh ) - elif humidity <= warnlow and humidity > critlow: - state = 1 - msg = "to low (Levels Warning/Critical %d/%d) " % ( warnlow, critlow ) - elif humidity <= critlow: - state = 2 - msg = "to low (Levels Warning/Critical %d/%d) " % ( warnlow, critlow ) - message = " Current Humidity: %.2f%% %s" % ( humidity, msg ) - perf = [ ('humidity', humidity, critlow, warnlow, warnhigh, crithigh ) ] - return state, message, perf + infotext = "%s%%" % humidity + " (warn/crit below %.1f/%.1f or above %.1f/%.1f %%" % \ + + perfdata = [ ('humidity', humidity, critlow, warnlow, warnhigh, crithigh ) ] + if humidity <= critlow or humidity >= crithigh: + return (2, "Humidity is: " + infotext, perfdata ) + elif humidity <= warnlow or humidity >= warnhigh: + return (1, "Humidity is: " + infotext, perfdata ) + else: + return (0, "Humidity is: " + infotext, perfdata ) + return 3, "No information found about the device" check_info["stulz_humidity"] = { diff --git a/pnp-templates/check_mk-apc_humidity.php b/pnp-templates/check_mk-apc_humidity.php deleted file mode 100644 index aba6a03..0000000 --- a/pnp-templates/check_mk-apc_humidity.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | 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. - -$opt[1] = "--vertical-label \"Percent\" --title \"$servicedesc\" "; - -$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; -$def[1] .= "LINE2:var1#2080ff:\"Humidity\:\" "; -$def[1] .= "GPRINT:var1:LAST:\"%2.0lf%%\" "; -$def[1] .= "GPRINT:var1:AVERAGE:\"(Avg\: %2.0lf%%,\" "; -$def[1] .= "GPRINT:var1:MIN:\"Min\: %2.0lf%%,\" "; -$def[1] .= "GPRINT:var1:MAX:\"Max\: %2.0lf%%)\" "; -$def[1] .= "HRULE:$CRIT[1]#FFFF00 "; -$def[1] .= "HRULE:$WARN[1]#FF0000 "; -$def[1] .= "HRULE:$MIN[1]#FFFF00 "; -$def[1] .= "HRULE:$MAX[1]#FF0000 "; -?> diff --git a/pnp-templates/check_mk-apc_humidity.php b/pnp-templates/check_mk-apc_humidity.php new file mode 120000 index 0000000..152ceab --- /dev/null +++ b/pnp-templates/check_mk-apc_humidity.php @@ -0,0 +1 @@ +check_mk-stulz_humidity.php \ No newline at end of file

10 years, 5 months

Check_MK Git: check_mk: genau_fan: Fixed typo in wato group

by Bastian Kuhn

Module: check_mk Branch: master Commit: ed25c8701f7ea6bd8b2fd3a03190636d264d5fe8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed25c8701f7ea6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 15 10:58:22 2014 +0100 genau_fan: Fixed typo in wato group --- checks/genua_fan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/genua_fan b/checks/genua_fan index 3887112..9d607e8 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -60,7 +60,7 @@ def check_genua_fan(item, params, info): check_info['genua_fan'] = { "inventory_function" : inventory_genua_fan, "check_function" : check_genua_fan, - "group" : "hw_fan", + "group" : "hw_fans", "service_description": "FAN %s", "has_perfdata" : True, "snmp_info" : [( ".1.3.6.1.4.1.3717.2.1.1.1.1",[

10 years, 5 months

Check_MK Git: check_mk: minor changes in behaviour of IO section, removed last old cmciii check cmciii_access

by Götz Golla

Module: check_mk Branch: master Commit: 9e4d6f3bcce383d57cb6ab10a70ab2798a7fb434 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e4d6f3bcce383… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 15 10:26:39 2014 +0100 minor changes in behaviour of IO section, removed last old cmciii check cmciii_access --- checks/cmciii_access | 65 -------------------------------------------------- 1 file changed, 65 deletions(-) diff --git a/checks/cmciii_access b/checks/cmciii_access deleted file mode 100644 index 90ac668..0000000 --- a/checks/cmciii_access +++ /dev/null @@ -1,65 +0,0 @@ -#!/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. - - -def inventory_cmciii_access(info): - inventory = [] - for line in info[0]: - if line[0] == "Door" or line[0] == "ACCESS": - id, num = line[1].split(".") - if num == "1": - item = line[0] +" " + id - inventory.append( (item , None )) - return inventory - -def check_cmciii_access(item, params, info): - itemtype, itemnum = item.split(" ") - for line in info[0]: - id, num = line[1].split(".") - if itemnum == id: - if (itemtype == "Door" and num == "5") or (itemtype == "ACCESS" and num == "4"): - infotext = "-".join(info[1][int(id)-1]) - infotext += ": " + line[0] - state = 2 - if line[0] == "Closed": - state = 0 - return (state, infotext ) - - return (3, "Item not found in SNMP data") - - -check_info['cmciii_access'] = { - "check_function" : check_cmciii_access, - "inventory_function" : inventory_cmciii_access, - "has_perfdata" : False, - "service_description" : "%s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), - "snmp_info" : [ - [".1.3.6.1.4.1.2606.7.4.2.2.1", [ "10", OID_END ] ], - [".1.3.6.1.4.1.2606.7.4.1.2.1", ( "2", "3" ) ] - ] -} -

10 years, 5 months

Check_MK Git: check_mk: minor changes to io behaviour

by Götz Golla

Module: check_mk Branch: master Commit: 58d283b1fc236fa6f43cf96178c4cd8920f59610 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58d283b1fc236f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 15 10:27:57 2014 +0100 minor changes to io behaviour --- checks/cmciii | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/checks/cmciii b/checks/cmciii index 18f163b..40e33c1 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -70,7 +70,7 @@ # .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.14 10 s # .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.15 Closed # .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.16 0 -# .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.17 Override function +# .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.17 Input_1 # .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.18 1 # .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.19 0:Off / 1:On # .1.3.6.1.4.1.2606.7.4.2.2.1.10.1.20 0.5 s @@ -104,7 +104,7 @@ # .1.3.6.1.4.1.2606.7.4.1.2.1.3.9 Right Door # .1.3.6.1.4.1.2606.7.4.1.2.1.3.10 Side Exit # .1.3.6.1.4.1.2606.7.4.1.2.1.3.11 Emergency Exit -# +# # Example for info: # [['1.1', 'Temperature.DescName', 'Temperature'], @@ -145,7 +145,7 @@ # 'Value': '0'}, # ('1', 'Input 1'): {'Category': '0', # 'Delay': '0.5 s', -# 'DescName': 'Override function', +# 'DescName': 'Input_1', # 'Logic': '0:Off / 1:On', # 'Status': 'On', # 'Value': '1'}, @@ -347,22 +347,28 @@ def check_cmciii_io(item, params, info): grouping = entry.get('Grouping') if relay: # output relay - if status == "Off": + if status == "OK": state = 0 sym = "" else: - state = 1 - sym = "(!)" + state = 2 + sym = "(!!)" infotext = "%s: %s%s, Relay %s, Grouping %s, Logic %s" % \ ( descr, status, sym, relay, grouping, logic) else: # input relay - if value == "0": + if status == "OK": state = 0 sym = "" - else: + elif status == "Off": + state = 0 + sym = "" + elif status == "On": state = 1 sym = "(!)" - infotext = "%s: %s, Value %s%s, Logic %s, Delay %s" % \ + else: + state = 2 + sym = "(!!)" + infotext = "%s: %s, Status %s%s, Logic %s, Delay %s" % \ ( descr, status, value, sym, logic, delay) return (state, infotext) @@ -640,4 +646,3 @@ check_info['cmciii.state'] = { "snmp_scan_function" : cmciii_scan, "snmp_info" : cmciii_snmp_info, } -#.

10 years, 5 months

Check_MK Git: check_mk: FIX apc_symmetra: transformation from old tuple to new dict format fixed and improved

by Götz Golla

Module: check_mk Branch: master Commit: 526f77440fcce9f720217683c00b17cacc1ab006 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=526f77440fcce9… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 15 09:53:06 2014 +0100 FIX apc_symmetra: transformation from old tuple to new dict format fixed and improved --- .werks/567 | 9 ++ ChangeLog | 3 +- checks/apc_symmetra | 47 +++++----- web/plugins/wato/check_parameters.py | 160 ++++++++++++++++++---------------- 4 files changed, 120 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=526f77440f…

10 years, 5 months

Check_MK Git: check_mk: Draft for rule based notifications updated

by Mathias Kettner

Module: check_mk Branch: master Commit: d63c167af1d2fb9561ce34c1a9fa246a6d037962 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d63c167af1d2fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 15 09:44:27 2014 +0100 Draft for rule based notifications updated --- doc/drafts/README.rule_based_notifications | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/drafts/README.rule_based_notifications b/doc/drafts/README.rule_based_notifications index 1c16b99..dbbcc57 100644 --- a/doc/drafts/README.rule_based_notifications +++ b/doc/drafts/README.rule_based_notifications @@ -43,9 +43,9 @@ The condition can be formed of: * the event type (up, down, ok, crit, etc.) * a host specification like in WATO rules (using host tags, etc.) * a service specification using regular expressions (like in WATO rules) +* The original state or the complete state transition (e.g. CRIT -> WARN vs. OK -> WARN) Further conditions that we can think of are: -* The original state or the complete state transition (e.g. CRIT -> WARN vs. OK -> WARN) * the type of the check plugin, e.g. only checks of type "if" or "if64" * whether the host or service is contained in a certain host/service group * whether it's contained in a certain contact group

10 years, 5 months

Check_MK Git: check_mk: FIX LDAP: Fixed group syncrhonisation when nested group sync is enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f9b54c2c5273314de1d16e46299d3be561788ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9b54c2c52733… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 15 08:49:56 2014 +0100 FIX LDAP: Fixed group syncrhonisation when nested group sync is enabled --- .werks/431 | 9 +++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/431 b/.werks/431 new file mode 100644 index 0000000..8a8db8e --- /dev/null +++ b/.werks/431 @@ -0,0 +1,9 @@ +Title: LDAP: Fixed group syncrhonisation when nested group sync is enabled +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389772171 + + diff --git a/ChangeLog b/ChangeLog index 008478e..719b639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 0424 FIX: Improved error handling in case of incorrect auth config in distributed WATO environments * 0425 FIX: Fix login loop bug in distributed environments with different auth secrets * 0117 FIX: Availability button is now visible for users without the right to edit views + * 0431 FIX: LDAP: Fixed group syncrhonisation when nested group sync is enabled WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 27a6a64..3ba05d5 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -622,7 +622,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): 'cn' : cn, } for user_dn, obj in ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), filt, columns = ['dn']): - groups[dn]['members'].append(user_dn.lower) + groups[dn]['members'].append(user_dn.lower()) g_ldap_group_cache[cache_key] = groups return groups

10 years, 5 months

Check_MK Git: check_mk: FIX wato snapshots: snapshot restore no longer fails with older python versions

by Andreas Boesl

Module: check_mk Branch: master Commit: ff98ddeab25831ba4d752105e16e99b724cd1cd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff98ddeab25831… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 16:58:39 2014 +0100 FIX wato snapshots: snapshot restore no longer fails with older python versions Python versions <= 2.6.6 had problems on restoring snapshots files.<br> The python tarfile module crashed when it tried to unpack tarfiles with no content.<br> The new implementation now uses the tar from the command line instead of the python tarfile module. --- .werks/256 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/multitar.py | 32 +++++++++++++++++--------------- web/plugins/wato/backup_domains.py | 2 ++ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.werks/256 b/.werks/256 new file mode 100644 index 0000000..ae07b2b --- /dev/null +++ b/.werks/256 @@ -0,0 +1,11 @@ +Title: wato snapshots: snapshot restore no longer fails with older python versions +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389714765 + +Python versions <= 2.6.6 had problems on restoring snapshots files.<br> +The python tarfile module crashed when it tried to unpack tarfiles with no content.<br> +The new implementation now uses the tar from the command line instead of the python tarfile module. diff --git a/ChangeLog b/ChangeLog index 35e92bd..008478e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -174,6 +174,7 @@ * 0422 FIX: Fixed numbers shown in log entries of bulk inventory... * 0252 FIX: ESX vSphere configuration: Fixed non-working configuration parameters... * 0456 FIX: Column was too short... + * 0256 FIX: wato snapshots: snapshot restore no longer fails with older python versions... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index e818524..45a991e 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -98,10 +98,12 @@ def get_file_content(tarfilename, filename): return tar.extractfile(filename).read() def extract_domains(tar, domains): + import subprocess tar_domains = {} for member in tar.getmembers(): try: - tar_domains[member.name[:-7]] = member + if member.name.endswith(".tar.gz"): + tar_domains[member.name[:-7]] = member except Exception, e: pass @@ -133,21 +135,27 @@ def extract_domains(tar, domains): # The complete tar file never fits in stringIO buffer.. tar.extract(tar_member, restore_dir) - subtar = tarfile.open("%s/%s" % (restore_dir, tar_member.name)) - # Set group id of extracted files, except base paths.. - for entry in subtar.getmembers(): - full_path = prefix + "/" + entry.name + # Older versions of python tarfile handle empty subtar archives :( + # This won't work: subtar = tarfile.open("%s/%s" % (restore_dir, tar_member.name)) + p = subprocess.Popen("tar tzf %s/%s" % (restore_dir, tar_member.name), shell = True, stdout = subprocess.PIPE) + stdout, stderr = p.communicate() + for line in stdout: + full_path = prefix + "/" + line path_tokens = full_path.split("/") check_exists_or_writable(path_tokens) # Cleanup os.unlink("%s/%s" % (restore_dir, tar_member.name)) - return len(errors) == 0, errors + return errors def cleanup_domain(domain): + # Some domains, e.g. authorization, do not get a cleanup + if domain.get("cleanup") == False: + return + def path_valid(prefix, path): if path.startswith("/") or path.startswith(".."): return False @@ -170,21 +178,15 @@ def extract_domains(tar, domains): return # The complete tar.gz file never fits in stringIO buffer.. tar.extract(tar_member, restore_dir) - subtar = tarfile.open("%s/%s" % (restore_dir, tar_member.name)) - subtar.extractall(target_dir) - - # Set group id of extracted files, except base paths.. - base_paths = [path[1] for path in domain.get("paths") if path[0] == "dir"] - for entry in subtar.getmembers(): - if entry.name not in base_paths: - os.chown("%s/%s" % (target_dir, entry.name), -1, gid) + p = subprocess.Popen("tar xzf %s/%s -C %s" % (restore_dir, tar_member.name, target_dir), shell = True) + p.communicate() # Check write permissions for target directories and files errors = [] for name, tar_member in tar_domains.items(): if name in domains: - result, dom_errors = check_domain_permissions(domains[name], tar_member) + dom_errors = check_domain_permissions(domains[name], tar_member) errors.extend(dom_errors) if len(errors): errors = list(set(errors)) diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index 771e60e..19b103d 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -30,6 +30,7 @@ if not defaults.omd_root: ("file", "auth.secret"), ("file", "auth.serials") ], + "cleanup" : False, "default" : True }}) else: @@ -61,6 +62,7 @@ else: ("file", "auth.secret"), ("file", "auth.serials") ], + "cleanup" : False, "default" : True }, "personalsettings": {

10 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014