Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: In previous versions Check_MK raised exceptions when a view is using sorters

by Lars Michelsen

Module: check_mk Branch: master Commit: afcc661063ec51e8ea7f282504dbdd33b94e251b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afcc661063ec51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 28 15:38:55 2015 +0200 In previous versions Check_MK raised exceptions when a view is using sorters or painters that do not exist anymore. This could easily happen for the painters and sorters created dynamically for each tag group. Check_MK is now silently skipping these sorters and painters to prevent the exception and make use of such views possible again. You can then remove those sorters / painters using the view editor. Conflicts: web/htdocs/views.py --- .werks/2549 | 16 ++++++++++++++++ ChangeLog | 1 + web/htdocs/views.py | 9 ++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/2549 b/.werks/2549 new file mode 100644 index 0000000..3387011 --- /dev/null +++ b/.werks/2549 @@ -0,0 +1,16 @@ +Title: Silently ignore not existing painters and sorters in views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1440768969 + +In previous versions Check_MK raised exceptions when a view is using sorters +or painters that do not exist anymore. This could easily happen for the painters +and sorters created dynamically for each tag group. + +Check_MK is now silently skipping these sorters and painters to prevent the +exception and make use of such views possible again. You can then remove +those sorters / painters using the view editor. diff --git a/ChangeLog b/ChangeLog index f4c5847..b9c9ed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -179,6 +179,7 @@ * 2510 FIX: Fixed sidebar frame scaling in chrome when using browser zoom * 2544 FIX: Fixed links to availability timeline using the context buttons * 2548 FIX: Fixed exceptions in different places in case of user errors... + * 2549 FIX: Silently ignore not existing painters and sorters in views... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 98802ed..a0a10bb 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1006,15 +1006,18 @@ def show_view(view, show_heading = False, show_buttons = True, # Sorting - use view sorters and URL supplied sorters if not only_count: sorter_list = html.has_var('sort') and parse_url_sorters(html.var('sort')) or view["sorters"] - sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list ] + sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list + if s[0] in multisite_sorters ] else: sorters = [] # Prepare grouping information - group_painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["group_painters"] ] + group_painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["group_painters"] + if e[0] in multisite_painters ] # Prepare columns to paint - painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["painters"] if e[0] in multisite_painters ] + painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["painters"] + if e[0] in multisite_painters ] # Now compute the list of all columns we need to query via Livestatus. # Those are: (1) columns used by the sorters in use, (2) columns use by

9 years, 1 month

Check_MK Git: check_mk: In different places, e.g. during login errors it could happen that

by Lars Michelsen

Module: check_mk Branch: master Commit: a528220e4171af099b96314293265828af558b4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a528220e4171af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 28 15:21:47 2015 +0200 In different places, e.g. during login errors it could happen that exceptions like this occur: AttributeError: MKUserError instance has no attribute 'message' It seems that this occurance depends on the used Python version. Internal note: Never use e.message to get the text of an exception. Better directly put the exception into a string format: "%s" % e Conflicts: ChangeLog web/htdocs/forms.py --- .werks/2548 | 18 ++++++++++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 10 +++++----- web/htdocs/forms.py | 12 ++++++------ web/htdocs/htmllib.py | 7 ++++++- web/htdocs/login.py | 4 ++-- web/htdocs/mobile.py | 4 ++-- web/htdocs/valuespec.py | 2 +- web/htdocs/views.py | 8 ++++---- web/htdocs/visuals.py | 12 ++++++------ web/htdocs/wato.py | 10 +++++----- web/plugins/views/availability.py | 4 ++-- 12 files changed, 58 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a528220e41…

9 years, 1 month

Check_MK Git: check_mk: fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 5d759f26bad0521ad4bdbdda2e462ece3591ee8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d759f26bad052… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 28 09:35:46 2015 +0200 fixed typo --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 791e393..658c028 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15480,7 +15480,7 @@ def mode_edit_rule(phase, new = False): # Host tags forms.section(_("Host tags")) render_condition_editor(tag_specs) - html.help(_("The rule will only be applied to hosts fullfilling all of " + html.help(_("The rule will only be applied to hosts fullfilling all " "of the host tag conditions listed here, even if they appear " "in the list of explicit host names."))

9 years, 1 month

Check_MK Git: check_mk: #1288 cisco_vpn_tunnel: Added Metrics for trafic, please beware:

by Bastian Kuhn

Module: check_mk Branch: master Commit: a379fa8a76e339ea11a1d1680cd48bf47fd15abf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a379fa8a76e339… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Aug 27 16:33:43 2015 +0200 #1288 cisco_vpn_tunnel: Added Metrics for trafic, please beware: It can be possible that the check reports wrong values. There is maybe a mismatch in the the cisco mib documentation for in and out octets. If you have an advice, please contact me. --- .werks/1288 | 11 +++++++++++ ChangeLog | 1 + checks/cisco_vpn_tunnel | 24 +++++++++++++++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.werks/1288 b/.werks/1288 new file mode 100644 index 0000000..72bc254 --- /dev/null +++ b/.werks/1288 @@ -0,0 +1,11 @@ +Title: cisco_vpn_tunnel: Added Metrics for trafic, please beware: +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1440685847 +Class: feature + +It can be possible that the check reports wrong values. There is maybe a mismatch in the the cisco mib documentation for in and out octets. +If you have an advice, please contact me. + diff --git a/ChangeLog b/ChangeLog index b55dbc7..ea874d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 2423 interface checks: now able to configure absolute levels for error packets... * 1286 blade_bx_powerfan: Discovery ignores not present fans now * 2424 esx_vsphere_counters: improved handling when data is missing... + * 1288 cisco_vpn_tunnel: Added Metrics for trafic, please beware:... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/cisco_vpn_tunnel b/checks/cisco_vpn_tunnel index ce3e997..f70a256 100644 --- a/checks/cisco_vpn_tunnel +++ b/checks/cisco_vpn_tunnel @@ -48,10 +48,20 @@ def check_cisco_vpn_tunnel(item, params, info): alias = "[%s] " % tunnel_alias tunnel_not_found_state = not_found_state - if [item] not in info: - return tunnel_not_found_state, "%sTunnel is missing" % alias - else: - return 0, "%sTunnel is OK" % alias + for tunnel, in_octets, out_octets in info: + if tunnel == item: + this_time = time.time() + in_octets_sec = get_rate("cisco_vpn_tunnel_in" + item, this_time, int(in_octets)) + out_octets_sec = get_rate("cisco_vpn_tunnel_out" + item, this_time, int(out_octets)) + perfdata = [ + ("if_in_octets", in_octets_sec ), + ("if_out_octets", out_octets_sec), + ] + return 0, "%sTunnel is OK (In: %s/s Out: %s/s)" % \ + (alias, get_bytes_human_readable(in_octets_sec*8), get_bytes_human_readable(out_octets_sec*8)), \ + perfdata + + return tunnel_not_found_state, "%sTunnel is missing" % alias check_info["cisco_vpn_tunnel"] = { @@ -61,5 +71,9 @@ check_info["cisco_vpn_tunnel"] = { "group" : "vpn_tunnel", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security") \ or "vpn 3000 concentrator" in oid(".1.3.6.1.2.1.1.1.0").lower(), - "snmp_info" : ( ".1.3.6.1.4.1.9.9.171.1.2.3.1", [ 7 ] ), + "snmp_info" : ( ".1.3.6.1.4.1.9.9.171.1.2.3.1", [ 7, + 19, # In Octets + 27, # Out Octets + ] ), + "has_perfdata" : True, }

9 years, 1 month

Check_MK Git: check_mk: The mysql checks support monitoring multiple instances per host since some versions. There was a bug when

by Lars Michelsen

Module: check_mk Branch: master Commit: 152f8b0a5e0acc918ae9bf24d5adcc180b4cc302 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=152f8b0a5e0acc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 15:39:47 2015 +0200 The mysql checks support monitoring multiple instances per host since some versions. There was a bug when only a single instance is running on a host where an empty instance id is reported by the agent. The checks were discoverying wrong service names and resulting in exceptions during checking. Conflicts: ChangeLog checks/mysql_slave --- .werks/2547 | 12 ++++++++++++ ChangeLog | 1 + checks/mysql | 3 +++ checks/mysql_capacity | 10 ++++++++++ checks/mysql_ping | 3 +++ checks/mysql_slave | 3 +++ 6 files changed, 32 insertions(+) diff --git a/.werks/2547 b/.werks/2547 new file mode 100644 index 0000000..97a1488 --- /dev/null +++ b/.werks/2547 @@ -0,0 +1,12 @@ +Title: mysql mysql_capacity mysql_ping mysql_slave: Fixed broken service discovery when instance id is empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1440682635 + +The mysql checks support monitoring multiple instances per host since some versions. There was a bug when +only a single instance is running on a host where an empty instance id is reported by the agent. The checks +were discoverying wrong service names and resulting in exceptions during checking. diff --git a/ChangeLog b/ChangeLog index 55443fe..32a70b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 1287 FIX: akcp_temperature: Fixed interpretation of device levels... * 2545 FIX: akcp_daisy_temp: sensorProbe8-X20 not trying to discover services on these devices * 2546 FIX: brocade_mlx_power: Only discover power supplies in state normal/failure, skip other states... + * 2547 FIX: mysql mysql_capacity mysql_ping mysql_slave: Fixed broken service discovery when instance id is empty... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/mysql b/checks/mysql index dd670cb..11ed3f2 100644 --- a/checks/mysql +++ b/checks/mysql @@ -53,6 +53,7 @@ def inventory_mysql(parsed): if len(values.keys()) > 200: # should be at least 321 line return [(instance, {})] +# FIXME: Crapy copy n paste! Consolidate with other mysql_* parse functions def parse_mysql(info): def parse_line(line): if len(line) == 2: @@ -71,6 +72,8 @@ def parse_mysql(info): for line in info: if line[0].startswith("[["): instance = line[0][2:-2] + if instance == "": + instance = "mysql" parsed[instance] = {} elif instance: varname, value = parse_line(line) diff --git a/checks/mysql_capacity b/checks/mysql_capacity index ca6d358..3f42989 100644 --- a/checks/mysql_capacity +++ b/checks/mysql_capacity @@ -32,13 +32,23 @@ # performance_schema 0 0 # wa-confluence 15499264 13805551616 +# new: can have instance headers (can be empty), e.g.: +# <<<mysql_capacity>>> +# [[]] +# information_schema 147456 0 +# mysql 665902 292 +# performance_schema 0 0 +# test 409255936 54525952 +# FIXME: Crapy copy n paste! Consolidate with other mysql_* parse functions def parse_mysql_capacity(info): parsed = {} instance = False for line in info: if line[0].startswith("[["): instance = line[0][2:-2] + if instance == "": + instance = "mysql" parsed[instance] = [] elif instance: parsed[instance].append(line) diff --git a/checks/mysql_ping b/checks/mysql_ping index c116fbd..c4033b5 100644 --- a/checks/mysql_ping +++ b/checks/mysql_ping @@ -35,12 +35,15 @@ # "error: 'Access denied for user 'root'@'localhost' (using password: NO)'" ] # } +# FIXME: Crapy copy n paste! Consolidate with other mysql_* parse functions def parse_mysql_ping(info): parsed = {} instance = False for line in info: if line[0].startswith("[["): instance = line[0][2:-2] + if instance == "": + instance = "mysql" parsed[instance] = [] elif instance: parsed[instance].append(" ".join(line)) diff --git a/checks/mysql_slave b/checks/mysql_slave index 64edea4..f07b3c8 100644 --- a/checks/mysql_slave +++ b/checks/mysql_slave @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# FIXME: Crapy copy n paste! Consolidate with other mysql_* parse functions def parse_mysql_slave(info): def parse_line(l): if ':' in l[0]: @@ -49,6 +50,8 @@ def parse_mysql_slave(info): for line in info: if line[0].startswith("[["): instance = line[0][2:-2] + if instance == "": + instance = "mysql" parsed[instance] = {} elif instance: key, value = parse_line(line)

9 years, 1 month

Check_MK Git: check_mk: #2546 FIX brocade_mlx_power: Only discover power supplies in state normal/failure, skip other states

by Lars Michelsen

Module: check_mk Branch: master Commit: 902cf619a38f160c55dbbbb83ff9e1ac18bf6906 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=902cf619a38f16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 13:06:21 2015 +0000 #2546 FIX brocade_mlx_power: Only discover power supplies in state normal/failure, skip other states When power supplies are removed from a device, they remain in the SNMP data with state "other". Check_MK was still discovering those power supplies but should not. --- .werks/2546 | 11 +++++++++++ ChangeLog | 1 + checks/brocade_mlx_power | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2546 b/.werks/2546 new file mode 100644 index 0000000..e2411d4 --- /dev/null +++ b/.werks/2546 @@ -0,0 +1,11 @@ +Title: brocade_mlx_power: Only discover power supplies in state normal/failure, skip other states +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1440680714 + +When power supplies are removed from a device, they remain in the SNMP data with state "other". +Check_MK was still discovering those power supplies but should not. diff --git a/ChangeLog b/ChangeLog index 496d6a2..55443fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -144,6 +144,7 @@ * 2522 FIX: check_mk_agent.aix: now handles different output formats of the uptime function * 1287 FIX: akcp_temperature: Fixed interpretation of device levels... * 2545 FIX: akcp_daisy_temp: sensorProbe8-X20 not trying to discover services on these devices + * 2546 FIX: brocade_mlx_power: Only discover power supplies in state normal/failure, skip other states... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/brocade_mlx_power b/checks/brocade_mlx_power index 50fa03b..6bc62fb 100644 --- a/checks/brocade_mlx_power +++ b/checks/brocade_mlx_power @@ -33,7 +33,8 @@ def brocade_mlx_power_combine_item(id, descr): def inventory_brocade_mlx_power(info): inventory = [] for power_id, power_descr, power_state in info: - inventory.append( (brocade_mlx_power_combine_item(power_id, power_descr), None) ) + if power_state != "1": + inventory.append( (brocade_mlx_power_combine_item(power_id, power_descr), None) ) return inventory def check_brocade_mlx_power(item, _no_params, info):

9 years, 1 month

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f3612340408bddb8ea3a5967355331bee09f0e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f3612340408bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 14:54:49 2015 +0200 Conflicts: ChangeLog checks/akcp_daisy_temp --- .werks/2545 | 10 ++++++++++ ChangeLog | 1 + checks/akcp_daisy_temp | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2545 b/.werks/2545 new file mode 100644 index 0000000..c72162a --- /dev/null +++ b/.werks/2545 @@ -0,0 +1,10 @@ +Title: akcp_daisy_temp: sensorProbe8-X20 not trying to discover services on these devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1440679593 + + diff --git a/ChangeLog b/ChangeLog index 047f0f3..496d6a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -143,6 +143,7 @@ * 1285 FIX: blade_bx_powerfan: Fixed exception in case of fan failure * 2522 FIX: check_mk_agent.aix: now handles different output formats of the uptime function * 1287 FIX: akcp_temperature: Fixed interpretation of device levels... + * 2545 FIX: akcp_daisy_temp: sensorProbe8-X20 not trying to discover services on these devices Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp index bdcbf44..d3adb50 100644 --- a/checks/akcp_daisy_temp +++ b/checks/akcp_daisy_temp @@ -62,7 +62,9 @@ check_info["akcp_daisy_temp"] = { ] ), 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ] and not oid('.1.3.6.1.4.1.3854.2.*'), + [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ] \ + and not oid('.1.3.6.1.4.1.3854.2.*') \ + and oid('.1.3.6.1.4.1.3854.1.2.2.1.19.*'), 'group' : 'room_temperature', 'includes' : [ 'temperature.include' ], }

