Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 79d6a157cbc991e8b45eb288528c2c8ca8fa51b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79d6a157cbc991… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 13:08:43 2016 +0200 Use stream-based logging. --- livestatus/src/DowntimesOrComments.cc | 7 +- livestatus/src/OffsetStringMacroColumn.cc | 4 +- livestatus/src/TimeperiodsCache.cc | 13 +- livestatus/src/mk_logwatch.cc | 14 +- livestatus/src/module.cc | 258 +++++++++++++---------------- 5 files changed, 136 insertions(+), 160 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=79d6a157cb…

7 years, 10 months

3864 tactical overview now shows the number of stale hosts and services

by Simon Betz

Module: check_mk Branch: master Commit: fa61d1b8b149a12e7f0621ff14752c96b6c5040e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa61d1b8b149a1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 29 13:23:45 2016 +0200 3864 tactical overview now shows the number of stale hosts and services --- .werks/3864 | 9 +++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 30 +++++++++++++++++++++--------- web/plugins/views/builtin.py | 24 ++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/.werks/3864 b/.werks/3864 new file mode 100644 index 0000000..6537c99 --- /dev/null +++ b/.werks/3864 @@ -0,0 +1,9 @@ +Title: tactical overview now shows the number of stale hosts and services +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472469803 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bb371e2..9edb61e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,6 +145,7 @@ * 3793 f5_bigip_vserver: traffic and packet levels are now configurable * 3794 f5_bigip_snat: now able to configure levels * 3795 cisco_cpu_multiitem: monitors the cpu utilization of each cpu + * 3864 tactical overview now shows the number of stale hosts and services * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index ecfe7be..a5f0019 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -547,6 +547,8 @@ table.sitestate td.state { # '----------------------------------------------------------------------' def get_tactical_overview_data(extra_filter_headers): + configured_staleness_threshold = config.staleness_threshold + host_query = \ "GET hosts\n" \ "Stats: state >= 0\n" \ @@ -557,6 +559,7 @@ def get_tactical_overview_data(extra_filter_headers): "Stats: scheduled_downtime_depth = 0\n" \ "Stats: acknowledged = 0\n" \ "StatsAnd: 3\n" \ + "Stats: host_staleness >= %s\n" % configured_staleness_threshold + \ "Filter: custom_variable_names < _REALNAME\n" + \ extra_filter_headers @@ -574,6 +577,7 @@ def get_tactical_overview_data(extra_filter_headers): "Stats: acknowledged = 0\n" \ "Stats: host_state = 0\n" \ "StatsAnd: 5\n" \ + "Stats: service_staleness >= %s\n" % configured_staleness_threshold + \ "Filter: host_custom_variable_names < _REALNAME\n" + \ extra_filter_headers @@ -584,6 +588,7 @@ def get_tactical_overview_data(extra_filter_headers): stat_only=True) if notdata is None: notdata = [0] + except livestatus.MKLivestatusNotFoundError: return None, None, None @@ -600,22 +605,29 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): return html.write("<table class=\"content_center tacticaloverview\" cellspacing=2 cellpadding=0 border=0>\n") - for title, data, view, what in [ - (_("Hosts"), hstdata, 'hostproblems', 'host'), - (_("Services"), svcdata, 'svcproblems', 'service')]: - html.write("<tr><th>%s</th><th>%s</th><th>%s</th></tr>\n" % (title, _('Problems'), _('Unhandled'))) + for title, data, view, stale_view, what in [ + (_("Hosts"), hstdata, 'hostproblems', 'stale_hosts', 'host'), + (_("Services"), svcdata, 'svcproblems', 'uncheckedsvc', 'service')]: + + amount, problems, unhandled_problems, stales = data + html.write("<tr><th>%s</th><th>%s</th><th>%s</th>" + "<th>%s</th></tr>\n" % (title, _('Problems'), _('Unhandled'), _("Stale"))) html.write("<tr>") url = html.makeuri_contextless([("view_name", "all" + what + "s")] + extra_url_variables, filename="view.py") - html.write('<td class=total><a target="main" href="%s">%d</a></td>' % (url, data[0])) - unhandled = False - for value in data[1:]: + html.write('<td class=total><a target="main" href="%s">%d</a></td>' % (url, amount)) + + for value, unhandled in [ (problems, False), (unhandled_problems, True) ]: url = html.makeuri_contextless([("view_name", view)] + extra_url_variables, filename="view.py") if unhandled: url += "&is_%s_acknowledged=0" % what text = link(str(value), url) html.write('<td class="%s">%s</td>' % (value == 0 and " " or "states prob", text)) - unhandled = True + + url = html.makeuri_contextless([("view_name", stale_view)] + extra_url_variables, filename="view.py") + text = link(str(stales), url) + html.write('<td class="%s">%s</td>' % (stales == 0 and " " or "states prob", text)) + html.write("</tr>\n") html.write("</table>\n") @@ -656,7 +668,7 @@ table.tacticaloverview th { vertical-align: bottom; } table.tacticaloverview td { - width: 33.3%%; + width: 25%%; text-align: right; /* border: 1px solid #123a4a; */ background-color: #6da1b8; diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3dd1e57..f905f88 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1710,6 +1710,30 @@ multisite_builtin_views.update({ 'title': _('Stale services'), 'topic': _('Problems'), 'user_sortable': 'on'}, + 'stale_hosts' : {'browser_reload': 30, + 'column_headers': 'pergroup', + 'datasource': 'hosts', + 'description': _('Hosts that have not been checked for too long.'), + 'group_painters': [('sitealias', None)], + 'hard_filters': ['host_staleness'], + 'hard_filtervars': [('is_host_staleness', '1')], + 'hidden': True, + 'hide_filters': [], + 'hidebutton': False, + 'icon': None, + 'layout': 'boxed', + 'mobile': False, + 'mustsearch': False, + 'name': 'stale_hosts', + 'num_columns': 1, + 'painters': host_view_painters, + 'play_sounds': False, + 'public': True, + 'show_filters': [], + 'sorters': [('site_host', False), ('host_name', False)], + 'title': _('Stale hosts'), + 'topic': _('Problems'), + 'user_sortable': 'on'}, 'events': {'browser_reload': 0, 'column_headers': 'pergroup', 'datasource': 'log_events',

7 years, 10 months

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 37646756a4d14a430f10d6bce27c371a50a0a558 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37646756a4d14a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 29 13:24:44 2016 +0200 updated werk --- .werks/3864 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3864 b/.werks/3864 index 6537c99..1dea583 100644 --- a/.werks/3864 +++ b/.werks/3864 @@ -1,6 +1,6 @@ Title: tactical overview now shows the number of stale hosts and services Level: 1 -Component: checks +Component: multisite Compatible: compat Version: 1.4.0i1 Date: 1472469803 diff --git a/ChangeLog b/ChangeLog index 9edb61e..572aae1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -145,7 +145,6 @@ * 3793 f5_bigip_vserver: traffic and packet levels are now configurable * 3794 f5_bigip_snat: now able to configure levels * 3795 cisco_cpu_multiitem: monitors the cpu utilization of each cpu - * 3864 tactical overview now shows the number of stale hosts and services * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters @@ -386,6 +385,7 @@ * 3640 new filter option for status details: can now be negated * 3713 new filter: hosts with certain service problems * 3780 availability: now limit of fetched logfile rows is configurable. + * 3864 tactical overview now shows the number of stale hosts and services * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 9f9e09e0dccefcae29fa4476d483bb16cef75ea4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f9e09e0dccefc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 29 12:11:18 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/AttributelistColumn.cc | 7 ++--- livestatus/src/InputBuffer.cc | 23 ++++++++-------- livestatus/src/LogCache.cc | 18 +++++++------ livestatus/src/Logfile.cc | 48 +++++++++++++++------------------ livestatus/src/VariadicFilter.cc | 12 ++++----- 5 files changed, 52 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9f9e09e0dc…

7 years, 10 months

3795 cisco_cpu_multiitem: monitors the cpu utilization of each cpu

by Andreas Boesl

Module: check_mk Branch: master Commit: e2bdcaf4445dc501ca349593a0c6cb7b5d32ded1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2bdcaf4445dc5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 29 11:35:12 2016 +0200 3795 cisco_cpu_multiitem: monitors the cpu utilization of each cpu --- .werks/3795 | 9 +++++ ChangeLog | 1 + checkman/cisco_cpu_multiitem | 14 +++++++ checks/cisco_cpu_multiitem | 91 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) diff --git a/.werks/3795 b/.werks/3795 new file mode 100644 index 0000000..a8b683b --- /dev/null +++ b/.werks/3795 @@ -0,0 +1,9 @@ +Title: cisco_cpu_multiitem: monitors the cpu utilization of each cpu +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472463239 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 69eae53..bb371e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -144,6 +144,7 @@ * 3863 didactum_sensors_analog, didactum_sensors_analog.voltage, didactum_sensors_discrete: new checks which monitor the temperature, voltage and discrete sensors of Didactum devices which support the DIDACTUM-SYSTEM-MIB * 3793 f5_bigip_vserver: traffic and packet levels are now configurable * 3794 f5_bigip_snat: now able to configure levels + * 3795 cisco_cpu_multiitem: monitors the cpu utilization of each cpu * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/cisco_cpu_multiitem b/checkman/cisco_cpu_multiitem new file mode 100644 index 0000000..893a5f3 --- /dev/null +++ b/checkman/cisco_cpu_multiitem @@ -0,0 +1,14 @@ +title: CPU utilization of the last 5 minutes +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + Check CPU utilization of the last 5 minutes in percent on Cisco devices. + +perfdata: + One value: The CPU utilization of the last 5 minutes in percent. + +inventory: + One service per CPU + diff --git a/checks/cisco_cpu_multiitem b/checks/cisco_cpu_multiitem new file mode 100644 index 0000000..bb01674 --- /dev/null +++ b/checks/cisco_cpu_multiitem @@ -0,0 +1,91 @@ +#!/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- +# tails. 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. + +factory_settings['cisco_cpu_multiitem_default_levels'] = { + 'levels' : ( 80.0, 90.0 ), +} + +def parse_cisco_cpu_multiitem(info): + ph_idx_to_desc = {} + cpus = {} + for idx, desc in info[1]: + if desc.lower().startswith("cpu "): + desc = desc[4:] + ph_idx_to_desc[idx] = desc + + for idx, util in info[0]: + if idx in ph_idx_to_desc: + name = ph_idx_to_desc[idx] + else: + name = idx + cpus[name] = { + 'util': float(util), + } + return cpus + +def inventory_cisco_cpu_multiitem(parsed): + for name in parsed: + yield name, {} + +def check_cisco_cpu_multiitem(item, params, parsed): + warn, crit = params['levels'] + if item in parsed: + util = parsed[item]['util'] + + state = 0 + if util >= crit: + state = 2 + elif util >= warn: + state = 1 + + infotext = "%s%% utilization in the last 5 minutes" % util + if state > 0: + infotext += " (warn/crit at %s%%/%s%%)" % (warn, crit) + + yield state, infotext, [("util", util, warn, crit, 0, 100)] + + else: + yield 3, "No information about the CPU utilization available" + +check_info["cisco_cpu_multiitem"] = { + 'parse_function' : parse_cisco_cpu_multiitem, + 'check_function' : check_cisco_cpu_multiitem, + 'inventory_function' : inventory_cisco_cpu_multiitem, + "group" : "cpu_utilization_multiitem", + "default_levels_variable" : "cisco_cpu_multiitem_default_levels", + 'service_description' : 'CPU utilization %s', + 'has_perfdata' : True, + 'snmp_info' : [('.1.3.6.1.4.1.9.9.109.1.1.1', [ + '1.2', # cpmCPUTotalPhysicalIndex + '1.8', # cpmCPUTotal5minRev + ]), + ('.1.3.6.1.2.1.47.1.1.1', [ + OID_END, #OID index + '1.7', # entPhysicalName + ])], + 'snmp_scan_function' : lambda oid: 'cisco' in oid('.1.3.6.1.2.1.1.1.0').lower() and \ + oid('.1.3.6.1.4.1.9.9.109.1.1.1.*') != None, +}

