Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Revert "3866 f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices"

by Simon Betz

Module: check_mk Branch: master Commit: 10ab98a910da793556252634bf4459f33447c13f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10ab98a910da79… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 31 17:12:03 2016 +0200 Revert "3866 f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices" This check already exists This reverts commit abefd6353d353e614f3e75647073c4443d72e202. --- .werks/3866 | 9 ----- ChangeLog | 1 - checkman/f5_bigip_cluster_failover | 19 ---------- checks/f5_bigip_cluster_failover | 67 ---------------------------------- web/plugins/wato/check_parameters.py | 18 --------- 5 files changed, 114 deletions(-) diff --git a/.werks/3866 b/.werks/3866 deleted file mode 100644 index 998adc3..0000000 --- a/.werks/3866 +++ /dev/null @@ -1,9 +0,0 @@ -Title: f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices -Level: 1 -Component: checks -Compatible: compat -Version: 1.4.0i1 -Date: 1472651393 -Class: feature - - diff --git a/ChangeLog b/ChangeLog index 21f902e..d43b52f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -150,7 +150,6 @@ * 3797 Check_MK Check helpers: Decreased memory consumption in distributed setups... * 3865 oracle_sessions: now relative levels for sessions are configurable... * 3647 check_http: Improved rendering of the extended performance data - * 3866 f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices * 3867 filter 'Servicegroup (Regex)' can be negated * 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 diff --git a/checkman/f5_bigip_cluster_failover b/checkman/f5_bigip_cluster_failover deleted file mode 100644 index ba69fc6..0000000 --- a/checkman/f5_bigip_cluster_failover +++ /dev/null @@ -1,19 +0,0 @@ -title: F5 Big-IP: Cluster failover state -agents: snmp -catalog: hw/network/f5 -license: GPL -distribution: check_mk -description: - The check monitors the failover cluster state of F5 BIG-IP loadbalancers (local traffic managers). - The default states are treated as follows: - unknown (0) is UNKNOWN, - offline (1) is CRIT, - forced offline (2) is CRIT, - standby (3) is OK, - active (4) is OK, - - Moreover these levels are configurable. - -inventory: - One service is created. - diff --git a/checks/f5_bigip_cluster_failover b/checks/f5_bigip_cluster_failover deleted file mode 100644 index c38af9d..0000000 --- a/checks/f5_bigip_cluster_failover +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2016 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. - - -# .1.3.6.1.4.1.3375.2.1.14.1.4.0 --> F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusId -# .1.3.6.1.4.1.3375.2.1.14.3.4.0 1/1 active --> F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusDetails -# See also https://support.f5.com/kb/en-us/solutions/public/14000/300/sol14399.html - - -def inventory_f5_bigip_cluster_failover(info): - if info: - return [ (None, {}) ] - - -def check_f5_bigip_cluster_failover(_no_item, params, info): - map_states = { - "0" : (3, "unknown"), - "1" : (2, "offline"), - "2" : (2, "forced offline"), - "3" : (0, "standby"), - "4" : (0, "active"), - } - - failover_state, details = info[0] - default_state, state_readable = map_states[failover_state] - if failover_state in params: - state = params[failover_state] - else: - state = default_state - return state, 'Status: %s, Details: %s' % (state_readable, details) - - -check_info['f5_bigip_cluster_failover'] = { - 'inventory_function' : inventory_f5_bigip_cluster_failover, - 'check_function' : check_f5_bigip_cluster_failover, - 'service_description' : 'Cluster failover status', - 'snmp_info' : ('.1.3.6.1.4.1.3375.2.1.14.3', [ - "1", # F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusId - "4", # F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusDetails - ]), - 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in oid('.1.3.6.1.2.1.1.2.0') and \ - 'big-ip' in oid('.1.3.6.1.4.1.3375.2.1.4.1.0').lower(), - 'group' : 'f5_bigip_cluster_failover_state', -} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9407fd0..f6eae09 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -236,24 +236,6 @@ register_check_parameters( ) register_check_parameters( - subgroup_networking, - "f5_bigip_cluster_failover_state", - _("Failover cluster state for F5 BigIP devices"), - Dictionary( - title = _("Interpretation of failover cluster state"), - elements = [ - ("0", MonitoringState(title = "Unknown", default_value = 3)), - ("1", MonitoringState(title = "Offline", default_value = 2)), - ("2", MonitoringState(title = "Forced offline", default_value = 2)), - ("3", MonitoringState(title = "Standby", default_value = 0)), - ("4", MonitoringState(title = "Active", default_value = 0)), - ] - ), - None, - "dict" -) - -register_check_parameters( subgroup_applications, "f5_bigip_snat", _("F5 Loadbalancer Source NAT"),

