Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

#2952 FIX netextreme_psu_out: Fixed crash in case of phase can not be found anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c5052a886795ca2ce7a890c88e7ac7ade494d4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5052a886795c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 14:40:04 2016 +0100 #2952 FIX netextreme_psu_out: Fixed crash in case of phase can not be found anymore --- .werks/2952 | 9 +++++++++ ChangeLog | 1 + checks/elphase.include | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.werks/2952 b/.werks/2952 new file mode 100644 index 0000000..8e58068 --- /dev/null +++ b/.werks/2952 @@ -0,0 +1,9 @@ +Title: netextreme_psu_out: Fixed crash in case of phase can not be found anymore +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453729176 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fa27960..f534056 100644 --- a/ChangeLog +++ b/ChangeLog @@ -209,6 +209,7 @@ * 2949 FIX: oracle_logswitches oracle_sessions oracle_version: Improved handling of legacy oracle plugin error cases * 2950 FIX: citrix_controller.sessions: Fixed crash in case active/inactive infos are missing * 2951 FIX: ibm_svc_disks: Fixed exception with disks having a TB capacity + * 2952 FIX: netextreme_psu_out: Fixed crash in case of phase can not be found anymore Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/elphase.include b/checks/elphase.include index c3307de..9a309fc 100644 --- a/checks/elphase.include +++ b/checks/elphase.include @@ -37,6 +37,9 @@ def inventory_elphase(parsed): # } # } def check_elphase(item, params, parsed): + if item not in parsed: + return # Item not found in SNMP data + def tostring(value): if type(value) == int: return "%d" % value

8 years, 7 months

#2953 FIX netextreme_psu_in: Fixed discovery of Power Supply Input checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 12f48d17d3223c2c7dd27d41e223beb79b32d30f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12f48d17d3223c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 14:44:26 2016 +0100 #2953 FIX netextreme_psu_in: Fixed discovery of Power Supply Input checks --- .werks/2953 | 9 +++++++++ ChangeLog | 1 + checks/netextreme_psu_in | 10 ++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/2953 b/.werks/2953 new file mode 100644 index 0000000..240b70b --- /dev/null +++ b/.werks/2953 @@ -0,0 +1,9 @@ +Title: netextreme_psu_in: Fixed discovery of Power Supply Input checks +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453729445 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f534056..56f02ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -210,6 +210,7 @@ * 2950 FIX: citrix_controller.sessions: Fixed crash in case active/inactive infos are missing * 2951 FIX: ibm_svc_disks: Fixed exception with disks having a TB capacity * 2952 FIX: netextreme_psu_out: Fixed crash in case of phase can not be found anymore + * 2953 FIX: netextreme_psu_in: Fixed discovery of Power Supply Input checks Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/netextreme_psu_in b/checks/netextreme_psu_in index f69df7f..7cda63a 100644 --- a/checks/netextreme_psu_in +++ b/checks/netextreme_psu_in @@ -36,10 +36,12 @@ factory_settings["netextreme_psu_in_default_levels"] = { def parse_netextreme_psu_in(info): parsed = {} - for psu_index, psu_voltage_str, psu_usage_str, psu_factor_str in info: - parsed["Input %s" % psu_index] = { - "power" : float(psu_usage_str) * pow(10, int(psu_factor_str)), - } + for psu_index, psu_usage_str, psu_factor_str in info: + power = float(psu_usage_str) * pow(10, int(psu_factor_str)) + if power > 0: + parsed["Input %s" % psu_index] = { + "power" : power, + } return parsed

8 years, 7 months

#2949 FIX oracle_logswitches oracle_sessions oracle_version:

by Lars Michelsen

