Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3013 FIX Inventory: snmp inventory plugins never use cached data

by Andreas Boesl

Module: check_mk Branch: master Commit: db918828513c1ad04604d41ab352c905bc16e665 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db918828513c1a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 18 14:00:14 2016 +0100 3013 FIX Inventory: snmp inventory plugins never use cached data This fixes a bug where inventory data from snmp devices got cached indefinitely and was never updated. --- .werks/3013 | 11 +++++++++++ ChangeLog | 1 + modules/inventory.py | 9 ++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/3013 b/.werks/3013 new file mode 100644 index 0000000..8c3e2a1 --- /dev/null +++ b/.werks/3013 @@ -0,0 +1,11 @@ +Title: Inventory: snmp inventory plugins never use cached data +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458305923 + +This fixes a bug where inventory data from snmp devices +got cached indefinitely and was never updated. diff --git a/ChangeLog b/ChangeLog index 62986d3..c163cf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,7 @@ * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone * 3289 FIX: Fixed missing filters in HW-/SW-Inventory views after editing the view... + * 3013 FIX: Inventory: snmp inventory plugins never use cached data... 1.2.8b1: diff --git a/modules/inventory.py b/modules/inventory.py index 83d2711..f5dcf97 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -241,11 +241,14 @@ def do_inv_for(hostname): for info_type, plugin in inv_info.items(): # Skip SNMP sections that are not supported by this device - if check_uses_snmp(info_type) and info_type not in snmp_check_types: - continue + use_caches = True + if check_uses_snmp(info_type): + use_caches = False + if info_type not in snmp_check_types: + continue try: - info = get_info_for_discovery(hostname, ipaddress, info_type, use_caches=True) + info = get_info_for_discovery(hostname, ipaddress, info_type, use_caches=use_caches) except Exception, e: if str(e): raise # Otherwise simply ignore missing agent section

8 years, 7 months

New bug in WATO Agent Bakery

by Sven Rueß

Module: check_mk Branch: master Commit: 62fc6e47388c2308700f753ebb40681f96562791 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62fc6e47388c23… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 18 13:19:58 2016 +0100 New bug in WATO Agent Bakery --- .bugs/2491 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2491 b/.bugs/2491 new file mode 100644 index 0000000..c893897 --- /dev/null +++ b/.bugs/2491 @@ -0,0 +1,8 @@ +Title: Rules of Monitoring Agents are applied to GENERIC host +Component: wato +State: open +Date: 2016-03-18 13:15:47 +Targetversion: 1.2.8 +Class: bug + +All rules of the Agent Bakery are applied to the default host GENERIC. Although there are conditions like hostname or tags.

8 years, 7 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 916049b098c22c58546ba35d061b40572a97321e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=916049b098c22c… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 18 13:15:37 2016 +0100 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 951ba79..59780dc 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2491 +2492

8 years, 7 months

Updated bug entries #2481, #2482

by Mathias Kettner

Module: check_mk Branch: master Commit: 125ff8a0fd59b64ead2ce92a9b6948f717350145 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=125ff8a0fd59b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 18 11:34:00 2016 +0100 Updated bug entries #2481, #2482 --- .bugs/2481 | 9 +++++++++ .bugs/2482 | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/.bugs/2481 b/.bugs/2481 new file mode 100644 index 0000000..461e3b7 --- /dev/null +++ b/.bugs/2481 @@ -0,0 +1,9 @@ +Title: WATO CSV-Import: no error handling in case of empty/missing file +Component: wato +State: open +Date: 2016-03-18 11:32:29 +Targetversion: 1.2.8 +Class: bug + +it is possible to not select any file. Nevertheless you come to the next screen +which is obviously useless. diff --git a/.bugs/2482 b/.bugs/2482 new file mode 100644 index 0000000..a8d70b5 --- /dev/null +++ b/.bugs/2482 @@ -0,0 +1,9 @@ +Title: WATO CSV-Import: Header "None" in case of no header +Component: wato +State: open +Date: 2016-03-18 11:33:25 +Targetversion: 1.2.8 +Class: nastiness + +If no header line has been selected, then the header should not be displayed at all, +instead of "None".

8 years, 7 months

Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 659e844a6ef1429a3db8f6a95bdcc9df6317ca82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=659e844a6ef142… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 18 11:32:22 2016 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index c753441..951ba79 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2481 +2491