8 years

Fixed another issue when configuring a management board for hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: b9b445db6b00c29ab39f944bd81341182b32764c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9b445db6b00c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 17:06:03 2016 +0200 Fixed another issue when configuring a management board for hosts --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 704e71b..e0a29f3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1521,7 +1521,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag for checkname, item, params, description, aggrname in check_table: if is_snmp_check(checkname) and is_management_snmp: - address = management_address + address = management_addr else: address = ipaddress

8 years

3867 filter 'Servicegroup (Regex)' can be negated

by Simon Betz

Module: check_mk Branch: master Commit: ac7c0eaf85c9d398eae2d1582d9b2d6b6a5edb24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac7c0eaf85c9d3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 31 16:52:07 2016 +0200 3867 filter 'Servicegroup (Regex)' can be negated --- .werks/3867 | 9 +++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3867 b/.werks/3867 new file mode 100644 index 0000000..e938d41 --- /dev/null +++ b/.werks/3867 @@ -0,0 +1,9 @@ +Title: filter 'Servicegroup (Regex)' can be negated +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472655066 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4db299d..21f902e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,6 +151,7 @@ * 3865 oracle_sessions: now relative levels for sessions are configurable... * 3647 check_http: Improved rendering of the extended performance data * 3866 f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices + * 3867 filter 'Servicegroup (Regex)' can be negated * 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/visuals/filters.py b/web/plugins/visuals/filters.py index 9fda7b6..f51a0dc 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -432,7 +432,7 @@ declare_filter(101, FilterText("hostgroupnameregex", _("Hostgroup (Regex)"), declare_filter(102, FilterHostgroupVisibility("hostgroupvisibility", _("Empty Hostgroup Visibilitiy")), _("You can enable this checkbox to show empty hostgroups")) -declare_filter(101, FilterText("servicegroupnameregex", _("Servicegroup (Regex)"), "servicegroup", "servicegroup_name", "servicegroup_regex", "~~"), +declare_filter(101, FilterText("servicegroupnameregex", _("Servicegroup (Regex)"), "servicegroup", "servicegroup_name", "servicegroup_regex", "~~", negateable=True), _("Search field allowing regular expression and partial matches")) declare_filter(101, FilterText("servicegroupname", _("Servicegroup (enforced)"), "servicegroup", "servicegroup_name", "servicegroup_name", "="),

8 years

moved helper function

by Lars Michelsen

Module: check_mk Branch: master Commit: 5df8cc0afbd5641b4e57949717ec853df682d7e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5df8cc0afbd564… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 16:00:35 2016 +0200 moved helper function --- web/htdocs/views.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f30a2c1..afea5b9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1173,6 +1173,16 @@ class Cell(object): # Same as self.render() for HTML output: Gets a painter and a data # row and creates the text for being painted. def render_for_pdf(self, row, time_range): + # TODO: Move this somewhere else! + def find_htdocs_image_path(filename): + dirs = [ + defaults.omd_root + "/local/share/check_mk/web/htdocs/", + defaults.omd_root + "/share/check_mk/web/htdocs/", + ] + for d in dirs: + if os.path.exists(d + filename): + return d + filename + try: row = join_row(row, self) css_classes, txt = self.render_content(row)

8 years

Fixed linter error

by Lars Michelsen

Module: check_mk Branch: master Commit: b1f9e204db47a8f27e27a467adfbbd4944ef9458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1f9e204db47a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 15:50:56 2016 +0200 Fixed linter error --- web/htdocs/views.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7ed146b..f30a2c1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1006,6 +1006,10 @@ class Cell(object): return False + def join_service(self): + return None + + def _has_link(self): return self._link_view_name != None @@ -1105,6 +1109,7 @@ class Cell(object): # - Add in the front of the user sorters when not set sorter_name = get_sorter_name_of_painter(self.painter_name()) if self.is_joined(): + # TODO: Clean this up and then remove Cell.join_service() this_asc_sorter = (sorter_name, False, self.join_service()) this_desc_sorter = (sorter_name, True, self.join_service()) else: @@ -1114,9 +1119,11 @@ class Cell(object): if user_sort and this_asc_sorter == user_sort[0]: # Second click: Change from asc to desc order sorter[sorter.index(this_asc_sorter)] = this_desc_sorter + elif user_sort and this_desc_sorter == user_sort[0]: # Third click: Remove this sorter sorter.remove(this_desc_sorter) + else: # First click: add this sorter as primary user sorter # Maybe the sorter is already in the user sorters or view sorters, remove it

8 years

3866 f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices

by Simon Betz

Module: check_mk Branch: master Commit: abefd6353d353e614f3e75647073c4443d72e202 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abefd6353d353e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 31 15:50:32 2016 +0200 3866 f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices --- .werks/3866 | 9 +++++ ChangeLog | 1 + checkman/f5_bigip_cluster_failover | 19 ++++++++++ checks/f5_bigip_cluster_failover | 67 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 18 +++++++++ 5 files changed, 114 insertions(+) diff --git a/.werks/3866 b/.werks/3866 new file mode 100644 index 0000000..998adc3 --- /dev/null +++ b/.werks/3866 @@ -0,0 +1,9 @@ +Title: f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472651393 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a5a001b..4db299d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -150,6 +150,7 @@ * 3797 Check_MK Check helpers: Decreased memory consumption in distributed setups... * 3865 oracle_sessions: now relative levels for sessions are configurable... * 3647 check_http: Improved rendering of the extended performance data + * 3866 f5_bigip_cluster_failover: new check which monitors the cluster failover status of F5 BigIP devices * 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/f5_bigip_cluster_failover b/checkman/f5_bigip_cluster_failover new file mode 100644 index 0000000..ba69fc6 --- /dev/null +++ b/checkman/f5_bigip_cluster_failover @@ -0,0 +1,19 @@ +title: F5 Big-IP: Cluster failover state +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check monitors the failover cluster state of F5 BIG-IP loadbalancers (local traffic managers). + The default states are treated as follows: + unknown (0) is UNKNOWN, + offline (1) is CRIT, + forced offline (2) is CRIT, + standby (3) is OK, + active (4) is OK, + + Moreover these levels are configurable. + +inventory: + One service is created. + diff --git a/checks/f5_bigip_cluster_failover b/checks/f5_bigip_cluster_failover new file mode 100644 index 0000000..c38af9d --- /dev/null +++ b/checks/f5_bigip_cluster_failover @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + + +# .1.3.6.1.4.1.3375.2.1.14.1.4.0 --> F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusId +# .1.3.6.1.4.1.3375.2.1.14.3.4.0 1/1 active --> F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusDetails +# See also https://support.f5.com/kb/en-us/solutions/public/14000/300/sol14399.html + + +def inventory_f5_bigip_cluster_failover(info): + if info: + return [ (None, {}) ] + + +def check_f5_bigip_cluster_failover(_no_item, params, info): + map_states = { + "0" : (3, "unknown"), + "1" : (2, "offline"), + "2" : (2, "forced offline"), + "3" : (0, "standby"), + "4" : (0, "active"), + } + + failover_state, details = info[0] + default_state, state_readable = map_states[failover_state] + if failover_state in params: + state = params[failover_state] + else: + state = default_state + return state, 'Status: %s, Details: %s' % (state_readable, details) + + +check_info['f5_bigip_cluster_failover'] = { + 'inventory_function' : inventory_f5_bigip_cluster_failover, + 'check_function' : check_f5_bigip_cluster_failover, + 'service_description' : 'Cluster failover status', + 'snmp_info' : ('.1.3.6.1.4.1.3375.2.1.14.3', [ + "1", # F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusId + "4", # F5-BIGIP-SYSTEM-MIB::sysCmFailoverStatusDetails + ]), + 'snmp_scan_function' : lambda oid: '.1.3.6.1.4.1.3375.2' in oid('.1.3.6.1.2.1.1.2.0') and \ + 'big-ip' in oid('.1.3.6.1.4.1.3375.2.1.4.1.0').lower(), + 'group' : 'f5_bigip_cluster_failover_state', +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f6eae09..9407fd0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -236,6 +236,24 @@ register_check_parameters( ) register_check_parameters( + subgroup_networking, + "f5_bigip_cluster_failover_state", + _("Failover cluster state for F5 BigIP devices"), + Dictionary( + title = _("Interpretation of failover cluster state"), + elements = [ + ("0", MonitoringState(title = "Unknown", default_value = 3)), + ("1", MonitoringState(title = "Offline", default_value = 2)), + ("2", MonitoringState(title = "Forced offline", default_value = 2)), + ("3", MonitoringState(title = "Standby", default_value = 0)), + ("4", MonitoringState(title = "Active", default_value = 0)), + ] + ), + None, + "dict" +) + +register_check_parameters( subgroup_applications, "f5_bigip_snat", _("F5 Loadbalancer Source NAT"),

8 years

Views: Refactoring of painter handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 22555361fcf3807cf403fbdeee22bf4049324b51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22555361fcf380… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 14:50:06 2016 +0200 Views: Refactoring of painter handling --- web/htdocs/views.py | 826 ++++++++++++++++++++++++++------------- web/plugins/views/layouts.py | 219 +++++------ web/plugins/views/mobile.py | 62 ++- web/plugins/views/painters.py | 11 +- web/plugins/views/webservice.py | 40 +- 5 files changed, 716 insertions(+), 442 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=22555361fc…

8 years

Cascading dropdown can now have empty preselect on page load

by Lars Michelsen

Module: check_mk Branch: master Commit: ffff09c3ca175b3615bba4570338617de17285dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffff09c3ca175b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 31 08:17:26 2016 +0200 Cascading dropdown can now have empty preselect on page load --- web/htdocs/valuespec.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d4ddf73..e595093 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1486,6 +1486,11 @@ class CascadingDropdown(ValueSpec): self._no_elements_text = kwargs.get("no_elements_text", _("There are no elements defined for this selection")) + self._no_preselect = kwargs.get("no_preselect", False) + self._no_preselect_value = kwargs.get("no_preselect_value", None) + self._no_preselect_title = kwargs.get("no_preselect_title", "") # if not preselected + self._no_preselect_error = kwargs.get("no_preselect_error", _("Please make a selection")) + def normalize_choices(self, choices): new_choices = [] @@ -1495,11 +1500,19 @@ class CascadingDropdown(ValueSpec): new_choices.append(entry) return new_choices + def choices(self): if type(self._choices) == list: - return self._choices + result = self._choices else: - return self.normalize_choices(self._choices()) + result = self.normalize_choices(self._choices()) + + if self._no_preselect: + result = [(self._no_preselect_value, self._no_preselect_title, None)] \ + + result + + return result + def canonical_value(self): choices = self.choices() @@ -1623,6 +1636,9 @@ class CascadingDropdown(ValueSpec): raise MKUserError(varprefix, _("Value %r is not allowed here.") % value) def validate_value(self, value, varprefix): + if self._no_preselect and value == self._no_preselect_value: + raise MKUserError(varprefix, self._no_preselect_error) + choices = self.choices() for nr, (val, title, vs) in enumerate(choices): if value == val or (

8 years

3647 check_http: Improved rendering of the extended performance data

by Sven Panne

Module: check_mk Branch: master Commit: 2d228f5f440db40d8823f1b3a9f44b151a4234a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d228f5f440db4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 31 14:41:41 2016 +0200 3647 check_http: Improved rendering of the extended performance data --- .werks/3647 | 9 ++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 43 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/.werks/3647 b/.werks/3647 new file mode 100644 index 0000000..314e824 --- /dev/null +++ b/.werks/3647 @@ -0,0 +1,9 @@ +Title: check_http: Improved rendering of the extended performance data +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472647266 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6b27a0e..a5a001b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ * 3796 agent_vsphere: new option allows monitoring of ESX hostsystem and windows agent * 3797 Check_MK Check helpers: Decreased memory consumption in distributed setups... * 3865 oracle_sessions: now relative levels for sessions are configurable... + * 3647 check_http: Improved rendering of the extended performance data * 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/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index acec30c..bc810a1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2846,6 +2846,36 @@ metric_info["http_bandwidth"] = { "color" : "53/b", } +metric_info["time_connect"] = { + "title" : _("Time to connect"), + "unit" : "s", + "color" : "11/a", +} + +metric_info["time_ssl"] = { + "title" : _("Time to negotiate SSL"), + "unit" : "s", + "color" : "13/a", +} + +metric_info["time_headers"] = { + "title" : _("Time to send request"), + "unit" : "s", + "color" : "15/a", +} + +metric_info["time_firstbyte"] = { + "title" : _("Time to receive start of response"), + "unit" : "s", + "color" : "26/a", +} + +metric_info["time_transfer"] = { + "title" : _("Time to receive full response"), + "unit" : "s", + "color" : "41/a", +} + for volume_info in [ "NFS", "NFSv4", "CIFS", "SAN", "FCP", "ISCSI" ]: for what, unit in [ ("data", "bytes"), ("latency", "s"), ("ios", "1/s") ]: @@ -7169,3 +7199,16 @@ graph_info.append({ ( "connections_duration_mean", "line" ), ] }) + +graph_info.append({ + "title" : _("HTTP Timings"), + "metrics" : [ + ( "time_connect", "area", _("Connect") ), + ( "time_ssl", "stack", _("Negotiate SSL") ), + ( "time_headers", "stack", _("Send request") ), + ( "time_transfer", "stack", _("Receive full response") ), + ( "time_firstbyte", "line", _("Receive start of response") ), + ( "response_time", "line", _("Roundtrip") ), + ], + "optional_metrics" : [ "time_ssl" ], +})

8 years

FIX searching for statgrab in FreeBSD agent, thanks to Johannes Sauerbier for reporting this issue

by Marcel Schulte

Module: check_mk Branch: master Commit: 61bc5b77d5d945ccab0d2d9a85be130b9ba0f376 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61bc5b77d5d945… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Aug 31 12:30:36 2016 +0200 FIX searching for statgrab in FreeBSD agent, thanks to Johannes Sauerbier for reporting this issue --- agents/check_mk_agent.freebsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index a1b1100..31448b7 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -350,7 +350,7 @@ fi # Statgrab # To install: pkg install libstatgrab -if type statgrab 2>&1 >/dev/null ; then +if type statgrab >/dev/null 2>&1 ; then statgrab_vars="const. disk. general. page. proc. user." statgrab_vars_mem="mem. swap."

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016