Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: Added idkeys to bi datasources

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7ed9484502208f3527858ab612b863580d00cfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7ed9484502208… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 08:56:58 2011 +0200 Added idkeys to bi datasources --- web/plugins/views/bi.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index dcab308..7bb3582 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -39,6 +39,7 @@ multisite_datasources["bi_aggregations"] = { "table" : bi.table, "infos" : [ "aggr" ], "keys" : [], + "idkeys" : [ 'aggr_name' ], } multisite_datasources["bi_host_aggregations"] = { @@ -46,6 +47,7 @@ multisite_datasources["bi_host_aggregations"] = { "table" : bi.host_table, "infos" : [ "host", "aggr" ], "keys" : [], + "idkeys" : [ 'aggr_name' ], } # ____ _ _

13 years

Check_MK Git: check_mk: Fixed i18n string syntax error

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f5687e7a6527ffdd2473d73123af9e29a63c9b96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5687e7a6527ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 08:39:02 2011 +0200 Fixed i18n string syntax error --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4f1cde4..5c6b8f1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1847,7 +1847,7 @@ def show_action_form(is_open, datasource): elif what == "comment": show_comment_actions() else: - html.write("<tr><td>"+_('No commands possible for %ss')+"</td></tr>" % what) + html.write("<tr><td>"+ _('No commands possible for %ss') % what +"</td></tr>") html.write("</table></div>\n") html.end_form()

13 years

Check_MK Git: check_mk: FIX: Added idkeys columns to livestatus query

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26d2c793505c4aa95c45418696642bf29d93e698 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d2c793505c4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 08:37:09 2011 +0200 FIX: Added idkeys columns to livestatus query --- web/htdocs/views.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3e2f2c4..4f1cde4 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1195,6 +1195,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Add key columns, needed for executing commands columns += datasource["keys"] + # Add idkey columns, needed for identifying the row + columns += datasource["idkeys"] + # Make column list unique and remove (implicit) site column colset = set(columns) if "site" in colset:

13 years

Check_MK Git: check_mk: Host comments have red backgrounded rows when host is down

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf89c9eccdd8d7a2d4ce2f3f62231f3fb084022c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf89c9eccdd8d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 15:22:37 2011 +0200 Host comments have red backgrounded rows when host is down --- .bugs/163 | 11 ++++++++--- .bugs/199 | 11 ++++++++--- .bugs/222 | 10 +++++++--- ChangeLog | 1 + web/htdocs/views.py | 2 +- web/plugins/views/layouts.py | 6 +++++- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.bugs/163 b/.bugs/163 index 247510f..581a30e 100644 --- a/.bugs/163 +++ b/.bugs/163 @@ -1,10 +1,11 @@ Title: backgrounds in downtime view not shown for host downtimes Component: multisite +State: done +Class: nastiness +Date: 2011-03-01 14:42:34 Benefit: 2 -State: open Cost: 4 -Date: 2011-03-01 14:42:34 -Class: nastiness +Fun: 0 The problem is that the host_state is not fetched via livestatus. These code parts were written by sir hack-a-lot ;-). This would workaround the problem and bring the color to the host columns . And the host_state and host_has_been_checked columns are fetched from much more views (maybe useless in most cases). @@ -75,3 +76,7 @@ index 135b1ed..6a870d1 100644 html.write('<tr class="data %s%d">' % (trclass, state)) for p in painters: + +2011-09-05 15:21:28: changed state open -> done +Background color is correctly shown for host rows e.g. in "Comments" view +for example when a host is DOWN the row has lightred background diff --git a/.bugs/199 b/.bugs/199 index 6b3d660..948b214 100644 --- a/.bugs/199 +++ b/.bugs/199 @@ -1,11 +1,16 @@ Title: <ENTER> im view editor sollte Formular abschicken Component: multisite +State: done +Class: cleanup +Date: 2011-08-31 12:56:00 Benefit: 4 -State: open Cost: 1 -Date: 2011-08-31 12:56:00 -Class: cleanup +Fun: 0 Wenn man viel mit Tastaturkürzeln arbeitet, nervt es, dass man im View Editor beim Druck auf <ENTER> immer das Formular nur im "Try" Modus abschickt. Man sollte da das Formular eher ganz abschicken. + +2011-09-05 15:08:25: changed state open -> done +Ist erledigt. Die Reihenfolge der submit Buttons ist hier scheinbar +maßgeblich. diff --git a/.bugs/222 b/.bugs/222 index 9b86204..303b18e 100644 --- a/.bugs/222 +++ b/.bugs/222 @@ -1,10 +1,11 @@ Title: Quicksearch should reload items after Nagios restart Component: multisite +State: done +Class: feature +Date: 2011-03-10 11:07:54 Benefit: 2 -State: open Cost: 3 -Date: 2011-03-10 11:07:54 -Class: feature +Fun: 0 Quicksearch should also do a refresh every 10 Seconds but only retrieve the start time of the nagios sites. These are always available @@ -14,3 +15,6 @@ the last time, all items (hosts, services) should be loaded new. The See Also: should link to all check manpages concerning df.include checks. Also there should be a table of these checks. + +2011-09-05 15:09:55: changed state open -> done +Has already been implemented. diff --git a/ChangeLog b/ChangeLog index 2c02929..9cd5e57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ for actions * Sort titles in views can be enabled by clicking on the whole cells now * Submitting the view editor via ENTER key saves the view now instead of try mode + * Host comments have red backgrounded rows when host is down WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f7f82ad..ac20417 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1616,7 +1616,7 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l state_columns = [] if "service" in datasource["infos"]: state_columns += [ "service_has_been_checked", "service_state" ] - elif "host" in datasource["infos"]: + if "host" in datasource["infos"]: state_columns += [ "host_has_been_checked", "host_state" ] for c in state_columns: if c not in columns: diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 104f6b4..9882dc4 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -377,7 +377,11 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns): # or host - if available - to color the complete line if num_columns == 1: # render state, if available through whole tr - state = row.get("service_state", 0) + if row.get('service_description', '') == '': + state = row.get("host_state", 0) + if state > 0: state +=1 # 1 is critical for hosts + else: + state = row.get("service_state", 0) else: state = 0 if trclass == "odd":