9 years, 1 month

Check_MK Git: check_mk: #2544 FIX Fixed links to availability timeline using the context buttons

by Lars Michelsen

Module: check_mk Branch: master Commit: 6372e9c3c743bc1ced9daaff0ca4950025667eaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6372e9c3c743bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 12:20:57 2015 +0200 #2544 FIX Fixed links to availability timeline using the context buttons --- .werks/2544 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 3 --- web/plugins/views/availability.py | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.werks/2544 b/.werks/2544 new file mode 100644 index 0000000..8402f62 --- /dev/null +++ b/.werks/2544 @@ -0,0 +1,10 @@ +Title: Fixed links to availability timeline using the context buttons +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1440670816 + + diff --git a/ChangeLog b/ChangeLog index 1b34bfd..047f0f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -173,6 +173,7 @@ * 2509 FIX: Logwatch: Fixed exception when deleting a specific logfile on multiple hosts * 2538 FIX: Fix exception in PNP graph template where metric name contains colon (e.g. omd_apache)... * 2510 FIX: Fixed sidebar frame scaling in chrome when using browser zoom + * 2544 FIX: Fixed links to availability timeline using the context buttons WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 92f988f..f70c2b3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -914,9 +914,6 @@ def prepare_display_options(): def show_view(view, show_heading = False, show_buttons = True, show_footer = True, render_function = None, only_count=False, all_filters_active=False, limit=None): - if html.var("mode") == "availability" and html.has_var("av_aggr_name") and html.var("timeline"): - bi.page_timeline() - return display_options = prepare_display_options() diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 7220aaa..759995b 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -494,7 +494,7 @@ def render_bi_availability(title, aggr_rows): elif len(aggr_rows) == 1: aggr_name = aggr_rows[0]["aggr_name"] aggr_group = aggr_rows[0]["aggr_group"] - timeline_url = html.makeuri([("timeline", "1"), ("av_aggr_name", aggr_name), ("av_aggr_group", aggr_group)]) + timeline_url = html.makeuri([("av_mode", "timeline"), ("av_aggr_name", aggr_name), ("av_aggr_group", aggr_group)]) html.context_button(_("Timeline"), timeline_url, "timeline") html.end_context_buttons()

