Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: #2368 FIX ucd_cpu_load: fix exception in case of dump SNMP agent sending 12, 540000 instead of 12.540000

by Mathias Kettner

Module: check_mk Branch: master Commit: 70f43486c82d4b5fe940c27b6b1f59558b8dbcb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70f43486c82d4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 29 16:35:30 2015 +0200 #2368 FIX ucd_cpu_load: fix exception in case of dump SNMP agent sending 12,540000 instead of 12.540000 --- .werks/2368 | 10 ++++++++++ ChangeLog | 1 + checks/ucd_cpu_load | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2368 b/.werks/2368 new file mode 100644 index 0000000..e3135ce --- /dev/null +++ b/.werks/2368 @@ -0,0 +1,10 @@ +Title: ucd_cpu_load: fix exception in case of dump SNMP agent sending 12,540000 instead of 12.540000 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435588503 + + diff --git a/ChangeLog b/ChangeLog index 075c1f6..b53fbe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 2366 FIX: carel_sensors: fix crash in case of missing temperature sensor * 2382 FIX: mssql_backup: Formating age output more human friendly * 2383 FIX: FreeBSD Agent: Fixed handling <<<ps>>> section when jailed + * 2368 FIX: ucd_cpu_load: fix exception in case of dump SNMP agent sending 12,540000 instead of 12.540000 Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/checks/ucd_cpu_load b/checks/ucd_cpu_load index 17d52c5..51b7f14 100644 --- a/checks/ucd_cpu_load +++ b/checks/ucd_cpu_load @@ -32,7 +32,8 @@ def inventory_ucd_cpu_load(info): return [(None, "cpuload_default_levels")] def check_ucd_cpu_load(item, params, info): - return check_cpu_load_generic(params, [ float(l[0]) for l in info ]) + # Note: Some dump devices send 12,540000 instead of 12.540000 + return check_cpu_load_generic(params, [ float(l[0].replace(",", ".")) for l in info ]) # We are not sure how to safely detect the UCD SNMP Daemon. We know that

8 years, 12 months

Check_MK Git: check_mk: #2383 FIX FreeBSD Agent: Fixed handling <<<ps>>> section when jailed

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e4f9e4393781c2c60eb1cd5b39bd1f5c4c6be63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e4f9e4393781c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 29 16:00:04 2015 +0200 #2383 FIX FreeBSD Agent: Fixed handling <<<ps>>> section when jailed --- .werks/2383 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2383 b/.werks/2383 new file mode 100644 index 0000000..4413ff7 --- /dev/null +++ b/.werks/2383 @@ -0,0 +1,10 @@ +Title: FreeBSD Agent: Fixed handling <<<ps>>> section when jailed +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435585221 + + diff --git a/ChangeLog b/ChangeLog index f35a39c..075c1f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 2381 FIX: emc_datadomain_fans: Made check more robust against broken SNMP output * 2366 FIX: carel_sensors: fix crash in case of missing temperature sensor * 2382 FIX: mssql_backup: Formating age output more human friendly + * 2383 FIX: FreeBSD Agent: Fixed handling <<<ps>>> section when jailed Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 1e95e91..24f90b8 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -167,8 +167,8 @@ mount -p -t ufs # processes including username, without kernel processes echo '<<<ps>>>' COLUMNS=10000 -if [ is_jailed = 0 ]; then - ps ax -o state,user,vsz,rss,pcpu,command | sed -e 1d -e '/$[^ ]*J$ */d' -e 's/*$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\2,\3,\4,\5) /' +if [ "$is_jailed" = "0" ]; then + ps ax -o state,user,vsz,rss,pcpu,command | sed -e 1d -e '/$[^ ]*J$ */d' -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\2,\3,\4,\5) /' else ps ax -o user,vsz,rss,pcpu,command | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' fi

8 years, 12 months

Check_MK Git: check_mk: #2317: agent_ruckus_spot: new special agent for querying access point statistics via web interface

by Andreas Boesl