13 years

Check_MK Git: check_mk: Implemented extra_custom_links to be used in views to register custom context links

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bfa74d8fd4a0602a387cf8620ae5eeb6c397aff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfa74d8fd4a060… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 16:15:50 2011 +0200 Implemented extra_custom_links to be used in views to register custom context links --- ChangeLog | 1 + web/htdocs/views.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cd5e57..4b690a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * Sort titles in views can be enabled by clicking on the whole cells now * Submitting the view editor via ENTER key saves the view now instead of try mode * Host comments have red backgrounded rows when host is down + * Implemented extra_custom_links to be used in views to register custom context links WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ac20417..3e2f2c4 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -49,6 +49,7 @@ multisite_sorters = {} multisite_builtin_views = {} multisite_painter_options = {} ubiquitary_filters = [] # Always show this filters +extra_context_links = [] # Load all view plugins def load_plugins(): @@ -1587,6 +1588,30 @@ def show_context_links(thisview, active_filters): vars_values = [ (var, html.var(var)) for var in set(used_contextvars) ] html.context_button(view_linktitle(view), html.makeuri_contextless(vars_values + [("view_name", name)]), view.get("icon")) + # Add the plugin registered context links when the var requirements can be met + # custom context links can be registered in view plugins like this: + # + # def get_my_link_url(view): + # (...) + # return '/url/to/link/to' + # + # extra_context_links = [ + # ([], 'The Title', get_my_link_url, 'map'), + # ] + # + # The first element is a list of required var names to show this button + # The fourth element it the name of the icon (icon_<name>.png) + # + # The url render function needs to return the target URL as string but can + # also return None to disable this link for the current view + for needed_vars, title, url_func, icon in extra_context_links: + miss = [ v for v in needed_vars if v not in active_filter_vars ] + if miss: + break + url = url_func(view) + if url is not None: + html.context_button(title, url, icon) + if not first: html.end_context_buttons()