7 years, 10 months

fixed comment

by Andreas Boesl

Module: check_mk Branch: master Commit: 9bce5613237132715b1a3e1fd95e7b8990dfe39a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bce5613237132… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 29 11:09:12 2016 +0200 fixed comment --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index efba29f..45619ce 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -342,7 +342,7 @@ register_check_parameters( ] ), TextAscii( - title = _("Source NAT name"), + title = _("Source NAT Name"), allow_empty = False ), 'dict'

7 years, 10 months

3794 f5_bigip_snat: now able to configure levels

by Andreas Boesl

Module: check_mk Branch: master Commit: eb64a4de7fc45863972ad1aaa953f79dad3681ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb64a4de7fc458… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 29 11:08:34 2016 +0200 3794 f5_bigip_snat: now able to configure levels --- .werks/3794 | 9 +++ ChangeLog | 1 + checks/f5_bigip_snat | 27 +++++++- web/plugins/wato/check_parameters.py | 114 ++++++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 2 deletions(-) diff --git a/.werks/3794 b/.werks/3794 new file mode 100644 index 0000000..10f2b6c --- /dev/null +++ b/.werks/3794 @@ -0,0 +1,9 @@ +Title: f5_bigip_snat: now able to configure levels +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472461691 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e3838d2..69eae53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -143,6 +143,7 @@ NOTE: Please refer to the migration notes! * 3863 didactum_sensors_analog, didactum_sensors_analog.voltage, didactum_sensors_discrete: new checks which monitor the temperature, voltage and discrete sensors of Didactum devices which support the DIDACTUM-SYSTEM-MIB * 3793 f5_bigip_vserver: traffic and packet levels are now configurable + * 3794 f5_bigip_snat: now able to configure levels * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/f5_bigip_snat b/checks/f5_bigip_snat index 64a8e66..5075aa7 100644 --- a/checks/f5_bigip_snat +++ b/checks/f5_bigip_snat @@ -39,9 +39,9 @@ def parse_f5_bigip_snat(info): def inventory_f5_bigip_snat(parsed): for name, snat in parsed.items(): - yield name, None + yield name, {} -def check_f5_bigip_snat(item, _no_params, parsed): +def check_f5_bigip_snat(item, params, parsed): if item in parsed: snat = parsed[item] @@ -72,10 +72,33 @@ def check_f5_bigip_snat(item, _no_params, parsed): # New connections per time yield 0, "Rate: %.2f/sec" % summed_values["connections_rate"] + # Check configured limits + map_paramvar_to_text = { + "if_in_octets": "Incoming Bytes", + "if_out_octets": "Outgoing Bytes", + "if_total_octets": "Total Bytes", + "if_in_pkts": "Incoming Packets", + "if_out_pkts": "Outgoing Packets", + "if_total_pkts": "Total Packets", + } + summed_values["if_total_octets"] = summed_values["if_in_octets"] + summed_values["if_out_octets"] + summed_values["if_total_pkts"] = summed_values["if_in_pkts"] + summed_values["if_out_pkts"] + for param_var, levels in params.items(): + if param_var.endswith("_lower") and type(levels) == tuple: + levels = (None, None) + levels + value = summed_values[param_var.rstrip("_lower")] + state, extra_text, extra_perfdata = check_levels(value, param_var, levels) + if state: + if "octets" in param_var: + value = get_bytes_human_readable(value, base = 1000.0) + yield state, "%s: %s%s" % (map_paramvar_to_text[param_var.rstrip("_lower")], value, extra_text) + + check_info["f5_bigip_snat"] = { "parse_function" : parse_f5_bigip_snat, "check_function" : check_f5_bigip_snat, "inventory_function" : inventory_f5_bigip_snat, + "group" : "f5_bigip_snat", "service_description" : "Source NAT %s", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.3375.2.2.9.2.3.1", [ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9468a78..efba29f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -237,6 +237,120 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "f5_bigip_snat", + _("F5 Loadbalancer Source NAT"), + Dictionary( + elements = [ + ( "if_in_octets", + Levels( + title = _("Incoming Traffic Maximum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_in_octets_lower", + Levels( + title = _("Incoming Traffic Minimum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_octets", + Levels( + title = _("Outgoing Traffic Maximum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_octets_lower", + Levels( + title = _("Outgoing Traffic Minimum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_octets", + Levels( + title = _("Total Traffic Maximum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_octets_lower", + Levels( + title = _("Total Traffic Minimum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + + + ( "if_in_pkts", + Levels( + title = _("Incoming Packets Maximum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_in_pkts_lower", + Levels( + title = _("Incoming Packets Minimum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_pkts", + Levels( + title = _("Outgoing Packets Maximum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_pkts_lower", + Levels( + title = _("Outgoing Packets Minimum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_pkts", + Levels( + title = _("Total Packets Maximum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_pkts_lower", + Levels( + title = _("Total Packets Minimum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ) + ] + ), + TextAscii( + title = _("Source NAT name"), + allow_empty = False + ), + 'dict' +) + + +register_check_parameters( + subgroup_applications, "f5_bigip_vserver", _("F5 Loadbalancer VServer"), Dictionary(