Module: check_mk Branch: master Commit: 453b3fd1208a749dc51d72935f9a326cbdf13b88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453b3fd1208a74… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 29 15:31:29 2015 +0200 #2317: agent_ruckus_spot: new special agent for querying access point statistics via web interface --- .werks/2317 | 21 ++++++++ ChangeLog | 1 + agents/special/agent_ruckus_spot | 89 +++++++++++++++++++++++++++++++ checkman/ruckus_spot_ap | 17 ++++++ checks/agent_ruckus_spot | 39 ++++++++++++++ checks/ruckus_spot_ap | 86 +++++++++++++++++++++++++++++ modules/catalog.py | 1 + web/plugins/metrics/check_mk.py | 46 +++++++++++++++- web/plugins/wato/check_parameters.py | 61 +++++++++++++++++++++ web/plugins/wato/datasource_programs.py | 44 +++++++++++++++ 10 files changed, 404 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=453b3fd120…

8 years, 12 months

Check_MK Git: check_mk: Check_MK handles whole data provided by agent as unicode internally now

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d9c57153e3fabecbacd0a7c8aa0df250542e0a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d9c57153e3fab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 29 15:31:15 2015 +0200 Check_MK handles whole data provided by agent as unicode internally now --- inventory/win_bios | 1 - inventory/win_cpuinfo | 1 - inventory/win_disks | 1 - inventory/win_exefiles | 1 - inventory/win_os | 1 - inventory/win_reg_uninstall | 1 - inventory/win_system | 1 - inventory/win_video | 1 - inventory/win_wmi_software | 1 - modules/check_mk_base.py | 17 ++++------------- modules/config.py | 1 + 11 files changed, 5 insertions(+), 22 deletions(-) diff --git a/inventory/win_bios b/inventory/win_bios index f5a6ef2..1c66d6e 100644 --- a/inventory/win_bios +++ b/inventory/win_bios @@ -74,6 +74,5 @@ def inv_win_bios(info): inv_info['win_bios'] = { "inv_function" : inv_win_bios, - "unicode" : True, } diff --git a/inventory/win_cpuinfo b/inventory/win_cpuinfo index d37cb21..7a614cf 100644 --- a/inventory/win_cpuinfo +++ b/inventory/win_cpuinfo @@ -124,6 +124,5 @@ def inv_win_cpuinfo(info): inv_info['win_cpuinfo'] = { "inv_function" : inv_win_cpuinfo, - "unicode" : True, } diff --git a/inventory/win_disks b/inventory/win_disks index a1e3ed4..4a532d6 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -91,5 +91,4 @@ def inv_win_disks(info): inv_info['win_disks'] = { "inv_function" : inv_win_disks, - "unicode" : True, } diff --git a/inventory/win_exefiles b/inventory/win_exefiles index 4332504..227b644 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -68,5 +68,4 @@ def inv_win_exefiles(info): inv_info['win_exefiles'] = { "inv_function" : inv_win_exefiles, - "unicode" : True, } diff --git a/inventory/win_os b/inventory/win_os index b720912..91bfc49 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -54,5 +54,4 @@ def inv_win_os(info): inv_info['win_os'] = { "inv_function" : inv_win_os, - "unicode" : True, } diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index 63c3581..7aeb972 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -56,5 +56,4 @@ def inv_win_reg_uninstall(info): inv_info['win_reg_uninstall'] = { "inv_function" : inv_win_reg_uninstall, - "unicode" : True, } diff --git a/inventory/win_system b/inventory/win_system index ddf68d6..5b12e0c 100644 --- a/inventory/win_system +++ b/inventory/win_system @@ -54,5 +54,4 @@ def inv_win_system(info): inv_info['win_system'] = { "inv_function" : inv_win_system, - "unicode" : True, } diff --git a/inventory/win_video b/inventory/win_video index 412fed1..d09a7b4 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -56,5 +56,4 @@ def inv_win_video(info): inv_info['win_video'] = { "inv_function" : inv_win_video, - "unicode" : True, } diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index bbec16a..66382b5 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -55,5 +55,4 @@ def inv_win_wmi_software(info): inv_info['win_wmi_software'] = { "inv_function" : inv_win_wmi_software, - "unicode" : True, } diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3ec21cf..eb0dff6 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -915,29 +915,20 @@ def parse_info(lines, hostname): # The section data might have a different encoding encoding = section_options.get("encoding") - # Make the contents of the section unicode strings or UTF-8 - # encoded bytestrings (like it was done always in the past) - try: - to_unicode = inv_info.get(section_name, {}).get('unicode', False) - except NameError: - pass # e.g. in precompiled mode we have no inv_info. That's ok. - elif stripped_line != '': if "nostrip" not in section_options: line = stripped_line if encoding: try: - decoded_line = line.decode(encoding) - if not to_unicode: - line = decoded_line.encode('utf-8') + line = line.decode(encoding) except: - pass - elif to_unicode: + line = line.decode(fallback_agent_output_encoding) + else: try: line = line.decode('utf-8') except: - line = line.decode('latin1') + line = line.decode(fallback_agent_output_encoding) section.append(line.split(separator)) diff --git a/modules/config.py b/modules/config.py index 443e6ee..20dfb9e 100644 --- a/modules/config.py +++ b/modules/config.py @@ -50,6 +50,7 @@ check_mk_perfdata_with_times = True debug_log = False # deprecated monitoring_host = None # deprecated max_num_processes = 50 +fallback_agent_output_encoding = 'latin1' # SNMP communities and encoding has_inline_snmp = False # is set to True by inline_snmp module, when available

