Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: Matrix layout: hilite cells if value differs from majority

by Mathias Kettner

Module: check_mk Branch: master Commit: 820b7070149faae2e94ddd87ff7d6ba4dbb8845c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=820b7070149faa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 11 12:52:17 2015 +0200 Matrix layout: hilite cells if value differs from majority --- .werks/2228 | 5 +++++ web/htdocs/views.css | 7 ++++++ web/plugins/views/layouts.py | 49 +++++++++++++++++++++++++++++++++++++----- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/.werks/2228 b/.werks/2228 index 3de2b19..82e2281 100644 --- a/.werks/2228 +++ b/.werks/2228 @@ -17,3 +17,8 @@ This new layout has been used to create two new views: a global view <i>Search performance data</i> in the topic <i>Metrics</i> and one that can be accessed in the details of a host group. Both show all services of the selected hosts of of the search in a host by services matrix. Simply try it out! + +If one line in a matrix view has the same value for a majority of entries +then all entries with differing values will be hilighted. That way you can +use the matrix layout in order to find configuration differences between +the same service on different hosts. diff --git a/web/htdocs/views.css b/web/htdocs/views.css index ed32cf1..69a0bc1 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -416,6 +416,13 @@ table.data.matrix tr.matrixhead td.left { color: white; } +table.data.matrix tr.even0 td.minority { + background-color: #cff; +} +table.data.matrix tr.odd0 td.minority { + background-color: #dff; +} + table.data.single td.gap { background-color: transparent; diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 25a69c3..43cfe49 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -520,6 +520,8 @@ multisite_layouts["table"] = { def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): + majorities = matrix_find_majorities(rows, group_painters, painters) + for groups, unique_row_ids, matrix_cells in \ create_matrices(rows, group_painters, painters, num_columns): @@ -549,20 +551,57 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho if cell_row == None: html.write("<td></td>") else: - if len(painters) == 2: - paint(painters[1], cell_row) - else: + if len(painters) > 2: html.write("<td class=cell><table>") - for p in painters[1:]: + for painter_nr, p in enumerate(painters[1:]): + tdclass, content = prepare_paint(p, cell_row) + gv = group_value(cell_row, [p])[0] + majority_value = majorities[row_id].get(painter_nr, None) + if majority_value != None and majority_value != gv: + tdclass += " minority" + if len(painters) > 2: html.write("<tr>") - paint(p, cell_row) + html.write('<td class="%s">%s</td>' % (tdclass, content)) + if len(painters) > 2: html.write("</tr>") + if len(painters) > 2: html.write("</table></td>") html.write('</tr>') html.write("</table>") +def matrix_find_majorities(rows, group_painters, painters): + counts = {} # dict row_id -> painter_nr -> value -> count + + for row in rows: + group_id = tuple(group_value(row, group_painters)) + row_id = tuple(group_value(row, [ painters[0] ])) + for painter_nr, painter in enumerate(painters[1:]): + value = group_value(row, [painter])[0] + row_entry = counts.setdefault(row_id, {}) + painter_entry = row_entry.setdefault(painter_nr, {}) + painter_entry.setdefault(value, 0) + painter_entry[value] += 1 + + # Now find majorities for each row + majorities = {} # row_id -> painter_nr -> majority value + for row_id, row_entry in counts.items(): + maj_entry = majorities.setdefault(row_id, {}) + for painter_nr, painter_entry in row_entry.items(): + maj_value = None + max_count = 0 + for value, count in painter_entry.items(): + if count == max_count: + maj_value = None # No majority + elif count > max_count and count >= 2: + maj_value = value + max_count = count + maj_entry[painter_nr] = maj_value + + + return majorities + # Create list of matrices to render def create_matrices(rows, group_painters, painters, num_columns):

9 years, 6 months

Check_MK Git: check_mk: Fixed context button icons for icons read from icons/ directory

by Lars Michelsen

Module: check_mk Branch: master Commit: a555a87db91574cc945e36cab7dae0a31ec0aede URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a555a87db91574… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 11 11:57:20 2015 +0200 Fixed context button icons for icons read from icons/ directory --- web/htdocs/htmllib.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 64d9ac2..d504c2f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -362,14 +362,7 @@ class html: if not self.mobile: self.write('</label>') - def icon(self, help, icon): - self.write(self.render_icon(icon, help)) - - def render_icon(self, icon_name, help="", middle=True, id=None): - align = middle and ' align=absmiddle' or '' - title = help and ' title="%s"' % self.attrencode(help) or "" - id = id and ' id="%s"' % id or '' - + def detect_icon_path(self, icon_name): # Detect whether or not the icon is available as images/icon_*.png # or images/icons/*.png. When an icon is available as internal icon, # always use this onec @@ -379,11 +372,19 @@ class html: base_path = defaults.web_dir+"/htdocs/images" if os.path.exists(base_path+'/icon_'+icon_name+'.png'): - src = "images/icon_%s.png" % icon_name + return "images/icon_%s.png" % icon_name else: - src = "images/icons/%s.png" % icon_name + return "images/icons/%s.png" % icon_name - return '<img src="%s" class=icon%s%s%s />' % (src, align, title, id) + def icon(self, help, icon): + self.write(self.render_icon(icon, help)) + + def render_icon(self, icon_name, help="", middle=True, id=None): + align = middle and ' align=absmiddle' or '' + title = help and ' title="%s"' % self.attrencode(help) or "" + id = id and ' id="%s"' % id or '' + + return '<img src="%s" class=icon%s%s%s />' % (self.detect_icon_path(icon_name), align, title, id) def empty_icon(self): self.write('<img class=icon src="images/trans.png" />') @@ -464,7 +465,8 @@ class html: self.begin_context_buttons() if icon: - title = '<img src="images/icon_%s.png">%s' % (self.attrencode(icon), self.attrencode(title)) + title = '<img src="%s">%s' % (self.attrencode(self.detect_icon_path(icon)), self.attrencode(title)) + if id: idtext = " id='%s'" % self.attrencode(id) else:

9 years, 6 months

Check_MK Git: check_mk: Small internal code change in new matrix layout

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b021956d97465d56b9d1b75234610a4a086a0e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b021956d97465… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 11 11:42:10 2015 +0200 Small internal code change in new matrix layout --- web/plugins/views/layouts.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index b05d571..25a69c3 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -100,6 +100,7 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig html.write("</table>\n") html.write("</div>\n") + multisite_layouts["dataset"] = { "title" : _("Single dataset"), "render" : render_single_dataset, @@ -519,12 +520,6 @@ multisite_layouts["table"] = { def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): - if len(painters) < 2: - raise MKGeneralException(_("Cannot display this view in matrix layout. You need at least two columns!")) - - if not group_painters: - raise MKGeneralException(_("Cannot display this view in matrix layout. You need at least one group column!")) - for groups, unique_row_ids, matrix_cells in \ create_matrices(rows, group_painters, painters, num_columns): @@ -571,6 +566,12 @@ def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_sho # Create list of matrices to render def create_matrices(rows, group_painters, painters, num_columns): + if len(painters) < 2: + raise MKGeneralException(_("Cannot display this view in matrix layout. You need at least two columns!")) + + if not group_painters: + raise MKGeneralException(_("Cannot display this view in matrix layout. You need at least one group column!")) + # First find the groups - all rows that have the same values for # all group columns. Usually these should correspond with the hosts # in the matrix

9 years, 6 months

Check_MK Git: check_mk: #2268 FIX db2_tablespaces: no longer throws exception in checks when complete db2 instance vanishes

by Andreas Boesl

Module: check_mk Branch: master Commit: 4ade92b6105e9bdcce68e5dbe8879d43d9b56035 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ade92b6105e9b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 11 11:32:08 2015 +0200 #2268 FIX db2_tablespaces: no longer throws exception in checks when complete db2 instance vanishes --- .werks/2268 | 9 +++++++++ ChangeLog | 1 + checks/db2_tablespaces | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/2268 b/.werks/2268 new file mode 100644 index 0000000..869e176 --- /dev/null +++ b/.werks/2268 @@ -0,0 +1,9 @@ +Title: db2_tablespaces: no longer throws exception in checks when complete db2 instance vanishes +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1431336655 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1ff75a4..15bf44d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -359,6 +359,7 @@ * 2265 FIX: db2_version: improved check output when version information is missing... * 2266 FIX: windows agent: fixed invalid agent output if system memory exceeds 2TB RAM... * 2267 FIX: mk_db2.aix agent plugin: no longer throws an error when a db2 profile is not set up properly... + * 2268 FIX: db2_tablespaces: no longer throws exception in checks when complete db2 instance vanishes Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/db2_tablespaces b/checks/db2_tablespaces index 6947da4..73f7a5a 100644 --- a/checks/db2_tablespaces +++ b/checks/db2_tablespaces @@ -62,6 +62,8 @@ def check_db2_tablespaces(item, params, parsed): return db = parsed.get(instance) + if not db: + return db_tables = dict(map(lambda x: (x[0], x[1:]), db[1:])) tablespace = db_tables.get(tbsname) if not tablespace:

9 years, 6 months

Check_MK Git: check_mk: #2267 FIX mk_db2.aix agent plugin: no longer throws an error when a db2 profile is not set up properly

by Andreas Boesl

Module: check_mk Branch: master Commit: 578eb89a04480f14170482a725b01703822148f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=578eb89a04480f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 11 10:37:50 2015 +0200 #2267 FIX mk_db2.aix agent plugin: no longer throws an error when a db2 profile is not set up properly An invalid set up instance will be skipped. --- .werks/2267 | 9 +++++++++ ChangeLog | 1 + agents/plugins/mk_db2.aix | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/2267 b/.werks/2267 new file mode 100644 index 0000000..846160e --- /dev/null +++ b/.werks/2267 @@ -0,0 +1,9 @@ +Title: mk_db2.aix agent plugin: no longer throws an error when a db2 profile is not set up properly +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1431333222 +Class: fix + +An invalid set up instance will be skipped. diff --git a/ChangeLog b/ChangeLog index 82eb071..1ff75a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -358,6 +358,7 @@ * 1245 FIX: printer_output: Now correctly detect a bin with unknown as name * 2265 FIX: db2_version: improved check output when version information is missing... * 2266 FIX: windows agent: fixed invalid agent output if system memory exceeds 2TB RAM... + * 2267 FIX: mk_db2.aix agent plugin: no longer throws an error when a db2 profile is not set up properly... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/plugins/mk_db2.aix b/agents/plugins/mk_db2.aix index 26f962a..fd47b35 100755 --- a/agents/plugins/mk_db2.aix +++ b/agents/plugins/mk_db2.aix @@ -61,7 +61,13 @@ function query_instances { waitmax 20 << WAITMAX su $INSTANCE << EOF - . $HOMEDIR/sqllib/db2profile 2>&1 > /dev/null; + + if [ ! -f $HOMEDIR/sqllib/db2profile ] ; + then + exit 0 + fi + + . $HOMEDIR/sqllib/db2profile >/dev/null 2>&1 ; function compare_version_greater_equal {

9 years, 6 months

Check_MK Git: check_mk: #2253 FIX Availability context button is now visible again for host- and servicegroups

by Lars Michelsen

Module: check_mk Branch: master Commit: 0db3a2041945b24b6ad5baa23fe244ca295d7cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0db3a2041945b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 11 09:12:23 2015 +0200 #2253 FIX Availability context button is now visible again for host- and servicegroups --- .werks/2253 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 6 ++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/2253 b/.werks/2253 new file mode 100644 index 0000000..5bb8ae1 --- /dev/null +++ b/.werks/2253 @@ -0,0 +1,10 @@ +Title: Availability context button is now visible again for host- and servicegroups +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1431328321 + + diff --git a/ChangeLog b/ChangeLog index 348cd5d..82eb071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -431,6 +431,7 @@ * 2233 FIX: Fixed WATO folder view and Host Tags search with HTML Entity encoding... * 2074 FIX: pnptemplate netapp_api_volume: fixed title * 2251 FIX: Adding views to dashboards / reports is now respecing all set filters... + * 2253 FIX: Availability context button is now visible again for host- and servicegroups WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8ab1507..7706710 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1166,10 +1166,8 @@ def render_view(view, rows, datasource, group_painters, painters, row_count > 0 and command_form, # Take into account: layout capabilities can_display_checkboxes and not view.get("force_checkboxes"), show_checkboxes, - # Show link to availability. This exists only for plain hosts - # and services table. The grouping tables have columns that statehist - # is missing. That way some of the filters might fail. - datasource["table"] in [ "hosts", "services", ] or "aggr" in datasource["infos"]) + # Show link to availability + "host" in datasource["infos"] or "service" in datasource["infos"] or "aggr" in datasource["infos"]) # User errors in filters html.show_user_errors()

9 years, 6 months

Check_MK Git: check_mk: Fixed default checkbox state in icon cusomization setting

by Lars Michelsen

Module: check_mk Branch: master Commit: b734ba73baa70569d11c6dfd619079007f0f01a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b734ba73baa705… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 8 11:17:09 2015 +0200 Fixed default checkbox state in icon cusomization setting --- web/plugins/wato/check_mk_configuration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ec370df..44f3817 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -545,6 +545,7 @@ register_configvar(group, label = _('Directly show the action icon in the column'), help = _('Makes the icon appear in the column instead ' 'of the dropdown menu.'), + default_value = True, )), ('sort_index', Integer( title = _('Sort index'),

9 years, 6 months

Check_MK Git: check_mk: Fix SNMP scan function of if64_tplink,

by Mathias Kettner

fix duplicate service Message-ID: <554cc34c.jtUcYGO8UixTSXZe%mk(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: f1b6b0f216a54075480ce797913b51d5dcad2b41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1b6b0f216a540… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 8 15:02:46 2015 +0200 Fix SNMP scan function of if64_tplink, fix duplicate service --- checks/if64_tplink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/if64_tplink b/checks/if64_tplink index 8e4c089..d0efcb7 100644 --- a/checks/if64_tplink +++ b/checks/if64_tplink @@ -64,7 +64,7 @@ check_info["if64_tplink"] = { "2.1.2.2.1.6", # ifPhysAddress 19 ]), 'snmp_scan_function': \ - lambda oid: True or ".4.1.11863." in oid(".1.3.6.1.2.1.1.2.0") and \ + lambda oid: ".4.1.11863." in oid(".1.3.6.1.2.1.1.2.0") and \ oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None, 'group': 'if', 'default_levels_variable': 'if_default_levels',

9 years, 7 months

Check_MK Git: check_mk: Fixed missing old-style Perf-O-Meters

by Mathias Kettner

Module: check_mk Branch: master Commit: 723598a076f005486ec2976ce34958d4cf0c1f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=723598a076f005… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 8 15:56:19 2015 +0200 Fixed missing old-style Perf-O-Meters --- web/plugins/views/perfometer.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 9fd016b..40adc41 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -37,7 +37,6 @@ perfometers = {} # [ [segment, segment, segment], [segment, segment] ] --> horizontal gespaltet. # Darin die vertikalen Balken. -#. # .--Old Style-----------------------------------------------------------. # | ___ _ _ ____ _ _ | # | / _ \| | __| | / ___|| |_ _ _| | ___ | @@ -122,6 +121,7 @@ def perfometer_logarithmic_dual_independent\ def paint_perfometer(row): + perf_data_string = unicode(row["service_perf_data"].strip()) if not perf_data_string: return "", "" @@ -137,16 +137,15 @@ def paint_perfometer(row): try: # Try new metrics module + title = None translated_metrics = metrics.translate_metrics(perf_data, check_command) if translated_metrics: # definition for this check type exists perfometer_definitions = list(metrics.get_perfometers(translated_metrics)) if perfometer_definitions: title, h = render_metrics_perfometer(perfometer_definitions[0], translated_metrics) - else: - return "", "" # Legacy Perf-O-Meters: find matching Perf-O-Meter function - else: + if title == None: perf_painter = perfometers.get(check_command) if not perf_painter: return "", ""

9 years, 7 months

Check_MK Git: check_mk: #2228 New matrix views for displaying performance data of service in a matrix table

by Mathias Kettner

Module: check_mk Branch: master Commit: 4930d37b80f8b3de49735f1e381c6d6ad0bcdcb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4930d37b80f8b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 8 16:08:07 2015 +0200 #2228 New matrix views for displaying performance data of service in a matrix table Multisite has got a new layout: the <i>Matrix</i>. It allows to group and compare values of a similar set of services on a list of hosts and many other things. This layout uses the group columns for creating vertical matrix columns (e.g. the host name) and the first normal column for creating horizontal columns (e.g. the service description). All further columns (most times just one) are displayed in the cells. This new layout has been used to create two new views: a global view <i>Search performance data</i> in the topic <i>Metrics</i> and one that can be accessed in the details of a host group. Both show all services of the selected hosts of of the search in a host by services matrix. Simply try it out! --- .werks/2228 | 19 ++++ ChangeLog | 1 + web/htdocs/images/icons/matrix.png | Bin 0 -> 1918 bytes web/htdocs/views.css | 41 ++++++++ web/plugins/config/builtin.py | 2 +- web/plugins/views/builtin.py | 94 +++++++++++++++++ web/plugins/views/layouts.py | 201 ++++++++++++++++++++++++++++++------ web/plugins/views/painters.py | 3 + 8 files changed, 328 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4930d37b80…

9 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015