Improved handling of legacy oracle plugin error cases Message-ID: <56a6244d.wr4ZPoqZkoGLa7C0%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9b8238a46f2fc676bf00a13c864fa7ae5d367f7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b8238a46f2fc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 13:20:33 2016 +0100 #2949 FIX oracle_logswitches oracle_sessions oracle_version: Improved handling of legacy oracle plugin error cases --- .werks/2949 | 9 +++++++++ ChangeLog | 1 + checks/oracle.include | 21 +++++++++++++++++++++ checks/oracle_locks | 13 ++++++------- checks/oracle_logswitches | 6 ++++++ checks/oracle_sessions | 6 ++++++ checks/oracle_version | 1 + 7 files changed, 50 insertions(+), 7 deletions(-) diff --git a/.werks/2949 b/.werks/2949 new file mode 100644 index 0000000..6bf3486 --- /dev/null +++ b/.werks/2949 @@ -0,0 +1,9 @@ +Title: oracle_logswitches oracle_sessions oracle_version: Improved handling of legacy oracle plugin error cases +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453724413 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 284621a..0cae142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -206,6 +206,7 @@ * 2911 FIX: mysql.innodb_io: Fixed crash in case averaging is set to 0 minutes * 2912 FIX: mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]"... * 2948 FIX: oracle_tablespaces: Fixed exception when section contained empty line + * 2949 FIX: oracle_logswitches oracle_sessions oracle_version: Improved handling of legacy oracle plugin error cases Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/oracle.include b/checks/oracle.include index 94a1ca9..8bb8a0c 100644 --- a/checks/oracle.include +++ b/checks/oracle.include @@ -40,6 +40,10 @@ def oracle_handle_ora_errors(line): if len(line) == 1: return + legacy_error = oracle_handle_legacy_ora_errors(line) + if legacy_error: + return legacy_error + # Handle error output from new agent if line[1] == 'FAILURE': if len(line) >= 3 and line[2].startswith("ORA-"): @@ -54,3 +58,20 @@ def oracle_handle_ora_errors(line): return (3, 'Found error in agent output "%s"' % ' '.join(line[1:])) +def oracle_handle_legacy_ora_errors(line): + # Skip over line before ORA- errors (e.g. sent by AIX agent from 2014) + if line == ["ERROR:"]: + return False + + if line[0].startswith('ORA-'): + return (3, 'Found error in agent output "%s"' % ' '.join(line)) + + +# Fully prevent creation of services when an error is found. +def oracle_handle_ora_errors_discovery(info): + for line in info: + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + raise MKGeneralException(err[1]) diff --git a/checks/oracle_locks b/checks/oracle_locks index 84ebafa..02a817a 100644 --- a/checks/oracle_locks +++ b/checks/oracle_locks @@ -44,14 +44,13 @@ def check_oracle_locks(item, params, info): for line in info: warn, crit = params["levels"] - # Skip over line before ORA- errors (e.g. sent by AIX agent from 2014) - if line == ["ERROR:"]: - continue - - if line[0].startswith('ORA-'): - return (3, 'Found error in agent output "%s"' % ' '.join(line)) - if line[0] == item and line[1] != '': + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err + sid, sidnr, serial, machine, program, process, osuser, ctime, \ object_owner, object_name = line diff --git a/checks/oracle_logswitches b/checks/oracle_logswitches index d17b564..012379c 100644 --- a/checks/oracle_logswitches +++ b/checks/oracle_logswitches @@ -31,11 +31,17 @@ oracle_logswitches_default_levels = (-1, -1, 50, 100) def inventory_oracle_logswitches(info): + oracle_handle_ora_errors_discovery(info) return [ (line[0], "oracle_logswitches_default_levels") for line in info if len(line) >= 2 ] def check_oracle_logswitches(item, params, info): for line in info: if line[0] == item: + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err locrit, lowarn, warn, crit = params logswitches = int(line[1]) diff --git a/checks/oracle_sessions b/checks/oracle_sessions index cef3a32..5393bfa 100644 --- a/checks/oracle_sessions +++ b/checks/oracle_sessions @@ -31,11 +31,17 @@ oracle_sessions_default_levels = (50, 100) def inventory_oracle_sessions(info): + oracle_handle_ora_errors_discovery(info) return [ (line[0], "oracle_sessions_default_levels") for line in info if len(line) >= 2 ] def check_oracle_sessions(item, params, info): for line in info: if line[0] == item: + err = oracle_handle_ora_errors(line) + if err == False: + continue + elif isinstance(err, tuple): + return err warn, crit = params sessions = int(line[1]) diff --git a/checks/oracle_version b/checks/oracle_version index dc00284..cb2af27 100644 --- a/checks/oracle_version +++ b/checks/oracle_version @@ -28,6 +28,7 @@ # XE Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production def inventory_oracle_version(info): + oracle_handle_ora_errors_discovery(info) return [ (line[0], None) for line in info if len(line) >= 2 ] def check_oracle_version(item, _no_params, info):

8 years, 7 months

#2950 FIX citrix_controller.sessions: Fixed crash in case active/ inactive infos are missing

by Lars Michelsen