9 years, 1 month

Check_MK Git: check_mk: Added download page for the builtin agents/ plugins to agent bakery page

by Lars Michelsen

Module: check_mk Branch: master Commit: f5baf11b86e966ed1e7ca1ef81d96ccd40acb17c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5baf11b86e966… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 12:03:24 2015 +0200 Added download page for the builtin agents/plugins to agent bakery page --- web/htdocs/wato.py | 88 ++++++++++++++++++++++++++++ web/plugins/wato/agents.py | 110 ----------------------------------- web/plugins/wato/builtin_modules.py | 8 +++ 3 files changed, 96 insertions(+), 110 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 257b7cb..791e393 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -18561,6 +18561,87 @@ def mode_icons(phase): table.end() #. +# .--Builtin Agents------------------------------------------------------. +# | ____ _ _ _ _ _ _ | +# | | __ ) _ _(_) | |_(_)_ __ / \ __ _ ___ _ __ | |_ ___ | +# | | _ \| | | | | | __| | '_ \ / _ \ / _` |/ _ \ '_ \| __/ __| | +# | | |_) | |_| | | | |_| | | | | / ___ \ (_| | __/ | | | |_\__ \ | +# | |____/ \__,_|_|_|\__|_|_| |_| /_/ \_\__, |\___|_| |_|\__|___/ | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Simple download page for the builtin agents and plugins | +# '----------------------------------------------------------------------' + +import glob + +def download_table(title, paths): + forms.header(title) + forms.container() + for path in paths: + os_path = path + relpath = path.replace(defaults.agents_dir+'/', '') + filename = path.split('/')[-1] + + size_kb = os.stat(os_path).st_size / 1024.0 + + # FIXME: Rename classes etc. to something generic + html.write('<div class="ruleset"><div class="text" style="width:250px;">') + html.write('<a href="agents/%s">%s</a>' % (relpath, filename)) + html.write('<span class=dots>%s</span></div>' % ("." * 100)) + html.write('<div class="rulecount" style="width:30px;">%d KB</div>' % size_kb) + html.write('</div></div>') + forms.end() + +def mode_download_agents(phase): + if phase == "title": + return _("Builtin Agents") + + elif phase == "buttons": + global_buttons() + return + + elif phase == "action": + return + + html.write('<div class="rulesets">') + packed = glob.glob(defaults.agents_dir + "/*.deb") \ + + glob.glob(defaults.agents_dir + "/*.rpm") \ + + glob.glob(defaults.agents_dir + "/windows/c*.msi") + + download_table(_("Packed Agents"), packed) + + titles = { + '' : _('Linux / Unix Agents'), + '/plugins' : _('Linux / Unix Plugins'), + '/windows' : _('Windows Agent'), + '/windows/plugins' : _('Windows Plugins'), + '/windows/mrpe' : _('Windows MRPE Scripts'), + '/cfg_examples' : _('Example Configurations'), + '/z_os' : _('z/OS'), + '/sap' : _('SAP'), + '/special' : _('Special Agents'), + } + + others = [] + for root, dirs, files in os.walk(defaults.agents_dir): + file_paths = [] + relpath = root.split('agents')[1] + title = titles.get(relpath, relpath) + for filename in files: + path = root + '/' + filename + if path not in packed and 'deprecated' not in path: + file_paths.append(path) + + others.append((title, file_paths)) + + others.sort() + + for title, file_paths in others: + if file_paths: + download_table(title, sorted(file_paths)) + html.write('</div>') + +#. # .--Hooks-&-API---------------------------------------------------------. # | _ _ _ ___ _ ____ ___ | # | | | | | ___ ___ | | _____ ( _ ) / \ | _ \_ _| | @@ -19714,6 +19795,7 @@ modes = { "bi_edit_rule" : (["bi_rules"], mode_bi_edit_rule), "bi_edit_aggregation": (["bi_rules"], mode_bi_edit_aggregation), "icons" : (["icons"], mode_icons), + "download_agents" : (["download_agents"], mode_download_agents), } loaded_with_language = False @@ -19979,6 +20061,12 @@ def load_plugins(): _("Upload or delete custom icons"), [ "admin" ]) + config.declare_permission("wato.download_agents", + _("Monitoring Agents"), + _("Download the default Check_MK monitoring agents for Linux, " + "Windows and other operating systems."), + [ "admin", "user", "guest" ]) + load_web_plugins("wato", globals()) # This must be set after plugin loading to make broken plugins raise diff --git a/web/plugins/wato/agents.py b/web/plugins/wato/agents.py deleted file mode 100644 index f6c5018..0000000 --- a/web/plugins/wato/agents.py +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 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. - -import glob - -def download_table(title, paths): - forms.header(title) - forms.container() - for path in paths: - os_path = path - relpath = path.replace(defaults.agents_dir+'/', '') - filename = path.split('/')[-1] - - size_kb = os.stat(os_path).st_size / 1024.0 - - # FIXME: Rename classes etc. to something generic - html.write('<div class="ruleset"><div class="text" style="width:250px;">') - html.write('<a href="agents/%s">%s</a>' % (relpath, filename)) - html.write('<span class=dots>%s</span></div>' % ("." * 100)) - html.write('<div class="rulecount" style="width:30px;">%d KB</div>' % size_kb) - html.write('</div></div>') - forms.end() - -def mode_download_agents(phase): - if phase == "title": - return _("Monitoring Agents") - - elif phase == "buttons": - global_buttons() - return - - elif phase == "action": - return - - html.write('<div class="rulesets">') - packed = glob.glob(defaults.agents_dir + "/*.deb") \ - + glob.glob(defaults.agents_dir + "/*.rpm") \ - + glob.glob(defaults.agents_dir + "/windows/c*.msi") - - download_table(_("Packed Agents"), packed) - - titles = { - '' : _('Linux / Unix Agents'), - '/plugins' : _('Linux / Unix Plugins'), - '/windows' : _('Windows Agent'), - '/windows/plugins' : _('Windows Plugins'), - '/windows/mrpe' : _('Windows MRPE Scripts'), - '/cfg_examples' : _('Example Configurations'), - '/z_os' : _('z/OS'), - '/sap' : _('SAP'), - '/special' : _('Special Agents'), - } - - others = [] - for root, dirs, files in os.walk(defaults.agents_dir): - file_paths = [] - relpath = root.split('agents')[1] - title = titles.get(relpath, relpath) - for filename in files: - path = root + '/' + filename - if path not in packed and 'deprecated' not in path: - file_paths.append(path) - - others.append((title, file_paths)) - - others.sort() - - for title, file_paths in others: - if file_paths: - download_table(title, sorted(file_paths)) - html.write('</div>') - -# Don't do anything when the agent bakery exists. Otherwise register -# a simple download page for the default agents -if "agents" not in modes: - modules.append( - ("download_agents", _("Monitoring Agents"), "download_agents", "download_agents", - _("Downloads the Check_MK monitoring agents")) - ) - - modes["download_agents"] = (["download_agents"], mode_download_agents) - - config.declare_permission("wato.download_agents", - _("Monitoring Agents"), - _("Download the default Check_MK monitoring agents for Linux, i" - "Windows and other operating systems."), - [ "admin", "user", "guest" ]) diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index ce202f1..60a3b8c 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -83,3 +83,11 @@ modules += [ ( "icons", _("Custom Icons"), "icons", "icons", _("Upload your own icons that can be used in views or custom actions")), ] + +# Register the builtin agent download page on the top level of WATO only when the agent bakery +# does not exist (e.g. when using CRE) +if "agents" not in modes: + modules.append( + ("download_agents", _("Monitoring Agents"), "download_agents", "download_agents", + _("Downloads the Check_MK monitoring agents")) + )