8 years, 12 months

Check_MK Git: check_mk: #2367 FIX win_system: Fixed exception when non-UTF-8 sequences are contained agent output

by Mathias Kettner

Module: check_mk Branch: master Commit: 80a195a4935c8a519dac2df67a2a61044ef2d00d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80a195a4935c8a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 29 15:18:50 2015 +0200 #2367 FIX win_system: Fixed exception when non-UTF-8 sequences are contained agent output --- .werks/2367 | 10 ++++++++++ ChangeLog | 3 +++ modules/check_mk_base.py | 5 ++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/2367 b/.werks/2367 new file mode 100644 index 0000000..2df0518 --- /dev/null +++ b/.werks/2367 @@ -0,0 +1,10 @@ +Title: win_system: Fixed exception when non-UTF-8 sequences are contained agent output +Level: 2 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435583756 + + diff --git a/ChangeLog b/ChangeLog index 513ef39..8c23f21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,9 @@ * 2348 FIX: HTML-Mails: Added missing link to service descriptions * 2349 FIX: HTML-Mails: Fixed state colors in Outlook + HW/SW-Inventory: + * 2367 FIX: win_system: Fixed exception when non-UTF-8 sequences are contained agent output + 1.2.7i2: Core & Setup: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5b1a339..3ec21cf 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -934,7 +934,10 @@ def parse_info(lines, hostname): except: pass elif to_unicode: - line = line.decode('utf-8') + try: + line = line.decode('utf-8') + except: + line = line.decode('latin1') section.append(line.split(separator))

8 years, 12 months

Check_MK Git: check_mk: #2382 FIX mssql_backup: Formating age output more human friendly

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e9953bca7e6b8cd7f8b557d8917fdbc9313a5c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e9953bca7e6b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 29 15:13:55 2015 +0200 #2382 FIX mssql_backup: Formating age output more human friendly --- .werks/2382 | 10 ++++++++++ ChangeLog | 1 + checks/mssql_backup | 18 +++++++----------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.werks/2382 b/.werks/2382 new file mode 100644 index 0000000..8bf6680 --- /dev/null +++ b/.werks/2382 @@ -0,0 +1,10 @@ +Title: mssql_backup: Formating age output more human friendly +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435583553 + + diff --git a/ChangeLog b/ChangeLog index 2d319c9..513ef39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 2363 FIX: jolokia_metrics.uptime: Do not inventory instances where Uptime is missing - avoid crashed check * 2381 FIX: emc_datadomain_fans: Made check more robust against broken SNMP output * 2366 FIX: carel_sensors: fix crash in case of missing temperature sensor + * 2382 FIX: mssql_backup: Formating age output more human friendly Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/checks/mssql_backup b/checks/mssql_backup index 5de613c..615c25a 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -24,10 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -# TODO: Remove this. Use time.strptime and time.strftime!! -import datetime - # <<<mssql_backup>>> # MSSQL_SQLEXPRESS test123 1331207325 @@ -50,14 +46,13 @@ def check_mssql_backup(item, params, info): if item == inst + ' ' + tablespace: if last_backup_date: - dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[:6]) + timestamp = time.mktime(time.strptime(last_backup_date + ' ' + last_backup_time, + '%Y-%m-%d %H:%M:%S')) else: - dt = datetime.datetime.fromtimestamp(saveint(last_backup_timestamp)) + timestamp = int(last_backup_timestamp) state = 0 - # Would be so nice to use delta.total_seconds(). But we must care about python < 2.7 - delta = datetime.datetime.now() - dt - sec_ago = (delta.microseconds + (delta.seconds + delta.days * 24 * 3600) * 10**6) / 10**6 + sec_ago = time.time() - timestamp if params is not None: if sec_ago >= params[1]: @@ -68,8 +63,9 @@ def check_mssql_backup(item, params, info): else: perfdata = [('seconds', sec_ago)] - return (state, 'Last backup was at %s (%ds ago)' % - (dt.strftime('%Y-%m-%d %H:%M:%S'), sec_ago), perfdata) + return (state, 'Last backup was at %s (%s ago)' % + (time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(timestamp)), + get_age_human_readable(sec_ago)), perfdata) return (3, 'Tablespace %s could not be found' % item)

8 years, 12 months

Check_MK Git: check_mk: carel_uniflair_cooling: check output more conform with standards

by Mathias Kettner

Module: check_mk Branch: master Commit: 594de2712599749262647f93c21413154aaa5133 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=594de271259974… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 29 15:02:45 2015 +0200 carel_uniflair_cooling: check output more conform with standards --- checks/carel_uniflair_cooling | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/carel_uniflair_cooling b/checks/carel_uniflair_cooling index c51c74d..b759f5b 100644 --- a/checks/carel_uniflair_cooling +++ b/checks/carel_uniflair_cooling @@ -50,9 +50,9 @@ def check_carel_uniflair_cooling(item, _no_params, info): humidity = float(humidity)/10 output = "" - output = output + ( "Global Status:%s" % (err_global_status and "(!!)Error, " or "OK, " )) - output = output + ( "Emergency Operation:%s" % (err_emergency_op and "(!!)Active, " or "Inactive, ")) - output = output + ( "Humidifier:%s" % (err_waterloss and "(!!)Water Loss, " or "No Water Loss, " )) + output = output + ( "Global Status: %s" % (err_global_status and "Error(!!), " or "OK, " )) + output = output + ( "Emergency Operation: %s" % (err_emergency_op and "Active(!!), " or "Inactive, ")) + output = output + ( "Humidifier: %s" % (err_waterloss and "Water Loss(!!), " or "No Water Loss, " )) output = output + "Humidity: %3.1f%%" % humidity

8 years, 12 months

Check_MK Git: check_mk: #2366 FIX carel_sensors: fix crash in case of missing temperature sensor

by Mathias Kettner

Module: check_mk Branch: master Commit: 900a2356649316814c4b9616485c98372c692922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=900a2356649316… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 29 14:58:51 2015 +0200 #2366 FIX carel_sensors: fix crash in case of missing temperature sensor --- .werks/2366 | 10 ++++++++++ ChangeLog | 1 + checks/carel_sensors | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2366 b/.werks/2366 new file mode 100644 index 0000000..7b12021 --- /dev/null +++ b/.werks/2366 @@ -0,0 +1,10 @@ +Title: carel_sensors: fix crash in case of missing temperature sensor +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435582715 + + diff --git a/ChangeLog b/ChangeLog index b9ac12f..2d319c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 2362 FIX: mk_logwatch: fix cases where one logfile is listsed more than once in logwatch.cfg... * 2363 FIX: jolokia_metrics.uptime: Do not inventory instances where Uptime is missing - avoid crashed check * 2381 FIX: emc_datadomain_fans: Made check more robust against broken SNMP output + * 2366 FIX: carel_sensors: fix crash in case of missing temperature sensor Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/checks/carel_sensors b/checks/carel_sensors index 0dbf10e..252cbb7 100644 --- a/checks/carel_sensors +++ b/checks/carel_sensors @@ -87,7 +87,9 @@ def inventory_carel_sensors_temp(parsed): def check_carel_sensors_temp(item, params, parsed): - return check_temperature(parsed["temp"][item], params) + if item in parsed["temp"]: + return check_temperature(parsed["temp"][item], params) + check_info["carel_sensors"] = { "parse_function" : carel_sensors_parse,