8 years, 7 months

New bug in multisite

by Sven Rueß

Module: check_mk Branch: master Commit: 6249a5475d91f48d6e151f890d0724c1cc923328 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6249a5475d91f4… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 18 11:13:05 2016 +0100 New bug in multisite --- .bugs/2480 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2480 b/.bugs/2480 new file mode 100644 index 0000000..0ea3940 --- /dev/null +++ b/.bugs/2480 @@ -0,0 +1,13 @@ +Title: Builtin icon visibility is not reset correctly +Component: multisite +State: open +Date: 2016-03-18 11:07:36 +Targetversion: 1.2.8 +Class: bug + +If you change the builtin icon visibility in global settings and want to to reset it, +it is not reset back to the system default. The icons are randomly missing or shown in the +wrong place. + +For example: place reschedule in column directly. It is shown correct. After that, if reset to default button is +used, the icons are not shown in the action menu again. It is randomly shown in column or it is missing completly.

8 years, 7 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 81339c21d1e8e64fd6380916b8d33465b394b898 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81339c21d1e8e6… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Mar 18 11:07:25 2016 +0100 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index ee84bf6..c753441 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2480 +2481

8 years, 7 months

3104 FIX ipmi: fixed crash when using summarized output with nagios backend

by Sebastian Herbord

Module: check_mk Branch: master Commit: 82b95e9ac950327295578f23ddbc72ba6f28ba43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82b95e9ac95032… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Mar 18 11:01:54 2016 +0100 3104 FIX ipmi: fixed crash when using summarized output with nagios backend --- .werks/3104 | 10 ++++++++++ ChangeLog | 1 + checks/ipmi | 41 ++++++++++++++++++++++++++++------------- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/.werks/3104 b/.werks/3104 new file mode 100644 index 0000000..8fcf90e --- /dev/null +++ b/.werks/3104 @@ -0,0 +1,10 @@ +Title: ipmi: fixed crash when using summarized output with nagios backend +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458295273 + + diff --git a/ChangeLog b/ChangeLog index 927c5a9..62986d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * 3010 FIX: Fixed vanished snmp subchecks for snmp hosts... * 3237 FIX: brocade_vdx_status: Fixed broken discovery * 3238 FIX: if.include: Fixed handling of old-skool traffic limits + * 3104 FIX: ipmi: fixed crash when using summarized output with nagios backend Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ipmi b/checks/ipmi index d422091..138d80c 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -99,19 +99,20 @@ ipmi_ignore_nr = False # set to True in order to ignore entries with state 'nr' ipmi_ignored_sensors = [] # example: [ "Power_Meter", "Virtual_Fan" ] inventory_ipmi_rules = [] -def ipmi_ignore_entry(name, state): - def ignored_sensors(): - # merge ignored sensor list specified here and those from wato - ignored_sensors_combined = ipmi_ignored_sensors[:] - rules = host_extra_conf(g_hostname, inventory_ipmi_rules) - if rules: - ignored_sensors_combined += rules[0].get("ignored_sensors", []) +def ipmi_get_ignored_sensors(hostname): + # merge ignored sensor list specified here and those from wato + ignored_sensors_combined = ipmi_ignored_sensors[:] + rules = host_extra_conf(hostname, inventory_ipmi_rules) + if rules: + ignored_sensors_combined += rules[0].get("ignored_sensors", []) + + return ignored_sensors_combined - return ignored_sensors_combined +def ipmi_ignore_entry(name, state, ignored_sensors): if ipmi_ignore_nr and state == 'nr': return True - for e in ignored_sensors(): + for e in ignored_sensors: if name.startswith(e): return True return False @@ -124,15 +125,16 @@ def inventory_ipmi(info): # the default for summarize is always true so if either configuration key has been set # to false that setting was changed by the user and needs to override the other if not ipmi_summarize or not summarize or len(info) == 0: + ignored_sensors = ipmi_get_ignored_sensors(g_hostname) for line in info: - if not ipmi_ignore_entry(line[0], line[3]): + if not ipmi_ignore_entry(line[0], line[3], ignored_sensors): yield line[0], None else: yield "Summary", None def check_ipmi(item, params, info): if item == "Summary": - return check_ipmi_summarized(info) + return check_ipmi_summarized(info, params) else: return check_ipmi_detailed(item, info) @@ -156,7 +158,7 @@ def check_ipmi_detailed(item, info): else: return (2, ipmi_format_message(name, val, unit), perfdata) -def check_ipmi_summarized(info): +def check_ipmi_summarized(info, params): worst_status = 0 warn_texts = [] crit_texts = [] @@ -164,13 +166,16 @@ def check_ipmi_summarized(info): ambient_count = 0 ambient_sum = 0.0 + if 'ignored_sensors' not in params: + params['ignored_sensors'] = ipmi_get_ignored_sensors(g_hostname) + for name, val, unit, status, unrec_low, crit_low, \ warn_low, warn_high, crit_high, unrec_high in info: # Skip datasets which have no valid data (zero value, no unit and state nc) if val == '0.000' and unit == 'unspecified' and status == 'nc': continue - if ipmi_ignore_entry(name, status): + if ipmi_ignore_entry(name, status, params['ignored_sensors']): continue count += 1 @@ -207,6 +212,14 @@ def check_ipmi_summarized(info): return (worst_status, ' - '.join(infotext), perfdata) +def ipmi_precompile(hostname, item, params): + if params is not None: + precomped = params.copy() + else: + precomped = {} + precomped['ignored_sensors'] = ipmi_get_ignored_sensors(hostname) + return precomped + # Make sure, configuration variables needed during check time are present # in precompiled code @@ -219,3 +232,5 @@ check_info["ipmi"] = { 'service_description': 'IPMI Sensor %s', 'has_perfdata': True, } + +precompile_params['ipmi'] = ipmi_precompile

