Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: d0b1ff42b301c751f252d296b7a48ef11f9359f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0b1ff42b301c7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 26 14:13:56 2016 +0100 Added comment --- web/plugins/metrics/check_mk.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b257b9a..7563d30 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3546,6 +3546,9 @@ check_metrics["check_mk-ps.perf"] = ps_translation # | Definition of Perf-O-Meters | # '----------------------------------------------------------------------' +# If multiple Perf-O-Meters apply, the first applicable Perf-O-Meter in the list will +# be the one appearing in the GUI. + # Types of Perf-O-Meters: # linear -> multiple values added from left to right # logarithmic -> one value in a logarithmic scale

8 years, 7 months

Added comment

by Konstantin Büttner

Module: check_mk Branch: master Commit: bf2a71b52756c857fbca6046853c8e82205f691c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf2a71b52756c8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 26 14:05:42 2016 +0100 Added comment --- web/plugins/metrics/check_mk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fdea84b..b257b9a 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4508,6 +4508,10 @@ perfometer_info.append({ # | Definitions of time series graphs | # '----------------------------------------------------------------------' +# Beware: The order of the list elements of graph_info is actually important. +# It determines the order of graphs of a service, which in turn is used by +# the report definitions to determine which graph to include. + # Order of metrics in graph definitions important if you use only 'area': # The first one must be the bigger one, then descending. # Example: ('tablespace_size', 'area'),

8 years, 7 months

"Add to X" popup is now checking to which page types an element can be added to

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d75b9726573b40bb0ed5317a1d9cb92e6284ef3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d75b9726573b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 12:24:50 2016 +0100 "Add to X" popup is now checking to which page types an element can be added to --- web/htdocs/htmllib.py | 3 ++- web/htdocs/js/checkmk.js | 3 ++- web/htdocs/pagetypes.py | 12 ++++++++---- web/htdocs/visuals.py | 5 ++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4ee35fa..d93ef06 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1070,7 +1070,8 @@ class html(GUITester): self.popup_trigger( self.render_icon("menu", _("Add this view to..."), cssclass="statusicon iconbutton"), - 'add_visual', 'add_visual', data=[mode_name, encoded_vars, {'name': self.var('view_name')}]) + 'add_visual', 'add_visual', data=[mode_name, encoded_vars, {'name': self.var('view_name')}], + url_vars=[("add_type", "view")]) for img, tooltip in self.status_icons.items(): if type(tooltip) == tuple: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 65ef71c..3364329 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -772,7 +772,8 @@ function create_graph(data, params) { toggle_popup(event, this, 'add_visual', 'add_visual', ['pnpgraph', { 'host': host, 'service': service }, - { 'timerange': view, 'source': source }] + { 'timerange': view, 'source': source }], + "add_type=pnpgraph" ); } }(data['host'], data['service'], view, source); diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 9e332cc..86876f3 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -944,6 +944,12 @@ class Container: def sanitize(self, d): d.setdefault("elements", []) + # Which kind of elements are allowed to be added to this container? + # Defaulting to all possible elements. + @classmethod + def may_contain(self, element_type_name): + return True + def elements(self): return self._["elements"] @@ -1057,9 +1063,7 @@ def page_handlers(): return page_handlers -def render_addto_popup(): +def render_addto_popup(add_type): for page_type in page_types.values(): - # TODO: Wie sorgen wir dafür, dass nur geeignete Elemente zum hinzufügen - # angeboten werden? Eine View in eine GraphCollection macht keinen Sinn... - if issubclass(page_type, Container): + if issubclass(page_type, Container) and page_type.may_contain(add_type): page_type.render_addto_popup() diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index f5859dd..0d9a740 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1381,8 +1381,11 @@ def transform_old_visual(visual): # TODO: Remove this code as soon as everything is moved over to pagetypes.py def ajax_popup_add(): + add_type = html.var("add_type") + html.debug(add_type) + html.write("<ul>") - pagetypes.render_addto_popup() + pagetypes.render_addto_popup(add_type) for visual_type_name, visual_type in visual_types.items(): if "popup_add_handler" in visual_type:

8 years, 7 months

toggle_popup: Fixed adding of "null" as parameter

by Lars Michelsen