13 years

Check_MK Git: check_mk: Sort titles in views can be enabled by clicking on the whole cells now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3d984ae9573ff720d2c93caeb2099efff0387fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d984ae9573ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 14:29:22 2011 +0200 Sort titles in views can be enabled by clicking on the whole cells now --- ChangeLog | 1 + web/htdocs/check_mk.css | 18 +++++++++++------- web/htdocs/views.py | 12 +++++++----- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index a66e5de..fd71f13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * Added missing sorters for "service nth service perfdata" painters * Implemented row selection in views to select only a subset of shown data for actions + * Sort titles in views can be enabled by clicking on the whole cells now WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 96bf4ed..3c71f04 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -619,21 +619,25 @@ table.data th { } /* Table header links (For sorting) */ -table.data th a { - color: #fff; + +table.data th.sort { text-decoration: underline; } -table.data th a:hover { - color: #fff; - text-decoration: none; +table.data th.sort:hover { + background-color: #A4B2B2; + cursor: pointer; +} + +table.data th.sort:hover { + color: #000; } -table.data th a.asc { +table.data th.asc { color: #CBDCF2; } -table.data th a.desc { +table.data th.desc { color: #CBDCF2; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ad522ba..9fdfb07 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2390,6 +2390,9 @@ def paint_header(view, p): # - Add the display options (Keeping the same display options as current) # - Link to _self (Always link to the current frame) # - Keep the _body_class variable (e.g. for dashlets) + thclass = '' + onclick = '' + title = '' if 'L' in html.display_options \ and view.get('user_sortable', True) \ and get_sorter_name_of_painter(painter) is not None: @@ -2401,12 +2404,11 @@ def paint_header(view, p): if hasattr(html, 'title_display_options'): params.append(('display_options', html.title_display_options)) - t = "<a class=\"%s\" href=\"%s\" title=\"%s\" target=\"_self\">%s</a>" % \ - (get_primary_sorter_order(view, painter), - html.makeuri(params, 'sort'), - _('Sort by %s') % t, t) + thclass = ' class="sort %s"' % get_primary_sorter_order(view, painter) + onclick = ' onclick="location.href=\'%s\'"' % html.makeuri(params, 'sort') + title = ' title="%s"' % (_('Sort by %s') % t) - html.write("<th>%s</th>" % t) + html.write("<th%s%s%s>%s</th>" % (thclass, onclick, title, t)) def register_events(row): if config.sounds != []:

13 years

Check_MK Git: check_mk: Added additional missing localizations when processing commands

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc2f820775af3f9bc40fa4ed563a7f8cddc314a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc2f820775af3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 14:14:44 2011 +0200 Added additional missing localizations when processing commands --- web/htdocs/views.py | 73 ++++++++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc2f820775…

13 years

Check_MK Git: check_mk: FIX: Not showing the action form in "try" mode of the view editor

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d98166bc51cbf159c4e18bc8aa2b09d741728fb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d98166bc51cbf1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 14:40:00 2011 +0200 FIX: Not showing the action form in "try" mode of the view editor --- ChangeLog | 1 + web/htdocs/views.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd71f13..c7e0b1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * FIX: fix error when using non-Ascii characters in view title * FIX: fix error on comment page caused by missing sorter * FIX: endless javascript when fetching pnp graphs on host/service detail pages + * FIX: Not showing the action form in "try" mode of the view editor * Added missing i18n strings in command form and list of views * Views are not reloaded completely anymore. The data tables are reloaded on their own. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9fdfb07..7d2fb0c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1793,6 +1793,8 @@ def collist_of_collection(collection, join_target = []): def show_action_form(is_open, datasource): if not config.may("act"): return + if html.has_var("try"): + return # We take the first info to be the native data type of this table # and show actions useful for that

13 years

Check_MK Git: check_mk: Submitting the view editor via ENTER key saves the view now instead of try mode

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78ca5dee87934223d58cb9c8929b94d97f8802a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78ca5dee879342… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 15:07:56 2011 +0200 Submitting the view editor via ENTER key saves the view now instead of try mode --- .bugs/198 | 10 +++++++--- ChangeLog | 1 + web/htdocs/check_mk.css | 5 +++++ web/htdocs/views.py | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.bugs/198 b/.bugs/198 index 2f87d06..f869863 100644 --- a/.bugs/198 +++ b/.bugs/198 @@ -1,9 +1,13 @@ Title: "Try" in view editor zeigt Action Formular Component: multisite +State: done +Class: cleanup +Date: 2011-08-31 12:55:15 Benefit: 3 -State: open Cost: 2 -Date: 2011-08-31 12:55:15 -Class: cleanup +Fun: 0 Dort sollte kein Formular angezeigt werden. + +2011-09-05 14:40:10: changed state open -> done +ist erledigt. diff --git a/ChangeLog b/ChangeLog index c7e0b1d..2c02929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * Implemented row selection in views to select only a subset of shown data for actions * Sort titles in views can be enabled by clicking on the whole cells now + * Submitting the view editor via ENTER key saves the view now instead of try mode WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 3c71f04..16aa16e 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1581,6 +1581,11 @@ div.columneditor td, div.columneditor select { font-size: 0.9em; } +input#try{ + float:left; +} + + /* __ ___ _ _ _ \ \ / (_) _____ _| | (_)___| |_ diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7d2fb0c..f7f82ad 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -706,10 +706,10 @@ function toggle_section(nr, oImg) { html.write('<tr><td class="legend button" colspan=2>') - html.button("try", _("Try out")) - html.write(" ") html.button("save", _("Save")) - html.write("</table>\n") + html.write(" ") + html.button("try", _("Try out")) + html.write("</td></tr></table>\n") html.end_form() html.write("</div></td></tr></table>\n")

13 years

Check_MK Git: check_mk: FIX: endless javascript when fetching pnp graphs on host/service detail pages

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54a493dbfcdac33c68cbabf0454311c989fe09bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54a493dbfcdac3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 13:16:54 2011 +0200 FIX: endless javascript when fetching pnp graphs on host/service detail pages --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c121dcb..a66e5de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * FIX: Fixed js errors in IE when having not enough space on dashboard * FIX: fix error when using non-Ascii characters in view title * FIX: fix error on comment page caused by missing sorter + * FIX: endless javascript when fetching pnp graphs on host/service detail pages * Added missing i18n strings in command form and list of views * Views are not reloaded completely anymore. The data tables are reloaded on their own. diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index a19595c..3df1ca8 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -319,15 +319,15 @@ function pnp_error_response_handler(data, statusCode) { function pnp_response_handler(data, code) { var valid_response = true; - var response = null; + var response = []; try { response = eval(code); for(var i = 0; i < response.length; i++) { - var graph = response[i]; var view = data['view'] == '' ? '0' : data['view']; - create_graph(data, '&' + graph['image_url'].replace('&view='+view, '')); - i = null; + create_graph(data, '&' + response[i]['image_url'].replace('&view='+view, '')); } + view = null; + i = null; } catch(e) { valid_response = false; } @@ -339,9 +339,9 @@ function pnp_response_handler(data, code) { // Fallback bei doofer/keiner Antwort function fallback_graphs(data) { - for(var i = 0; i < 8; i++) { - create_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + i); - } + for(var s = 0; s < 8; s++) { + create_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + s); + } } function create_graph(data, params) {

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits