Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

Preparation for new style graph overview page

by Lars Michelsen

Module: check_mk Branch: master Commit: c8e0c60cea440638040d7aa152d3e1d22edc3a7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8e0c60cea4406… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 16:11:08 2016 +0100 Preparation for new style graph overview page --- web/plugins/icons/builtin.py | 46 +++++++++++++++++++++++++++++++++++------- web/plugins/views/builtin.py | 2 +- web/plugins/views/layouts.py | 24 ++++++++++++++++++++-- 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index e7a9d87..6bf5905 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -294,6 +294,13 @@ multisite_icons_and_actions['realhost'] = { # | | # '----------------------------------------------------------------------' +def has_new_graphing(): + # TODO: Import in function is not good + import metrics + return hasattr(metrics, 'render_graph_from_template_html') \ + and metrics.new_style_graphs_possible() + + # Intelligent Links to PNP4Nagios 0.6.X def pnp_url(row, what, how = 'graph'): sitename = row["site"] @@ -315,32 +322,57 @@ def pnp_url(row, what, how = 'graph'): html.urlencode(site["url_prefix"]) return url + def pnp_popup_url(row, what): return pnp_url(row, what, 'popup') -def pnp_icon(row, what): - if 'X' in html.display_options: - url = pnp_url(row, what) + +def new_graphing_url(row, what): + site_id = row["site"] + + urivars = [ + ("view_name", "service_graphs"), + ("siteopt", site_id), + ("host", row["host_name"]), + ] + + if what == "service": + urivars.append(("service", row["service_description"])) + + return html.makeuri_contextless(urivars, filename="view.py") + + +def pnp_graph_icon_link(row, what): + if 'X' not in html.display_options: + return "" + + if not has_new_graphing(): + return pnp_url(row, what) else: - url = "" + return new_graphing_url(row, what) - # TODO: Import in function is not good - import metrics - if not hasattr(metrics, 'render_graph_from_template_html'): + +def pnp_icon(row, what): + url = pnp_graph_icon_link(row, what) + + if not has_new_graphing(): # Directly ask PNP for all data, don't try to use the new graph fetching mechanism # to keep the number of single requests low hover_content_func = 'pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) else: hover_content_func = 'hover_graph(\'%s\', \'%s\', \'%s\')' % \ (row['site'], row['host_name'], row.get('service_description', '_HOST_').replace("\\", "\\\\")) + return '<a href="%s" onmouseover="show_hover_menu(event, %s)" ' \ 'onmouseout="hide_hover_menu()">%s</a>' % (url, hover_content_func, html.render_icon('pnp', '')) + def paint_pnp_graph(what, row, tags, host_custom_vars): pnpgraph_present = row[what + "_pnpgraph_present"] if pnpgraph_present == 1: return pnp_icon(row, what) + multisite_icons_and_actions['perfgraph'] = { 'columns': [ 'pnpgraph_present' ], 'paint': paint_pnp_graph, diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 8e357e9..9bea7f0 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1657,7 +1657,7 @@ multisite_builtin_views.update({ 'sorters': [('site', False), ('site_host', False), ('svcdescr', False)], - 'linktitle': _('Graphs'), + 'linktitle': _('Host graphs'), 'title': _('Graphs for host'), }, 'recentsvc': {'browser_reload': 30, diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 923cbdf..85d180b 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -122,7 +122,7 @@ multisite_layouts["dataset"] = { # | The boxed layout is useful in views with a width > 1, boxes are | # | stacked in columns and can have different sizes. | # '----------------------------------------------------------------------' -def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show_checkboxes): +def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show_checkboxes, css_class=None): repeat_heading_every = 20 # in case column_headers is "repeat" @@ -230,7 +230,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show init_rowselect(view) # render table - html.write("<table class=boxlayout><tr>") + html.write("<table class=\"boxlayout%s\"><tr>" % (css_class and " "+css_class or "")) for column in columns: html.write("<td class=boxcolumn>") for header, rows in column: @@ -245,6 +245,26 @@ multisite_layouts["boxed"] = { "checkboxes" : True, } +#. +# .--Graph Boxes---------------------------------------------------------. +# | ____ _ ____ | +# | / ___|_ __ __ _ _ __ | |__ | __ ) _____ _____ ___ | +# | | | _| '__/ _` | '_ \| '_ \ | _ \ / _ \ \/ / _ \/ __| | +# | | |_| | | | (_| | |_) | | | | | |_) | (_) > < __/\__ \ | +# | \____|_| \__,_| .__/|_| |_| |____/ \___/_/\_\___||___/ | +# | |_| | +# +----------------------------------------------------------------------+ +# | Same as balanced boxes layout but adds a cs class graph to the box | +# '----------------------------------------------------------------------' + + +multisite_layouts["boxed_graph"] = { + "title" : _("Balanced graph boxes"), + "render" : lambda *args: render_grouped_boxes(*args + ("graph",)), + "group" : True, + "checkboxes" : True, +} + #. # .--Tiled---------------------------------------------------------------.

8 years, 7 months

Fixed invalid function calls after refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 6457bb0301b8ce2bc44d4c1d408252a077bc131a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6457bb0301b8ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 15:56:01 2016 +0100 Fixed invalid function calls after refactoring --- web/htdocs/userdb.py | 2 +- web/htdocs/watolib.py | 2 +- web/plugins/sidebar/wato.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index dc6f156..fb69347 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -1033,7 +1033,7 @@ def userdb_sync_job_enabled(): return False # not enabled at all import wato # FIXME: Cleanup! - if cfg == "master" and wato.is_slave_site(): + if cfg == "master" and wato.is_wato_slave_site(): return False return True diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 5467a66..94e35d5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -209,7 +209,7 @@ def log_pending(status, linkinfo, what, message, user_id = None): # The latter one condition applies to slave sites # Otherwise slave sites would trigger the cmcrushd - if not is_distributed() and not is_slave_site(): + if not is_distributed() and not is_wato_slave_site(): if status != SYNC: log_entry(linkinfo, what, message, "pending.log", user_id) cmc_rush_ahead() diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index e857769..ccc34ce 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -219,8 +219,7 @@ def sort_by_title(folders): def render_wato_foldertree(): - is_slave_site = not wato.is_distributed() and os.path.exists(defaults.check_mk_configdir + "/distributed_wato.mk") - if not is_slave_site: + if not wato.is_wato_slave_site(): if not config.wato_enabled: html.write(_("WATO is disabled.")) return False

8 years, 7 months

#2973 FIX showing subfolder info in WATO if there are more than four groups

by Simon Betz

Module: check_mk Branch: master Commit: cb0dd6a06f0effd3aba0c65013067c1589debf4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0dd6a06f0eff… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 25 15:45:33 2016 +0100 #2973 FIX showing subfolder info in WATO if there are more than four groups --- .werks/2973 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/2973 b/.werks/2973 new file mode 100644 index 0000000..a8ad5b7 --- /dev/null +++ b/.werks/2973 @@ -0,0 +1,9 @@ +Title: showing subfolder info in WATO if there are more than four groups +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1453732849 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 147db2d..7b49a8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -288,6 +288,7 @@ * 2905 FIX: Check plugins: Non existant man pages now result in helpful error messages * 2943 FIX: Preventing issues with password completion of browsers on user and profile edit pages * 2831 FIX: Removing a previously set custom attribute for a contact did not work as intented... + * 2973 FIX: showing subfolder info in WATO if there are more than four groups Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3f3d552..504aa60 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -604,8 +604,8 @@ def show_subfolder_infos(subfolder): cgalias = groups.get(pg, {'alias': pg})['alias'] html.icon(_("Contactgroups that have permission on this folder"), "contactgroups") html.write(' %s<br>' % cgalias) - if num > 1 and len(perm_groups) > 4: - html.write(_('<i>%d more contact groups</i><br>') % (len(perm_groups) - num - 1)) + if num > 1 and len(permitted_groups) > 4: + html.write(_('<i>%d more contact groups</i><br>') % (len(permitted_groups) - num - 1)) break num_hosts = subfolder.num_hosts_recursively()

8 years, 7 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: a464d5a10da83b81ff33844f5a7c47668bd0fc2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a464d5a10da83b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 25 15:39:56 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 891c972..bf2403c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2973 +2983

8 years, 7 months

#2955 FIX cpu.loads: Fixed monitoring on some AIX systems

by Lars Michelsen

Module: check_mk Branch: master Commit: b50b3e03cd46be2e6b87f9aaf3e470a0f524d718 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b50b3e03cd46be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 15:18:35 2016 +0100 #2955 FIX cpu.loads: Fixed monitoring on some AIX systems --- .werks/2955 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 2 +- checks/cpu | 13 ++++++++++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.werks/2955 b/.werks/2955 new file mode 100644 index 0000000..4bf1223 --- /dev/null +++ b/.werks/2955 @@ -0,0 +1,9 @@ +Title: cpu.loads: Fixed monitoring on some AIX systems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453731493 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 15af17f..4a0d03e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -213,6 +213,7 @@ * 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 * 2954 FIX: netextreme_temp: Fixed temperature checking + * 2955 FIX: cpu.loads: Fixed monitoring on some AIX systems Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 5247bf8..7a4f35f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -176,7 +176,7 @@ mpstat -a | tail -n1 echo '<<<cpu>>>' load=`uptime|sed -e 's;.*average: $[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}$, $[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}$, $[[:digit:]]\{1,\}\.[[:digit:]]\{1,\}$;\1 \2 \3;'` ps=`ps -eo thcount | awk '{SUM+=$1} END {print SUM}'` -procs=`vmstat|grep lcpu|sed -e 's;.* lcpu=$[[:digit:]]\{1,4\}$ .*;\1;'` +procs=`vmstat|grep lcpu|sed -e 's;.*lcpu=$[[:digit:]]\{1,4\}$.*;\1;'` echo $load 1/$ps $$ $procs diff --git a/checks/cpu b/checks/cpu index 0d67753..617b003 100644 --- a/checks/cpu +++ b/checks/cpu @@ -47,7 +47,18 @@ def inventory_cpu_load(info): def check_cpu_load(item, params, info): if len(info[0]) >= 6: - num_cpus = int(info[0][5]) + # There have been broken AIX agents for a long time which produced data like follows. + # Newer agents deal with this, but to be nice to old agents: deal with it. + # <<<cpu>>> + # 0.00 0.00 0.00 1/97 8913088 aixxyz configuration: @lcpu=8 @mem=24576MB @ent=0.20 + line = " ".join(info[0]) + if "lcpu=" in line: + for part in info[0]: + if "lcpu=" in part: + num_cpus = int(part.split("=", 1)[1]) + break + else: + num_cpus = int(info[0][5]) else: num_cpus = 1

8 years, 7 months

#2956 FIX Fixed exception on " Availability of Single-Host Aggregations view

by Lars Michelsen

Module: check_mk Branch: master Commit: 643154fb8704896501f08c926f8dc71c7e6debb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=643154fb870489… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 15:35:15 2016 +0100 #2956 FIX Fixed exception on "Availability of Single-Host Aggregations view --- .werks/2956 | 9 +++++++++ ChangeLog | 1 + web/htdocs/bi.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2956 b/.werks/2956 new file mode 100644 index 0000000..8cba42c --- /dev/null +++ b/.werks/2956 @@ -0,0 +1,9 @@ +Title: Fixed exception on "Availability of Single-Host Aggregations view +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453732504 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4a0d03e..147db2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -254,6 +254,7 @@ * 2945 FIX: LDAP: Fixed broken sync for LDAP connections named "ldap"... * 2946 FIX: LDAP: User created during login does not trigger full user synchronisation anymore... * 2947 FIX: LDAP: Simplified automatic sync logic... + * 2956 FIX: Fixed exception on "Availability of Single-Host Aggregations view WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 0ab83f8..33cf28f 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1215,7 +1215,7 @@ def get_status_info(required_hosts): # that need to be fetched in any case def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetch_parents = True, bygroup=False): columns = [ "name", "host_name", "state", "hard_state", "plugin_output", "scheduled_downtime_depth", - "acknowledged", "services_with_fullstate", "parents" ] + add_columns + "host_in_service_period", "acknowledged", "services_with_fullstate", "parents" ] + add_columns html.live.set_only_sites(only_sites) html.live.set_prepend_site(True)

8 years, 7 months

#2938 websphere_mq_channels: check outcome based on channel state is now configurable

by Sebastian Herbord

Module: check_mk Branch: master Commit: ab8730ccef7e0eb25ad709752e58a771726378c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab8730ccef7e0e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jan 25 15:25:54 2016 +0100 #2938 websphere_mq_channels: check outcome based on channel state is now configurable The agent reports channel states as "RUNNING", "STOPPED" or "RETRYING", which will by default make the check state become {OK}, {WARN} or {CRIT} respectively. Now this can be changed. --- .werks/2938 | 10 +++++++ ChangeLog | 1 + checks/websphere_mq_channels | 34 ++++++++++++----------- checks/websphere_mq_queues | 11 +++++--- web/plugins/wato/check_parameters.py | 49 +++++++++++++++++++++++++++++----- 5 files changed, 79 insertions(+), 26 deletions(-) diff --git a/.werks/2938 b/.werks/2938 new file mode 100644 index 0000000..ae51e44 --- /dev/null +++ b/.werks/2938 @@ -0,0 +1,10 @@ +Title: websphere_mq_channels: check outcome based on channel state is now configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453731797 +Class: feature + +The agent reports channel states as "RUNNING", "STOPPED" or "RETRYING", which will by default +make the check state become {OK}, {WARN} or {CRIT} respectively. Now this can be changed. diff --git a/ChangeLog b/ChangeLog index a5778ea..15af17f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 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! + * 2938 websphere_mq_channels: check outcome based on channel state is now configurable... * 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/websphere_mq_channels b/checks/websphere_mq_channels index ed51dca..7002599 100644 --- a/checks/websphere_mq_channels +++ b/checks/websphere_mq_channels @@ -36,35 +36,39 @@ # Anzahl_Message Channelname MaxMessages_Moeglich Status" -websphere_mq_channels_default_levels = ( 900, 1000 ) +websphere_mq_channels_default_levels = { + 'message_count': ( 900, 1000 ), + 'status': { + 'RUNNING': 0, + 'STOPPED': 1 + } +} + def inventory_websphere_mq_channels(info): return [ ( x[1], 'websphere_mq_channels_default_levels' ) for x in info ] def check_websphere_mq_channels(item, params, info): + if isinstance(params, tuple): + params = {'message_count': params, + 'status': websphere_mq_channels_default_levels['status']} + for messages, channel, max_messages, status in info: if channel == item: - warn, crit = params + warn, crit = params['message_count'] + messages = saveint(messages) max_messages = saveint(max_messages) state = 0 - message = "%d/%d Messages" % ( messages, max_messages) if messages >= crit: state = 2 - message += "(!!)" elif messages >= warn: state = 1 - message += "(!)" - message += ", Channel State: %s" % status - if status == 'STOPPED': - state = 1 - message += "(!)" - elif status not in [ 'RUNNING' ]: - state = 2 - message += "(!!)" - perf = [ ('messages', messages, warn, crit, 0, max_messages) ] - return state, message, perf - return 3, "Channel not found in output" + yield (state, "%d/%d Messages" % (messages, max_messages), + [ ('messages', messages, warn, crit, 0, max_messages) ]) + + state = params['status'].get(status, 2) + yield state, "Channel State: %s" % status, [] check_info["websphere_mq_channels"] = { diff --git a/checks/websphere_mq_queues b/checks/websphere_mq_queues index 4ef4002..484ae17 100644 --- a/checks/websphere_mq_queues +++ b/checks/websphere_mq_queues @@ -39,12 +39,17 @@ # 0 CD.ISS.TIQS.REPLY.C000052 # 0 CD.ISS.VWD.REPLY.C000052 -websphere_mq_queues_default_levels = ( 1000, 1200 ) +websphere_mq_queues_default_levels = { + 'message_count': ( 1000, 1200 ) +} def inventory_websphere_mq_queues(info): return [ ( x[1], 'websphere_mq_queues_default_levels' ) for x in info ] def check_websphere_mq_queues(item, params, info): + if isinstance(params, tuple): + params = {'message_count': params} + for line in info: queue = line[1] if queue == item: @@ -56,7 +61,7 @@ def check_websphere_mq_queues(item, params, info): length_info = "" message = "%d%s messages in queue" % ( messages, length_info ) - warn, crit = params + warn, crit = params['message_count'] perf = [ ( "queue", messages, warn, crit ) ] if messages >= crit: return 2, message, perf @@ -64,8 +69,6 @@ def check_websphere_mq_queues(item, params, info): return 1, message, perf return 0, message, perf - return 3, "No message queue named %s in agent output" % item - check_info["websphere_mq_queues"] = { "group" : "websphere_mq", "check_function" : check_websphere_mq_queues, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bfba4c6..d5a25e9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -289,19 +289,54 @@ register_check_parameters( match_type = "dict", ) + +def transform_websphere_mq(source): + if isinstance(source, tuple): + return {"message_count": source} + else: + return source + register_check_parameters( subgroup_applications, "websphere_mq", _("Maximum number of messages in Websphere Message Queues"), - Tuple( - title = _('Maximum number of messages'), - elements = [ - Integer(title = _("Warning at"), default_value = 1000 ), - Integer(title = _("Critical at"), default_value = 1200 ), - ] + Transform( + Dictionary( + elements = [ + ("message_count", + Tuple( + title = _('Maximum number of messages'), + elements = [ + Integer(title = _("Warning at"), default_value = 1000 ), + Integer(title = _("Critical at"), default_value = 1200 ), + ] + )), + ("status", + Dictionary( + title = _('Override check state based on channel state'), + elements = [ + ("STOPPED", MonitoringState( + title = _("State when channel is stopped"), + default_value = 1)), + ("RETRYING", MonitoringState( + title = _("State when channel is retrying"), + default_value = 2)), + ("RUNNING", MonitoringState( + title = _("State when channel is running"), + default_value = 0)), + ("other", MonitoringState( + title = _("State when channel status is unknown"), + default_value = 2)), + ], + optional_keys = [] + )), + ], + optional_keys = ["status"] + ), + forth = transform_websphere_mq ), TextAscii(title = _("Name of Channel or Queue")), - match_type = "first", + match_type = "dict", ) register_check_parameters(

8 years, 7 months

lnx_if: made discovery a bit more robust

by Lars Michelsen

Module: check_mk Branch: master Commit: 996961f947a8f879bd66c5c046ca2a69a9712bc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=996961f947a8f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 15:05:36 2016 +0100 lnx_if: made discovery a bit more robust --- checks/lnx_if | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/lnx_if b/checks/lnx_if index 21c5df1..46fd612 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -109,7 +109,7 @@ def if_lnx_extract_nic_info(info): nic_info[nic] = { "counters": map(int, line[1].split()) } if nic in iplink_stats: nic_info[nic]['iplink_stats'] = iplink_stats[nic] - else: + elif current_nic: # ethtool data line nic_info[current_nic][line[0].strip()] = ":".join(line[1:]).strip()

8 years, 7 months

lnx_if: Short refactoring for slightly better readability

by Lars Michelsen

Module: check_mk Branch: master Commit: 9aa0ced982695f98350fcae1dbac45738872f4ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aa0ced982695f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 15:02:51 2016 +0100 lnx_if: Short refactoring for slightly better readability --- checks/lnx_if | 71 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/checks/lnx_if b/checks/lnx_if index 7f75e19..21c5df1 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -58,19 +58,22 @@ check_includes['lnx_if'] = [ "if.include" ] linux_nic_check = "lnx_if" -def if_lnx_convert_to_if64(info): +def if_lnx_extract_nic_info(info): nic_info = {} current_nic = None index = 0 lines = iter(info) - try: - iplink_stats = {} - while True: + iplink_stats = {} + while True: + try: line = lines.next() + except StopIteration: + break - # This extra info from 'ip link' is used as fallback in case ethtool is missing - if line[0].startswith("[start_iplink]"): - iplink_stats = {} + # This extra info from 'ip link' is used as fallback in case ethtool is missing + if line[0].startswith("[start_iplink]"): + iplink_stats = {} + try: while True: line = lines.next() if line[0].startswith("[end_iplink]"): @@ -85,36 +88,36 @@ def if_lnx_convert_to_if64(info): iplink_stats[nic_name].update(dict(zip(status_info[3::2], status_info[4::2]))) except: # In case of parse errors we simply ignore these lines pass + except StopIteration: + break + + # Be careful! On clustered hosts we have more than one perf-counters section + # and ethtool section. This needs to be handled. Sadly we have no section + # headers. Try to detect it by data format. + if line[0].startswith('['): + current_nic = line[0][1:-1] + index += 1 + nic_info[current_nic]['index'] = index + # The iplink_stats are only used within the perf-counters + # The (optional) ethtool section invalidates this info, otherwise it would + # be incorrectly reused in a followup section of another cluster node + # When the ethtool section is missing the data is also reset by the next [start_iplink] + iplink_stats = {} + elif len(line) == 2 and len(line[1].split()) >= 16: + # This looks like a perf-counter line + nic = line[0] + nic_info[nic] = { "counters": map(int, line[1].split()) } + if nic in iplink_stats: + nic_info[nic]['iplink_stats'] = iplink_stats[nic] + else: + # ethtool data line + nic_info[current_nic][line[0].strip()] = ":".join(line[1:]).strip() - # Be careful! On clustered hosts we have more than one perf-counters section - # and ethtool section. This needs to be handled. Sadly we have no section - # headers. Try to detect it by data format. - if line[0].startswith('['): - current_nic = line[0][1:-1] - index += 1 - nic_info[current_nic]['index'] = index - # The iplink_stats are only used within the perf-counters - # The (optional) ethtool section invalidates this info, otherwise it would - # be incorrectly reused in a followup section of another cluster node - # When the ethtool section is missing the data is also reset by the next [start_iplink] - iplink_stats = {} - elif len(line) == 2 and len(line[1].split()) >= 16: - # This looks like a perf-counter line - nic = line[0] - nic_info[nic] = { "counters": map(int, line[1].split()) } - if nic in iplink_stats: - nic_info[nic]['iplink_stats'] = iplink_stats[nic] - else: - # ethtool data line - nic_info[current_nic][line[0].strip()] = ":".join(line[1:]).strip() + return nic_info - except StopIteration: - pass - # if index is 0 we either have found no nics or no information - # from ethtool is present. In the latter case we continue and - # just monitor the performance. We set the state to 'unknown' - # in that case. +def if_lnx_convert_to_if64(info): + nic_info = if_lnx_extract_nic_info(info) if_table = [] index = 0

8 years, 7 months

#2954 FIX netextreme_temp: Fixed temperature checking

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e5589c1f92965c014007f582dffe53e539791ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e5589c1f92965… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 14:46:17 2016 +0100 #2954 FIX netextreme_temp: Fixed temperature checking --- .werks/2954 | 9 +++++++++ ChangeLog | 1 + checks/netextreme_temp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2954 b/.werks/2954 new file mode 100644 index 0000000..37e99f6 --- /dev/null +++ b/.werks/2954 @@ -0,0 +1,9 @@ +Title: netextreme_temp: Fixed temperature checking +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453729561 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 56f02ee..a5778ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -211,6 +211,7 @@ * 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 + * 2954 FIX: netextreme_temp: Fixed temperature checking Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/netextreme_temp b/checks/netextreme_temp index bae8cc0..5bb90f0 100644 --- a/checks/netextreme_temp +++ b/checks/netextreme_temp @@ -37,7 +37,7 @@ def inventory_netextreme_temp(info): def check_netextreme_temp(item, params, info): - return check_temperature(float(info[0][0]), params) + return check_temperature(float(info[0][0]), params, "netextreme_temp_System") check_info['netextreme_temp'] = {

8 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
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