Module: check_mk Branch: master Commit: 6040fef14c7105df907fc22eb9643109575348df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6040fef14c7105… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 12:05:03 2016 +0100 toggle_popup: Fixed adding of "null" as parameter --- web/htdocs/js/checkmk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index b404297..65ef71c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2452,7 +2452,7 @@ function handle_popup_close(event) { // url_vars: vars are added to ajax_popup_*.py calls for rendering the popup menu function toggle_popup(event, trigger_obj, ident, what, data, url_vars) { - var url_vars = typeof(url_vars) === "undefined" ? '' : '?'+url_vars; + var url_vars = !url_vars ? '' : '?'+url_vars; if(!event) event = window.event;

8 years, 7 months

Fixed crash when encountering incorrect And/Or query (found by scan-build) .

by Sven Panne

Module: check_mk Branch: master Commit: 26c8f04ba1cccec96af13c9dfb355bdc58d34c11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26c8f04ba1ccce… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 26 11:59:16 2016 +0100 Fixed crash when encountering incorrect And/Or query (found by scan-build). --- livestatus/src/Query.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 3aaf548..956889d 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -338,6 +338,7 @@ void Query::parseStatsAndOrLine(char *line, int andor) if (!value) { _output->setError(RESPONSE_CODE_INVALID_HEADER, "Missing value for Stats%s: need non-zero integer number", andor == ANDOR_OR ? "Or" : "And"); + return; } int number = atoi(value);

8 years, 7 months

Make scan-build happy, a bit unclear if this is a real issue.

by Sven Panne

Module: check_mk Branch: master Commit: 85f5a7311835bb777d87fd9b157be618ccfb1e91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85f5a7311835bb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 26 11:59:39 2016 +0100 Make scan-build happy, a bit unclear if this is a real issue. --- livestatus/src/PerfdataAggregator.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index 82d16f7..589b7bd 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -140,6 +140,10 @@ void PerfdataAggregator::output(Query *q) else value = sqrt((it->second._sumq - (it->second._aggr * it->second._aggr) / it->second._count)/(it->second._count - 1)); break; + default: + value = 0; // should never happen, but the real problem is that + // _operation should beetter be a scoped enumeration. + break; } snprintf(format, sizeof(format), "%s=%.8f", it->first.c_str(), value); if (it != _aggr.begin())

8 years, 7 months

#2832 netscaler_vserver: improved check output for unknown protocols

by Andreas Boesl

Module: check_mk Branch: master Commit: a28662a74b3e58175ebcee978f430939078af8b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a28662a74b3e58… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 26 11:17:40 2016 +0100 #2832 netscaler_vserver: improved check output for unknown protocols This check now also shows the internal code number for the service type in the check output, e.g. serviceUnknown(50), in case it is not in the well known services list. --- .werks/2832 | 12 ++++++++++++ ChangeLog | 1 + checks/netscaler_vserver | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2832 b/.werks/2832 new file mode 100644 index 0000000..589249b --- /dev/null +++ b/.werks/2832 @@ -0,0 +1,12 @@ +Title: netscaler_vserver: improved check output for unknown protocols +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453803324 +Class: feature + +This check now also shows the internal code number for the service +type in the check output, e.g. serviceUnknown(50), in case it is not +in the well known services list. + diff --git a/ChangeLog b/ChangeLog index 6565f0b..44ea1aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * 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... + * 2832 netscaler_vserver: improved check output for unknown protocols... * 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/netscaler_vserver b/checks/netscaler_vserver index 1f8ea7c..14b5613 100644 --- a/checks/netscaler_vserver +++ b/checks/netscaler_vserver @@ -101,8 +101,8 @@ def check_netscaler_vserver(item, _no_params, info): health_state = 1 yield health_state, "Health at: %s%%" % health_perc, [("health_perc", health_perc, None, None, 0, 100)] - yield 0, "Type: %s" % netscaler_vserver_entitytypes.get(svr_entitytype , "unknown") - yield 0, "Protocol: %s" % netscaler_vserver_types.get(svr_type, "serviceUnknown") + yield 0, "Type: %s" % netscaler_vserver_entitytypes.get(svr_entitytype , "unknown (%s)" % svr_entitytype) + yield 0, "Protocol: %s" % netscaler_vserver_types.get(svr_type, "serviceUnknown (%s)" % svr_type) yield 0, "Socket: %s:%s" % (ip, port) check_info["netscaler_vserver"] = {

8 years, 7 months

minor code cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: c4cb36bf39e7071350798c062ab0156c42262430 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4cb36bf39e707… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 26 09:18:20 2016 +0100 minor code cleanup --- web/plugins/icons/builtin.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 6bf5905..9d6a83a 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -294,12 +294,6 @@ 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'): @@ -346,7 +340,7 @@ def pnp_graph_icon_link(row, what): if 'X' not in html.display_options: return "" - if not has_new_graphing(): + if not metrics.new_style_graphs_possible(): return pnp_url(row, what) else: return new_graphing_url(row, what) @@ -355,7 +349,7 @@ def pnp_graph_icon_link(row, what): def pnp_icon(row, what): url = pnp_graph_icon_link(row, what) - if not has_new_graphing(): + if not metrics.new_style_graphs_possible(): # 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)

8 years, 7 months

#2939 FIX winperf_phydisk: fixed permanent stall state if windows reports several disks with the same drive letter

by Sebastian Herbord

Module: check_mk Branch: master Commit: afcfeedf9ac67360eab533dc09e57d726681d416 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afcfeedf9ac673… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jan 26 08:39:13 2016 +0100 #2939 FIX winperf_phydisk: fixed permanent stall state if windows reports several disks with the same drive letter It's not completely clear what makes windows report statistics for multiple disks with the same letter but it was observed to happen in the wild. Most probably it is related to dynamic disks where one drive spans multiple physikal disks. --- .werks/2939 | 11 +++++++++++ ChangeLog | 1 + checks/winperf_phydisk | 10 +++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/2939 b/.werks/2939 new file mode 100644 index 0000000..6a4e07a --- /dev/null +++ b/.werks/2939 @@ -0,0 +1,11 @@ +Title: winperf_phydisk: fixed permanent stall state if windows reports several disks with the same drive letter +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453793706 +Class: fix + +It's not completely clear what makes windows report statistics for multiple disks with the same +letter but it was observed to happen in the wild. Most probably it is related to dynamic disks where +one drive spans multiple physikal disks. diff --git a/ChangeLog b/ChangeLog index 7b49a8c..6565f0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,6 +214,7 @@ * 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 + * 2939 FIX: winperf_phydisk: fixed permanent stall state if windows reports several disks with the same drive letter... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 91636e0..2c805ad 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -109,7 +109,15 @@ def winperf_phydisk_convert(info): if current_node != "": entries.extend(finalize_block(current_node)) current_node = line[0] - current_disks = [ d.split('_')[-1] for d in line[3:-1] ] + current_disks = [] + for disk_id in line[3:-1]: + disk_id = disk_id.split('_') + + if disk_id[-1] not in current_disks: + disk_id = disk_id[-1] + else: + disk_id = "%s_%s" % (disk_id[-1], disk_id[0]) + current_disks.append(disk_id) elif line[1] == '-14': current_disk_read_bytes = map(int, line[2:-2]) elif line[1] == '-12':

8 years, 7 months

Preparation for new style graph overview page

by Lars Michelsen

Module: check_mk Branch: master Commit: a564f5844fe661f2441379dd715f23ff82397082 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a564f5844fe661… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 25 16:19:24 2016 +0100 Preparation for new style graph overview page --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 251c4f1..571bbee 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -869,12 +869,12 @@ def paint_time_graph(row): return paint_time_graph_pnp(row) -def paint_time_graph_new_style(row): +def paint_time_graph_new_style(row, show_timerange_selection=False): timerange_spec = get_painter_option("pnp_timerange") vs = multisite_painter_options["pnp_timerange"]['valuespec'] start_time, end_time = map(int, vs.compute_range(timerange_spec)[0]) return "", metrics.render_time_graphs_from_host_service_row(row, start_time, end_time, font_size=11, - show_legend=True, show_controls=True) + show_legend=True, show_controls=True, show_timerange_selection=True) def paint_time_graph_pnp(row):

8 years, 7 months

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