7 years, 10 months

3793 f5_bigip_vserver: traffic and packet levels are now configurable

by Andreas Boesl

Module: check_mk Branch: master Commit: 76104c5e198c6b924658e0376a97c3d48c2b70d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76104c5e198c6b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 29 10:57:12 2016 +0200 3793 f5_bigip_vserver: traffic and packet levels are now configurable --- .werks/3793 | 9 +++ ChangeLog | 1 + checks/f5_bigip_vserver | 31 +++++++-- web/plugins/wato/check_parameters.py | 114 ++++++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 5 deletions(-) diff --git a/.werks/3793 b/.werks/3793 new file mode 100644 index 0000000..8f969b0 --- /dev/null +++ b/.werks/3793 @@ -0,0 +1,9 @@ +Title: f5_bigip_vserver: traffic and packet levels are now configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472461003 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5bbf15c..e3838d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -142,6 +142,7 @@ * 3743 SEC: mk_jolokia: Use JSON library to parse JSON output in lieu of eval()... NOTE: Please refer to the migration notes! * 3863 didactum_sensors_analog, didactum_sensors_analog.voltage, didactum_sensors_discrete: new checks which monitor the temperature, voltage and discrete sensors of Didactum devices which support the DIDACTUM-SYSTEM-MIB + * 3793 f5_bigip_vserver: traffic and packet levels are now configurable * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index 198aa3e..bfaa309 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -60,10 +60,10 @@ def parse_f5_bigip_vserver(info): def inventory_f5_bigip_vserver(parsed): for name, vserver in parsed.items(): if vserver["status"][0] in [1, 4]: # Green and Blue - yield name, None + yield name, {} -def check_f5_bigip_vserver(item, _no_params, parsed): +def check_f5_bigip_vserver(item, params, parsed): if item in parsed: vserver = parsed[item] @@ -96,10 +96,8 @@ def check_f5_bigip_vserver(item, _no_params, parsed): summed_values[what] = function(value_list) - perfdata = map(lambda x: (x[0], x[1]), summed_values.items()) - # Current number of connections - yield 0, "Client connections: %d" % summed_values["connections"], perfdata + yield 0, "Client connections: %d" % summed_values["connections"], summed_values.items() # New connections per time yield 0, "Rate: %.2f/sec" % summed_values["connections_rate"] @@ -142,10 +140,33 @@ def check_f5_bigip_vserver(item, _no_params, parsed): yield state, output + # Check configured limits + map_paramvar_to_text = { + "if_in_octets": "Incoming Bytes", + "if_out_octets": "Outgoing Bytes", + "if_total_octets": "Total Bytes", + "if_in_pkts": "Incoming Packets", + "if_out_pkts": "Outgoing Packets", + "if_total_pkts": "Total Packets", + } + summed_values["if_total_octets"] = summed_values["if_in_octets"] + summed_values["if_out_octets"] + summed_values["if_total_pkts"] = summed_values["if_in_pkts"] + summed_values["if_out_pkts"] + for param_var, levels in params.items(): + if param_var.endswith("_lower") and type(levels) == tuple: + levels = (None, None) + levels + value = summed_values[param_var.rstrip("_lower")] + state, extra_text, extra_perfdata = check_levels(value, param_var, levels) + if state: + if "octets" in param_var: + value = get_bytes_human_readable(value, base = 1000.0) + yield state, "%s: %s%s" % (map_paramvar_to_text[param_var.rstrip("_lower")], value, extra_text) + + check_info["f5_bigip_vserver"] = { "parse_function" : parse_f5_bigip_vserver, "check_function" : check_f5_bigip_vserver, "inventory_function" : inventory_f5_bigip_vserver, + "group" : "f5_bigip_vserver", "service_description" : "Virtual Server %s", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.3375.2.2.10", [ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ad297ff..9468a78 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -237,6 +237,120 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "f5_bigip_vserver", + _("F5 Loadbalancer VServer"), + Dictionary( + elements = [ + ( "if_in_octets", + Levels( + title = _("Incoming Traffic Maximum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_in_octets_lower", + Levels( + title = _("Incoming Traffic Minimum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_octets", + Levels( + title = _("Outgoing Traffic Maximum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_octets_lower", + Levels( + title = _("Outgoing Traffic Minimum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_octets", + Levels( + title = _("Total Traffic Maximum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_octets_lower", + Levels( + title = _("Total Traffic Minimum"), + unit = _("bytes/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + + + ( "if_in_pkts", + Levels( + title = _("Incoming Packets Maximum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_in_pkts_lower", + Levels( + title = _("Incoming Packets Minimum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_pkts", + Levels( + title = _("Outgoing Packets Maximum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_out_pkts_lower", + Levels( + title = _("Outgoing Packets Minimum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_pkts", + Levels( + title = _("Total Packets Maximum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ), + ( "if_total_pkts_lower", + Levels( + title = _("Total Packets Minimum"), + unit = _("packets/s"), + default_difference = (5, 8), + default_value = None, + ), + ) + ] + ), + TextAscii( + title = _("VServer name"), + allow_empty = False + ), + 'dict' +) + + +register_check_parameters( + subgroup_applications, "cluster_status", _("Cluster status"), Dictionary(

