Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Try to fix view count again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd118e089b582dacd12aacad4daaa1a543870073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd118e089b582d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 09:29:11 2011 +0100 Try to fix view count again --- web/htdocs/views.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e259d3a..0da8881 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1262,6 +1262,8 @@ def show_view(view, show_heading = False, show_buttons = True, # TODO: Use livestatus Stats: instead of fetching rows! if only_count: + for varname, value in view["hard_filtervars"]: + html.del_var(varname, value) return len(rows) # Set browser reload

12 years, 6 months

Check_MK Git: check_mk: Fixed typo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c07bea6eaff20877cebf2875ee7919457da1bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c07bea6eaff20… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 09:28:15 2011 +0100 Fixed typo --- 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 8b51e27..e259d3a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1186,7 +1186,7 @@ def show_view(view, show_heading = False, show_buttons = True, sorter_list = html.has_var('sort') and parse_url_sorters(html.var('sort')) or view["sorters"] sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list ] else: - sorter_list = [] + sorters = [] # Prepare gropuing information group_painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["group_painters"] ]

12 years, 6 months

Check_MK Git: check_mk: Merge

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8d319d069021f51c346bdb3827b06066cfe73aa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d319d069021f5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 09:19:34 2011 +0100 Merge ---

12 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 259b73295ed0c522d36ee08874a03ce909984c15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=259b73295ed0c5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 13 15:56:39 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Gitignore: Added Kate swap files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 273d002d974971b8213f6b1a69521255db3fbcec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=273d002d974971… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 12 16:53:00 2011 +0100 Gitignore: Added Kate swap files --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 412b328..7152901 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*kate-swp .*.swp .*.swo *~

12 years, 6 months

Check_MK Git: check_mk: MobileUI: Multiple changes, not finished yet

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e0ba783ee6027a0c56761246ad43a9e1edc5f4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e0ba783ee6027… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 09:17:17 2011 +0100 MobileUI: Multiple changes, not finished yet --- web/htdocs/htmllib.py | 18 ++- web/htdocs/js/mobile.js | 2 +- web/htdocs/mobile.py | 63 +++++---- web/htdocs/views.py | 2 +- web/plugins/views/filters.py | 8 +- web/plugins/views/mobile.py | 320 ++++++++++++++++++++++++++++++++++++------ 6 files changed, 337 insertions(+), 76 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6e0ba783ee…

12 years, 6 months

Check_MK Git: check_mk: Try to fix view rows count for mobile

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 872863071d54320012375fc1f795e76b12f013d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=872863071d5432… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 09:15:46 2011 +0100 Try to fix view rows count for mobile --- web/htdocs/views.py | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 14af06b..8b51e27 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1144,22 +1144,10 @@ def show_view(view, show_heading = False, show_buttons = True, browser_reload = vo.get("refresh", view.get("browser_reload", None)) show_checkboxes = vo.get("show_checkboxes", view.get("show_checkboxes", False)) - if browser_reload and 'R' in display_options: - html.set_browser_reload(browser_reload) - # Get the datasource (i.e. the logical table) datasource = multisite_datasources[view["datasource"]] tablename = datasource["table"] - # The layout of the view: it can be overridden by several specifying - # an output format (like json or python). - if html.output_format == "html": - layout = multisite_layouts[view["layout"]] - else: - layout = multisite_layouts.get(html.output_format) - if not layout: - layout = multisite_layouts["json"] - # Filters to show in the view show_filters = [ multisite_filters[fn] for fn in view["show_filters"] ] @@ -1174,9 +1162,10 @@ def show_view(view, show_heading = False, show_buttons = True, hide_filters = [ multisite_filters[fn] for fn in view["hide_filters"] ] hard_filters = [ multisite_filters[fn] for fn in view["hard_filters"] ] + for varname, value in view["hard_filtervars"]: # shown filters are set, if form is fresh and variable not supplied in URL - if not html.var("filled_in") and not html.has_var(varname): + if only_count or (html.var("filled_in") != "filter" and not html.has_var(varname)): html.set_var(varname, value) # Prepare Filter headers for Livestatus @@ -1193,8 +1182,11 @@ def show_view(view, show_heading = False, show_buttons = True, query = filterheaders + view.get("add_headers", "") # Sorting - use view sorters and URL supplied sorters - sorter_list = html.has_var('sort') and parse_url_sorters(html.var('sort')) or view["sorters"] - sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list ] + if not only_count: + sorter_list = html.has_var('sort') and parse_url_sorters(html.var('sort')) or view["sorters"] + sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list ] + else: + sorter_list = [] # Prepare gropuing information group_painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["group_painters"] ] @@ -1256,10 +1248,6 @@ def show_view(view, show_heading = False, show_buttons = True, else: rows = query_data(datasource, columns, add_columns, query, only_sites, get_limit()) - # TODO: Use livestatus Stats: instead of fetching rows! - if only_count: - return len(rows) - # Now add join information, if there are join columns if len(join_painters) > 0: do_table_join(datasource, rows, filterheaders, join_painters, join_columns, only_sites) @@ -1272,6 +1260,23 @@ def show_view(view, show_heading = False, show_buttons = True, for filter in all_active_filters: rows = filter.filter_table(rows) + # TODO: Use livestatus Stats: instead of fetching rows! + if only_count: + return len(rows) + + # Set browser reload + if browser_reload and 'R' in display_options and not only_count: + html.set_browser_reload(browser_reload) + + # The layout of the view: it can be overridden by several specifying + # an output format (like json or python). + if html.output_format == "html": + layout = multisite_layouts[view["layout"]] + else: + layout = multisite_layouts.get(html.output_format) + if not layout: + layout = multisite_layouts["json"] + # Until now no single byte of HTML code has been output. # Now let's render the view. if not render_function:

12 years, 6 months

Check_MK Git: check_mk: gb: removed cost and benefit fields

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0e9447dbc94d29ef8ddbefae281417ff1ba8bebe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e9447dbc94d29… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 17:34:06 2011 +0100 gb: removed cost and benefit fields --- gb | 37 +++---------------------------------- 1 files changed, 3 insertions(+), 34 deletions(-) diff --git a/gb b/gb index 8f79147..2ca5703 100755 --- a/gb +++ b/gb @@ -109,9 +109,6 @@ def bug_is_modified(bugid): def load_bug(bugid): bug = { "id" : bugid, - "cost" : 1, - "benefit" : 1, - "fun" : 0, "state" : "unknown", "title" : "unknown", "component" : "general", @@ -169,7 +166,7 @@ where COMMAND is one of: ids [#] - Shows the number of reserved bug IDS. With a number given as parameter the command will reserve new bug IDS. - list [-g] [-r] [STATE] - list bugs (-g: sort after gain, -r: reverse) + list [-r] [STATE] - list bugs (-r: reverse) new - create a new bug show [# #..] - show several bugs, or 'all' for all, of leave out for last resolve ID - change a bugs state @@ -194,33 +191,14 @@ def num_color(n, colors, inverse): c = colors[n-1] return tty_colors([b + c, 1]) -def bug_gain(bug): - cost = int(bug["cost"]) - benefit = int(bug["benefit"]) - gain = benefit - cost - if gain >= 2: - color = 2 - elif gain > 0: - color = 6 - elif gain <= -3: - color = 1 - elif gain <= -2: - color = 5 - elif gain < 0: - color = 3 - else: - color = 4 - return "%s%d%s%d%s" % ( - tty_colors([40 + color, 1]), cost, tty_colors([0, 30 + color, 1]), benefit, tty_normal) - def list_bug(bug): if bug_is_modified(bug["id"]): bold = tty_bold + tty_cyan + "(*) " else: bold = "" - sys.stdout.write("#%04d %s %-6s %-9s %-10s %s%-6s%s %s%-60s%s\n" % + sys.stdout.write("#%04d %-6s %-9s %-10s %s%-6s%s %s%-60s%s\n" % (int(bug["id"]), - bug_gain(bug), bug_state(bug), + bug_state(bug), bug["class"], bug["component"], tty_bold, bug["targetversion"], tty_normal, bold, bug["title"], tty_normal)) @@ -234,17 +212,10 @@ def main_list(args): # arguments are tags from state, component and class. Multiple values # in one class are orred. Multiple types are anded. filters = {} - def cmp_gain(a, b): - ga = int(a["benefit"]) - int(a["cost"]) - gb = int(b["benefit"]) - int(b["cost"]) - return ga - gb sort = None reverse = False for a in args: - if a == '-g': - sort = cmp_gain - continue if a == '-r': reverse = True @@ -374,8 +345,6 @@ def main_new(args): bug["class"] = input_choice("Class", classes) bug["component"] = input_choice("Component", components) bug["targetversion"] = input_choice("Target Version", targetversions) - bug["cost"] = input_choice("Cost", "123456789") - bug["benefit"] = input_choice("Benefit", "123456789") bug["description"] = get_long_input("description") g_bugs[bug["id"]] = bug

12 years, 6 months

Check_MK Git: check_mk: Updated bug entries #0492, #0493, #0494

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f45c63d4f176f41bb79942d9742fae1ab6cbbbeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f45c63d4f176f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 17:34:08 2011 +0100 Updated bug entries #0492, #0493, #0494 --- .bugs/492 | 11 +++++++++++ .bugs/493 | 10 ++++++++++ .bugs/494 | 11 +++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/.bugs/492 b/.bugs/492 new file mode 100644 index 0000000..c93291c --- /dev/null +++ b/.bugs/492 @@ -0,0 +1,11 @@ +Title: Hide WATO filter if no WATO is used +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-13 16:46:00 +Targetversion: future +Class: feature + +If you have no folders defined then the WATO filter is +useless and should not appear in the filter form. diff --git a/.bugs/493 b/.bugs/493 new file mode 100644 index 0000000..9a418a6 --- /dev/null +++ b/.bugs/493 @@ -0,0 +1,10 @@ +Title: Repair Perf-O-Meter in single dataset view +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-13 16:47:27 +Targetversion: 1.1.13i1 +Class: bug + +Should look like in table view. diff --git a/.bugs/494 b/.bugs/494 new file mode 100644 index 0000000..0b8bc40 --- /dev/null +++ b/.bugs/494 @@ -0,0 +1,11 @@ +Title: Single dataset layout does not honor column-headers-off +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-13 16:47:59 +Targetversion: 1.1.13i1 +Class: bug + +If you switch off column headers in a single dataset view, +the headers do not vanish.

12 years, 6 months

Check_MK Git: check_mk: WATO: NagVis auth export: Added multisite snapin permissions

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd94172aee404a4bfa536c45b2fb504f833217d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd94172aee404a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 9 09:11:36 2011 +0100 WATO: NagVis auth export: Added multisite snapin permissions --- web/plugins/wato/nagvis_auth.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py index 30f079d..9536ba9 100644 --- a/web/plugins/wato/nagvis_auth.py +++ b/web/plugins/wato/nagvis_auth.py @@ -76,11 +76,12 @@ def generate_auth_file(users): # Add implicit permissions. These are basic permissions # which are needed for most users. perms += [ - ('Overview', 'view', '*'), - ('General', 'getContextTemplate', '*'), - ('General', 'getHoverTemplate', '*'), - ('General', 'getCfgFileAges', '*'), - ('User', 'setOption', '*'), + ('Overview', 'view', '*'), + ('General', 'getContextTemplate', '*'), + ('General', 'getHoverTemplate', '*'), + ('General', 'getCfgFileAges', '*'), + ('User', 'setOption', '*'), + ('Multisite', 'getMaps', '*'), ] # Loop the declared NagVis permissions to check if the user is allowed.

12 years, 6 months

← Newer
1
...
20
21
22
23
24
25
26
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011