Module: check_mk Branch: master Commit: 641be4232fe4e11c838abb32cc7fcce94675b019 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=641be4232fe4e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 13:41:42 2016 +0100 #2950 FIX citrix_controller.sessions: Fixed crash in case active/inactive infos are missing --- .werks/2950 | 9 +++++++++ ChangeLog | 1 + checks/citrix_controller | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2950 b/.werks/2950 new file mode 100644 index 0000000..18185c5 --- /dev/null +++ b/.werks/2950 @@ -0,0 +1,9 @@ +Title: citrix_controller.sessions: Fixed crash in case active/inactive infos are missing +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453725685 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0cae142..565e35c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -207,6 +207,7 @@ * 2912 FIX: mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]"... * 2948 FIX: oracle_tablespaces: Fixed exception when section contained empty line * 2949 FIX: oracle_logswitches oracle_sessions oracle_version: Improved handling of legacy oracle plugin error cases + * 2950 FIX: citrix_controller.sessions: Fixed crash in case active/inactive infos are missing Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/citrix_controller b/checks/citrix_controller index 9d79f6c..9f6ac01 100644 --- a/checks/citrix_controller +++ b/checks/citrix_controller @@ -129,7 +129,10 @@ def check_citrix_controller_sessions(_no_item, params, info): if params == None: params = {} - session = {} + session = { + "active" : 0, + "inactive" : 0, + } for line in info: if line[0] == "TotalFarmActiveSessions": session["active"] = int(line[1])

8 years, 7 months

#2948 FIX oracle_tablespaces: Fixed exception when section contained empty line

by Lars Michelsen

Module: check_mk Branch: master Commit: ef94a8d016dd041dda0e2f9dad437bda805bbcbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef94a8d016dd04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 11:42:18 2016 +0100 #2948 FIX oracle_tablespaces: Fixed exception when section contained empty line --- .werks/2948 | 9 +++++++++ ChangeLog | 1 + checks/oracle.include | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.werks/2948 b/.werks/2948 new file mode 100644 index 0000000..6ecdb20 --- /dev/null +++ b/.werks/2948 @@ -0,0 +1,9 @@ +Title: oracle_tablespaces: Fixed exception when section contained empty line +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453718509 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index bed378c..284621a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -205,6 +205,7 @@ * 2910 FIX: heartbeat_crm: Fixed crash in case of "number of resources" paramters have been configured * 2911 FIX: mysql.innodb_io: Fixed crash in case averaging is set to 0 minutes * 2912 FIX: mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]"... + * 2948 FIX: oracle_tablespaces: Fixed exception when section contained empty line Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/oracle.include b/checks/oracle.include index b63ca6f..94a1ca9 100644 --- a/checks/oracle.include +++ b/checks/oracle.include @@ -37,6 +37,9 @@ # This function returns a tuple when an ORA-* message has been found. # It returns False if this line should be skipped by the check. def oracle_handle_ora_errors(line): + if len(line) == 1: + return + # Handle error output from new agent if line[1] == 'FAILURE': if len(line) >= 3 and line[2].startswith("ORA-"):

8 years, 7 months

#2951 FIX ibm_svc_disks: Fixed exception with disks having a TB capacity

by Lars Michelsen

Module: check_mk Branch: master Commit: b0a5eda39ed7eacc1e3f99a12740b0435d735133 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0a5eda39ed7ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 14:33:15 2016 +0100 #2951 FIX ibm_svc_disks: Fixed exception with disks having a TB capacity --- .werks/2951 | 9 +++++++++ ChangeLog | 1 + checks/ibm_svc_disks | 13 +++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/2951 b/.werks/2951 new file mode 100644 index 0000000..09fc084 --- /dev/null +++ b/.werks/2951 @@ -0,0 +1,9 @@ +Title: ibm_svc_disks: Fixed exception with disks having a TB capacity +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453728736 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 565e35c..fa27960 100644 --- a/ChangeLog +++ b/ChangeLog @@ -208,6 +208,7 @@ * 2948 FIX: oracle_tablespaces: Fixed exception when section contained empty line * 2949 FIX: oracle_logswitches oracle_sessions oracle_version: Improved handling of legacy oracle plugin error cases * 2950 FIX: citrix_controller.sessions: Fixed crash in case active/inactive infos are missing + * 2951 FIX: ibm_svc_disks: Fixed exception with disks having a TB capacity Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ibm_svc_disks b/checks/ibm_svc_disks index 7fb028b..82dfb08 100644 --- a/checks/ibm_svc_disks +++ b/checks/ibm_svc_disks @@ -61,17 +61,26 @@ def check_ibm_svc_disks(_no_item, params, info): did, status, error_sequence_number, use, tech_type,\ capacity, mdisk_id, mdisk_name, member_id, enclosure_id,\ slot_id, node_id, node_name = line[:13] + disk = {} disk['identifier'] = "Enclosure: %s, Slot: %s, Type: %s" % ( enclosure_id, slot_id, tech_type ) + if capacity.endswith('GB'): disk['capacity'] = float(capacity[:-2]) * 1024 * 1024 * 1024 - # Failure State can be found here, - # also spare is a state here + elif capacity.endswith('TB'): + disk['capacity'] = float(capacity[:-2]) * 1024 * 1024 * 1024 * 1024 + elif capacity.endswith('PB'): + disk['capacity'] = float(capacity[:-2]) * 1024 * 1024 * 1024 * 1024 * 1024 + + # Failure State can be found here, also spare is a state here disk['state'] = use if status == "offline" and use != "failed": disk['state'] = "offline" + disk['type'] = "" # We dont have a type + disks.append(disk) + return check_filer_disks(disks, params) check_info["ibm_svc_disks"] = {