7 years, 10 months

3863 didactum_sensors_analog, didactum_sensors_analog.voltage,

by Simon Betz

didactum_sensors_discrete: new checks which monitor the temperature, voltage and discrete sensors of Didactum devices which support the DIDACTUM-SYSTEM-MIB Message-ID: <57c3f5bf.O8+EfFLcXQDnBomH%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c3b0b204f8615c4312ec5c7b17d388c251509020 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3b0b204f8615c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 29 10:43:37 2016 +0200 3863 didactum_sensors_analog, didactum_sensors_analog.voltage, didactum_sensors_discrete: new checks which monitor the temperature, voltage and discrete sensors of Didactum devices which support the DIDACTUM-SYSTEM-MIB --- .werks/3863 | 9 +++ ChangeLog | 1 + checkman/didactum_sensors_analog | 17 ++++ checkman/didactum_sensors_analog.voltage | 17 ++++ checkman/didactum_sensors_discrete | 14 ++++ checks/didactum.include | 76 ++++++++++++++++++ checks/didactum_sensors_analog | 125 ++++++++++++++++++++++++++++++ checks/didactum_sensors_discrete | 65 ++++++++++++++++ 8 files changed, 324 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c3b0b204f8…

7 years, 10 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 1cc5e25908e0ea04946ee7f4d716e7f360fc35a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cc5e25908e0ea… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 29 10:42:35 2016 +0200 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 7f5b8d7..ae66aa4 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3863 +3873

7 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016