8 years, 12 months

Check_MK Git: check_mk: #2381 FIX emc_datadomain_fans: Made check more robust against broken SNMP output

by Lars Michelsen

Module: check_mk Branch: master Commit: d0f808d19b179468d640ffd7c569e237cd6f5e5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0f808d19b1794… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 29 14:52:31 2015 +0200 #2381 FIX emc_datadomain_fans: Made check more robust against broken SNMP output --- .werks/2381 | 10 ++++++++++ ChangeLog | 1 + checks/emc_datadomain_fans | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2381 b/.werks/2381 new file mode 100644 index 0000000..afaa018 --- /dev/null +++ b/.werks/2381 @@ -0,0 +1,10 @@ +Title: emc_datadomain_fans: Made check more robust against broken SNMP output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435582335 + + diff --git a/ChangeLog b/ChangeLog index 654e4fb..b9ac12f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 2378 FIX: if: Now fixing encoding in interface descriptions according to rule... * 2362 FIX: mk_logwatch: fix cases where one logfile is listsed more than once in logwatch.cfg... * 2363 FIX: jolokia_metrics.uptime: Do not inventory instances where Uptime is missing - avoid crashed check + * 2381 FIX: emc_datadomain_fans: Made check more robust against broken SNMP output Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/checks/emc_datadomain_fans b/checks/emc_datadomain_fans index cee9ca5..e5aeaab 100644 --- a/checks/emc_datadomain_fans +++ b/checks/emc_datadomain_fans @@ -42,7 +42,7 @@ def check_emc_datadomain_fans(item, _no_params, info): "3": "High" } for line in info: - if item == line[0]+"-"+line[1]: + if item == "%s-%s" % (line[0], line[1]): dev_descr = line[2] dev_level = line[3] dev_state = line[4]

8 years, 12 months

Check_MK Git: check_mk: #2380 FIX Custom Host Notes painter was showing service notes when used in service based views

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d8db5efe355e7677c799172b6d853c564a3e155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d8db5efe355e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 29 14:47:59 2015 +0200 #2380 FIX Custom Host Notes painter was showing service notes when used in service based views --- .werks/2380 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/2380 b/.werks/2380 new file mode 100644 index 0000000..9aa2bfa --- /dev/null +++ b/.werks/2380 @@ -0,0 +1,10 @@ +Title: Custom Host Notes painter was showing service notes when used in service based views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435582050 + + diff --git a/ChangeLog b/ChangeLog index c8860ee..654e4fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 2314 FIX: Availability: fixed exception when grouping by host or service group * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... + * 2380 FIX: Custom Host Notes painter was showing service notes when used in service based views WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 8f0b8f8..1c93061 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -984,10 +984,10 @@ def notes_matching_pattern_entries(dirs, item): matching.append(dir + "/" + pattern) return matching -def paint_custom_notes(row): +def paint_custom_notes(what, row): host = row["host_name"] svc = row.get("service_description") - if svc: + if what == "service": notes_dir = defaults.default_config_dir + "/notes/services" dirs = notes_matching_pattern_entries([notes_dir], host) item = svc @@ -1022,7 +1022,7 @@ multisite_painters["svc_custom_notes"] = { "title" : _("Custom services notes"), "short" : _("Notes"), "columns" : [ "host_name", "host_address", "service_description", "service_plugin_output" ], - "paint" : paint_custom_notes, + "paint" : lambda row: paint_custom_notes("service", row), } multisite_painters["svc_staleness"] = { @@ -1490,7 +1490,7 @@ multisite_painters["host_custom_notes"] = { "title" : _("Custom host notes"), "short" : _("Notes"), "columns" : [ "host_name", "host_address", "host_plugin_output" ], - "paint" : paint_custom_notes, + "paint" : lambda row: paint_custom_notes("hosts", row), } multisite_painters["host_comments"] = {

8 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015