8 years, 7 months

3293 FIX Fixed graphs in IE with enabled compatibility mode (for IE < 8)

by Lars Michelsen

Module: check_mk Branch: master Commit: 0914c8365cf0b44c64c9c38856d49619d27335fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0914c8365cf0b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 18 10:37:56 2016 +0100 3293 FIX Fixed graphs in IE with enabled compatibility mode (for IE < 8) --- .werks/3293 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/metrics.py | 15 ++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/3293 b/.werks/3293 new file mode 100644 index 0000000..8b34124 --- /dev/null +++ b/.werks/3293 @@ -0,0 +1,10 @@ +Title: Fixed graphs in IE with enabled compatibility mode (for IE < 8) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458293845 + + diff --git a/ChangeLog b/ChangeLog index 2b9b397..927c5a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * 3287 FIX: Fixed broken crash reporting (Submission of crashes did not work) * 3290 FIX: Fixed broken event quick delete icon when used in dashlets * 3236 FIX: Fixed host page of pnp4nagios... + * 3293 FIX: Fixed graphs in IE with enabled compatibility mode (for IE < 8) WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 42bcc2b..2403fc0 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1286,9 +1286,22 @@ def site_is_running_cmc(site_id): def browser_supports_canvas(): user_agent = html.get_user_agent() + if 'MSIE' in user_agent: matches = regex('MSIE ([0-9]{1,}[\.0-9]{0,})').search(user_agent) - return not matches or float(matches.group(1)) >= 9.0 + if matches: + ie_version = float(matches.group(1)) + if ie_version >= 9.0: + return True + + # Trying to deal with the IE compatiblity mode to detect the real IE version + matches = regex('Trident/([0-9]{1,}[\.0-9]{0,})').search(user_agent) + if matches: + trident_version = float(matches.group(1))+4 + if trident_version >= 9.0: + return True + + return False else: return True

8 years, 7 months

Preparation for Firefox graphing fix

by Lars Michelsen

Module: check_mk Branch: master Commit: 3103768158886f91d0ebe9b2a86511c652036b5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3103768158886f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 18 10:27:21 2016 +0100 Preparation for Firefox graphing fix --- web/htdocs/js/checkmk.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d249e49..149da71 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -245,6 +245,14 @@ function getTarget(event) { return event.target ? event.target : event.srcElement; } +function get_event_offset_x(event) { + return event.offsetX == undefined ? event.layerX : event.offsetX; +} + +function get_event_offset_y(event) { + return event.offsetY == undefined ? event.layerY : event.offsetY; +} + function getButton(event) { if (event.which == null) /* IE case */

8 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016