8 years, 7 months

updated werk 2922

by Sebastian Herbord

Module: check_mk Branch: master Commit: 820e30638e7fe8026dc6d7804ee7a3b8d3c79a45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=820e30638e7fe8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jan 25 14:11:25 2016 +0100 updated werk 2922 --- .werks/2922 | 7 +++---- ChangeLog | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.werks/2922 b/.werks/2922 index b33ded2..5c9aeaf 100644 --- a/.werks/2922 +++ b/.werks/2922 @@ -1,4 +1,4 @@ -Title: check_mk_agent.linux: mrpe sections can now be cached +Title: check_mk_agent.linux, check_mk_agent.solaris: mrpe sections can now be cached Level: 1 Component: checks Compatible: compat @@ -6,11 +6,10 @@ Version: 1.2.7i4 Date: 1453198668 Class: feature -In the mrpe configuration (for linux systems only!) an optional parameter list can now be specified -between service description and commandline in the following format: +In the mrpe configuration (for linux and solaris systems only!) an optional parameter list can now +be specified between service description and commandline in the following format: description (interval=300) /command/line The only supported parameter for now is interval. This activates caching fo the mrpe section and specifies the interval at which the cache should be refreshed. Existing mrpe configurations continue to work without change. -This works only with the linux agent. diff --git a/ChangeLog b/ChangeLog index d5a1ac7..bed378c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,7 +86,7 @@ * 2920 hr_cpu: this check can now also supports per-core features... * 1322 solaris_prtdiag_status: New Check for Solaris Hardware State based on prtdiag * 2921 printer_supply_ricoh: check now tries to handle negative readings properly... - * 2922 check_mk_agent.linux: mrpe sections can now be cached... + * 2922 check_mk_agent.linux, check_mk_agent.solaris: mrpe sections can now be cached... * 2933 openhardwaremonitor, check_mk_agent.windows: added agent support and check for monitoring hardware sensors through OpenHardwareMonitor... * 2829 filesystem checks: introduced default levels for inodes used (10%/5% free)... * 2934 all temperature checks rewritten to use the shared temperature api...

8 years, 7 months