9 years, 1 month

Check_MK Git: check_mk: Implemented check validation to find broken check groups

by Lars Michelsen

Module: check_mk Branch: master Commit: 9bc41187eb92e7e5b2223310a92700b934c9a31e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bc41187eb92e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 11:37:56 2015 +0200 Implemented check validation to find broken check groups --- checks/cmctc_lcp | 2 +- checks/esx_vsphere_counters | 2 +- checks/icom_repeater | 2 +- checks/websphere_mq_queues | 2 +- modules/check_mk.py | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/checks/cmctc_lcp b/checks/cmctc_lcp index b0383bf..28c1b94 100644 --- a/checks/cmctc_lcp +++ b/checks/cmctc_lcp @@ -130,7 +130,7 @@ for _s, _i in cmctc_lcp_sensortypes.items(): "check_function" : (lambda st: lambda item,params,info: check_cmctc_lcp(item, params, info, st))(_s), "inventory_function" : (lambda st: lambda info: inventory_cmctc_lcp(info, st))(_s), "has_perfdata" : True, - "service_description" : _i[1], + "service_description" : _i[1] + " %s", } # Set WATO check group for temperature checks diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index dcc3f85..6cf392e 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -100,7 +100,7 @@ def check_esx_vsphere_counters_diskio(item, params, parsed): check_info['esx_vsphere_counters.diskio'] = { 'inventory_function' : inventory_esx_vsphere_counters_diskio, 'check_function' : check_esx_vsphere_counters_diskio, - 'service_description' : 'Disk IO', + 'service_description' : 'Disk IO %s', 'has_perfdata' : True, 'group' : 'diskstat', 'includes' : [ "diskstat.include" ], diff --git a/checks/icom_repeater b/checks/icom_repeater index f0e0615..baa7b3c 100644 --- a/checks/icom_repeater +++ b/checks/icom_repeater @@ -231,7 +231,7 @@ check_info["icom_repeater.temp"] = { "inventory_function" : inventory_icom_repeater_temp, "default_levels_variable" : "icom_repeater_temp_default_levels", "check_function" : check_icom_repeater_temp, - "service_description" : "Temperature", + "service_description" : "Temperature %s", "has_perfdata" : True, "group" : "temperature", "includes" : [ "temperature.include" ], diff --git a/checks/websphere_mq_queues b/checks/websphere_mq_queues index c1a4fa2..4ef4002 100644 --- a/checks/websphere_mq_queues +++ b/checks/websphere_mq_queues @@ -70,7 +70,7 @@ check_info["websphere_mq_queues"] = { "group" : "websphere_mq", "check_function" : check_websphere_mq_queues, "inventory_function" : inventory_websphere_mq_queues, - "service_description" : "MQ Queue", + "service_description" : "MQ Queue %s", "has_perfdata" : True, } diff --git a/modules/check_mk.py b/modules/check_mk.py index be1f312..829fc4b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -368,6 +368,38 @@ def load_checks(): # Now convert check_info to new format. convert_check_info() + verify_checkgroups() + + +# This function validates the checks which are members of checkgroups to have either +# all or none an item. Mixed checkgroups lead to strange exceptions when processing +# the check parameters. So it is much better to catch these errors in a central place +# with a clear error message. +def verify_checkgroups(): + groups = {} + for check_type, check in check_info.items(): + group_name = check["group"] + if group_name: + groups.setdefault(group_name, []) + groups[group_name].append((check_type, check)) + + for group_name, checks in groups.items(): + with_item, without_item = [], [] + for check_type, check in checks: + # Trying to detect whether or not the check has an item. But this mechanism is not + # 100% reliable since Check_MK appends an item to the service_description when "%s" + # is not in the checks service_description template. + # Maybe we need to define a new rule which enforces the developer to use the %s in + # the service_description. At least for grouped checks. + if "%s" in check["service_description"]: + with_item.append(check_type) + else: + without_item.append(check_type) + + if with_item and without_item: + raise MKGeneralException("Checkgroup %s has checks with and without item! At least one of " + "the checks in this group needs to be changed (With item: %s, " + "Without item: %s)" % (group_name, ", ".join(with_item), ", ".join(without_item))) #.

9 years, 1 month

← Newer
1
2
3
4
5
6
7
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015