mrpe sections run via runas can now also be cached, as can mrpe sections in the solaris agent

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2e8018483f53f605a0f47af073e849b92260128b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e8018483f53f6… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jan 25 14:05:15 2016 +0100 mrpe sections run via runas can now also be cached, as can mrpe sections in the solaris agent see werk #2922 --- agents/check_mk_agent.linux | 27 ++++++++++++++++++++++++++- agents/check_mk_agent.solaris | 28 +++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4c03094..26492ca 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -778,13 +778,38 @@ then grep -Ev '^[[:space:]]*($|#)' "$include" | \ while read descr cmdline do + interval= + if [[ $cmdline =~ $([^$]*)\)[[:space:]](.*) ]] + then + parameters=${BASH_REMATCH[1]} + cmdline=${BASH_REMATCH[2]} + + # split multiple parameter assignments + IFS=':' read -a parlist <<< $parameters + for par in "${parlist[@]}" + do + # split each assignment + IFS='=' read key value <<< $par + if [ "$key" = "interval" ] + then + interval=$value + # no other parameters supported currently + fi + done + fi + PLUGIN=${cmdline%% *} if [ -n "$PREFIX" ] ; then cmdline="$PREFIX\"$cmdline\"" fi - OUTPUT=$(eval "$cmdline") + if [ -z "$interval" ] + then + OUTPUT=$(eval "$cmdline") + else + OUTPUT=$(run_cached $descr $interval "$cmdline") + fi echo -n "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1 echo done diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 56d9c56..ca0b1d2 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -312,7 +312,33 @@ then grep -v '^ *#' "$MK_CONFDIR/mrpe.cfg" | grep -v '^ *$' | \ while read descr cmdline do - OUTPUT=$($cmdline) + interval= + if [[ $cmdline =~ $([^$]*)\)[[:space:]](.*) ]] + then + parameters=${BASH_REMATCH[1]} + cmdline=${BASH_REMATCH[2]} + + # split multiple parameter assignments + IFS=':' read -a parlist <<< $parameters + for par in "${parlist[@]}" + do + # split each assignment + IFS='=' read key value <<< $par + if [ "$key" = "interval" ] + then + interval=$value + # no other parameters supported currently + fi + done + fi + + if [ -z "$interval" ] + then + OUTPUT=$($cmdline) + else + OUTPUT=$(run_cached $descr $interval "$cmdline") + fi + echo "$descr $? $OUTPUT" done fi

8 years, 7 months

oracle_diva_csm: explained the unusual check layout

by Sebastian Herbord

Module: check_mk Branch: master Commit: 42555600572c86c74aa0bd03ecf338d61eba1524 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42555600572c86… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jan 25 14:00:02 2016 +0100 oracle_diva_csm: explained the unusual check layout --- checks/oracle_diva_csm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/checks/oracle_diva_csm b/checks/oracle_diva_csm index db65427..5ab5ccc 100644 --- a/checks/oracle_diva_csm +++ b/checks/oracle_diva_csm @@ -36,6 +36,15 @@ # .1.3.6.1.4.1.110901.1.4.5.0 total size on tapes +# +# Note: These checks was designed a bit atypically (for no good reason): +# The drive, actor, archive, tapes and library checks are subchecks of the status +# check although none of these checks share the same oids. +# As a result, "info" is always a list of 6 sublists and each check only +# acceses exactly one of the sublists. +# + + #. # .--Status--------------------------------------------------------------.

8 years, 7 months

#2937 mrpe: check now supports service descriptions using percent-encoded characters

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2cea91097cacfd8beaeacb011ec5444e255dc47f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cea91097cacfd… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jan 25 13:25:15 2016 +0100 #2937 mrpe: check now supports service descriptions using percent-encoded characters mrpe services can now contain any character using percent encoding. This is particularly useful to include spaces in the service description as that was previously impossible due to the way mrpe.cfg was parsed. This change is incompatible as any %xx sequence will now be converted whereas it was previously included in the service description as unchanged. --- .werks/2937 | 13 +++++++++++++ ChangeLog | 2 ++ checks/mrpe | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/2937 b/.werks/2937 new file mode 100644 index 0000000..278b61f --- /dev/null +++ b/.werks/2937 @@ -0,0 +1,13 @@ +Title: mrpe: check now supports service descriptions using percent-encoded characters +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1453724472 +Class: feature + +mrpe services can now contain any character using percent encoding. This is particularly useful to +include spaces in the service description as that was previously impossible due to the way mrpe.cfg +was parsed. +This change is incompatible as any %xx sequence will now be converted whereas it was previously +included in the service description as unchanged. diff --git a/ChangeLog b/ChangeLog index 44621a6..d5a1ac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,8 @@ * 1323 win_printers: Warning and Critical levels can now be set... * 1324 New Check for Dell Equallogic SAN Devices * 2892 qlogic_fcport: now supports QLogic FC Switch SANBox 5802 series + * 2937 mrpe: check now supports service descriptions using percent-encoded characters... + NOTE: Please refer to the migration notes! * 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/checks/mrpe b/checks/mrpe index c4ab43c..9872b81 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -33,6 +33,7 @@ def inventory_mrpe(info): item = line[1] else: item = line[0] + item = urllib.unquote(item) items.append((item, None)) return items @@ -56,7 +57,7 @@ def check_mrpe(item, params, info): line = line[1:] else: check_name = None - if line[0] == item: + if urllib.unquote(line[0]) == item: try: state = int(line[1]) except:

8 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016