Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64138 discussions

Check_MK Git: check_mk: Multisite: make dashboard folder sensitive

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 248dfe6b8193255e418414efa9116d4d2b4a72a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=248dfe6b819325… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 14:29:52 2011 +0200 Multisite: make dashboard folder sensitive --- web/htdocs/dashboard.py | 66 ++++++++++++++++++++++++++++++------- web/htdocs/js/sidebar.js | 7 ++-- web/htdocs/wato.py | 38 ++++++++++++++++++++-- web/plugins/dashboard/builtin.py | 6 ++-- web/plugins/sidebar/shipped.py | 2 + web/plugins/views/wato.py | 2 +- 6 files changed, 98 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=248dfe6b81…

13 years, 2 months

Check_MK Git: check_mk: Dashboard: minor layout fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 251d27f1969b37d2f2942264938b5999a3ceee4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=251d27f1969b37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 13:06:00 2011 +0200 Dashboard: minor layout fixes --- web/htdocs/check_mk.css | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index c46be99..5a656af 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1730,31 +1730,30 @@ canvas.pie { margin-left: 10px; } -table.hoststats { +div.dashlet table.hoststats { margin-top: 10px; margin-left: 5px; - width: 80px; + width: 143px; height: 136px; border-collapse: collapse; border-spacing: 0px; } -table.hoststats td { +div.dashlet table.hoststats td { text-align: right; padding-right: 6px; padding-left: 6px; background-image: url("images/form_background.png"); background-repeat: repeat; } -table.hoststats th { +div.dashlet table.hoststats th { text-align: left; background-color: transparent; - padding-right: 3em; padding-left: 6px; } -table.hoststats td.color { +div.dashlet table.hoststats td.color { padding: 3px; } -table.hoststats th, table.hoststats td { +div.dashlet table.hoststats th, table.hoststats td { padding-top: 3px; padding-bottom: 3px; border-color: white;

13 years, 2 months

Check_MK Git: check_mk: Added colors to pie-table

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d091aa17d16d1c3e7636e1ec99b26e3907023840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d091aa17d16d1c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 12:17:13 2011 +0200 Added colors to pie-table --- web/htdocs/check_mk.css | 3 +++ web/htdocs/dashboard.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index bf1dbb5..c46be99 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1751,6 +1751,9 @@ table.hoststats th { padding-right: 3em; padding-left: 6px; } +table.hoststats td.color { + padding: 3px; +} table.hoststats th, table.hoststats td { padding-top: 3px; padding-bottom: 3px; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 6e656bc..5687a7b 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -430,7 +430,8 @@ def render_statistics(what, table, filter): html.write('<table class=hoststats style="float:left">') for (name, color, query), count in pies + [ ((_("Total"), "", ""), total) ]: - html.write("<tr><th>%s</th><td>%d</td></tr>" % (name, count)) + html.write('<tr><th>%s</th><td class=color style="background-color: %s">' + '</td><td>%d</td></tr>' % (name, color, count)) html.write("</table>")

13 years, 2 months

Check_MK Git: check_mk: Multisite: improved dashboard

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 968c84ba09a60bfe099617583a165e68933f8b2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=968c84ba09a60b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 11:59:40 2011 +0200 Multisite: improved dashboard --- web/htdocs/check_mk.css | 38 ++++++++++++ web/htdocs/dashboard.py | 120 ++++++++++++++++++++++++++++++++++++++ web/htdocs/index.py | 5 +- web/plugins/dashboard/builtin.py | 37 +++++++++--- web/plugins/pages/shipped.py | 2 + web/plugins/views/dashboard.py | 6 +- 6 files changed, 194 insertions(+), 14 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 6999d53..bf1dbb5 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1724,6 +1724,44 @@ table.dashlet_overview h2 { font-size: 10pt; } +/* Styles for various builtin dashlets */ +canvas.pie { + margin-top: 10px; + margin-left: 10px; +} + +table.hoststats { + margin-top: 10px; + margin-left: 5px; + width: 80px; + height: 136px; + border-collapse: collapse; + border-spacing: 0px; +} +table.hoststats td { + text-align: right; + padding-right: 6px; + padding-left: 6px; + background-image: url("images/form_background.png"); + background-repeat: repeat; +} +table.hoststats th { + text-align: left; + background-color: transparent; + padding-right: 3em; + padding-left: 6px; +} +table.hoststats th, table.hoststats td { + padding-top: 3px; + padding-bottom: 3px; + border-color: white; + border-style: solid none; + border-width: 1px; + vertical-align: middle; +} + + + /* _ _ _ ____ _ / \ __| | __| / ___| _ __ __ _ _ __ (_)_ __ ___ diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c4bb0cf..6e656bc 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -352,3 +352,123 @@ def dashlet_overview(): html.write('</tr></table>') + +def dashlet_hoststats(): + table = [ + ( _("Up"), "#0b3", + "Stats: state = 0\n" \ + "Stats: scheduled_downtime_depth = 0\n" \ + "StatsAnd: 2\n"), + + ( _("Down"), "#f00", + "Stats: state = 1\n" \ + "Stats: scheduled_downtime_depth = 0\n" \ + "StatsAnd: 2\n"), + + ( _("Unreachable"), "#f80", + "Stats: state = 2\n" \ + "Stats: scheduled_downtime_depth = 0\n" \ + "StatsAnd: 2\n"), + + ( _("In downtime"), "#0af", + "Stats: scheduled_downtime_depth > 0\n" \ + ) + ] + filter = "Filter: custom_variable_names < _REALNAME\n" + + render_statistics("hosts", table, filter) + +def dashlet_servicestats(): + table = [ + ( _("Ok"), "#0b3", + "Stats: state = 0\n" \ + "Stats: scheduled_downtime_depth = 0\n" \ + "Stats: host_scheduled_downtime_depth = 0\n" \ + "StatsAnd: 3\n"), + + ( _("Warning"), "#ff0", + "Stats: state = 1\n" \ + "Stats: scheduled_downtime_depth = 0\n" \ + "Stats: host_scheduled_downtime_depth = 0\n" \ + "StatsAnd: 3\n"), + + ( _("Unknown"), "#f80", + "Stats: state = 3\n" \ + "Stats: scheduled_downtime_depth = 0\n" \ + "Stats: host_scheduled_downtime_depth = 0\n" \ + "StatsAnd: 3\n"), + + ( _("Critical"), "#f00", + "Stats: state = 2\n" \ + "Stats: scheduled_downtime_depth = 0\n" \ + "Stats: host_scheduled_downtime_depth = 0\n" \ + "StatsAnd: 3\n"), + + ( _("In downtime"), "#0af", + "Stats: scheduled_downtime_depth > 0\n" \ + "Stats: host_scheduled_downtime_depth > 0\n" \ + "StatsOr: 2\n" \ + ) + ] + filter = "Filter: host_custom_variable_names < _REALNAME\n" + + render_statistics("services", table, filter) + +def render_statistics(what, table, filter): + query = "GET %s\n" % what + for entry in table: + query += entry[2] + query += filter + + result = html.live.query_summed_stats(query) + pies = zip(table, result) + total = sum([x[1] for x in pies]) + pie_diameter = 136 + + html.write('<canvas class=pie width=%d height=%d id=%s_stats style="float: left"></canvas>' % + (pie_diameter, pie_diameter, what)) + + html.write('<table class=hoststats style="float:left">') + for (name, color, query), count in pies + [ ((_("Total"), "", ""), total) ]: + html.write("<tr><th>%s</th><td>%d</td></tr>" % (name, count)) + + html.write("</table>") + + html.javascript(""" + +function chart_pie(from, to, color) { + context.beginPath(); + context.moveTo(pie_x, pie_y); + context.arc(pie_x, pie_y, pie_d / 2 - 2, rad(from), rad(to), false); + context.closePath(); + context.fillStyle = color; + context.shadowOffsetX = 5; + context.shadowOffsetY = 5; + context.shadowBlur = 10; + context.strokeStyle = "#ffffff"; + context.fill(); + context.stroke(); +} + +// convert percent to angle(rad) +function rad(g) { + return (g * 360 / 100 * Math.PI) / 180; +} + +pie_x = %(x)f; +pie_y = %(y)f; +pie_d = %(d)f; + +context = document.getElementById("%(what)s_stats").getContext('2d'); + +""" % { "what" : what, "x" : pie_diameter / 2, + "y": pie_diameter/2, "d" : pie_diameter }) + + + r = 0.0; + for (name, color, q), value in pies: + perc = 100.0 * value / total + html.javascript('chart_pie(%f, %f, %r);' % (r, r + perc, color)); + r += perc; + + diff --git a/web/htdocs/index.py b/web/htdocs/index.py index de4517c..43b59cc 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -155,7 +155,9 @@ def handler(req, profiling = True): response_code = apache.OK try: - read_get_vars(req) + # Do not parse variables again if profiling (and second run is done) + if profiling: + read_get_vars(req) # Ajax-Functions want no HTML output in case of an error but # just a plain server result code of 500 @@ -208,6 +210,7 @@ def handler(req, profiling = True): os.chmod(profilefile + ".py", 0755) return apache.OK + # Prepare output format output_format = html.var("output_format", "html") html.set_output_format(output_format) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 5a0ad1c..613a9c5 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -29,15 +29,40 @@ builtin_dashboards = { "title" : _("Main Overview"), "dashlets" : [ { + "url" : "dashlet_overview.py", + "position" : (1, 1), + "size" : (10, 5), + "shadow" : False, + "background" : False, + }, + { + "title" : _("Host Statistics"), + "url" : "dashlet_hoststats.py", + "position" : (11, 1), + "size" : (10, 6), + "shadow" : True, + "background" : True, + "refresh" : 60, + }, + { + "title" : _("Service Statistics"), + "url" : "dashlet_servicestats.py", + "position" : (21, 1), + "size" : (10, 6), + "shadow" : True, + "background" : True, + "refresh" : 60, + }, + { "title" : _("Host Problems"), "iframe" : "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (-1, 1), - "size" : (GROW, 8), + "size" : (GROW, 6), }, { "title" : _("Service Problems"), "iframe" : "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (1, 4), + "position" : (1, 7), "size" : (GROW, MAX), }, { @@ -46,14 +71,6 @@ builtin_dashboards = { "position" : (-1, -1), "size" : (GROW, GROW), }, - { - "url" : "dashlet_overview.py", - "position" : (1, 1), - "size" : (GROW, 3), - "shadow" : False, - "background" : False, - }, - # { # "title" : "CPU load of Nagios", # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 06c3683..b865dd4 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -63,5 +63,7 @@ pagehandlers.update({ "dashboard" : dashboard.page_dashboard, "dashboard_resize" : dashboard.ajax_resize, "dashlet_overview" : dashboard.dashlet_overview, + "dashlet_hoststats" : dashboard.dashlet_hoststats, + "dashlet_servicestats" : dashboard.dashlet_servicestats, }) diff --git a/web/plugins/views/dashboard.py b/web/plugins/views/dashboard.py index c6580f1..ccc9bb9 100644 --- a/web/plugins/views/dashboard.py +++ b/web/plugins/views/dashboard.py @@ -62,15 +62,15 @@ multisite_builtin_views.update({ ('host_icons', None), ('host_plugin_output', None), ('host_state_age', None), - ('host_check_age', None), - ('num_services_ok', 'host_ok'), + # ('host_check_age', None), # save space + # ('num_services_ok', 'host_ok'), # save space ('num_services_warn', 'host_warn'), ('num_services_crit', 'host_crit'), ('num_services_unknown', 'host_unknown'), ('num_services_pending', 'host_pending')], 'public': True, 'show_filters': [], - 'sorters': [], + 'sorters': [('hoststate', True)], 'title': 'Host problems', 'topic': None, },

13 years, 2 months

Check_MK Git: check_mk: Multisite: added icons to context buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6fea50d016e1d9e8ed0ca61cf694f2e244dbdce7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fea50d016e1d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 17:33:51 2011 +0200 Multisite: added icons to context buttons --- ChangeLog | 1 + web/htdocs/check_mk.css | 1 - web/htdocs/images/icon_aggr.png | Bin 0 -> 3365 bytes web/htdocs/images/icon_comment.png | Bin 0 -> 5069 bytes web/htdocs/images/icon_downtime.png | Bin 0 -> 4052 bytes web/htdocs/images/icon_history.png | Bin 0 -> 4711 bytes web/htdocs/images/icon_newfolder.png | Bin 0 -> 3460 bytes web/htdocs/images/icon_status.png | Bin 4401 -> 2781 bytes web/htdocs/views.py | 33 ++++++++++++++++++++------------- web/htdocs/wato.py | 2 +- web/plugins/views/builtin.py | 26 ++++++++++++++++++++++++-- 11 files changed, 46 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6fea50d016…

13 years, 2 months

Check_MK Git: check_mk: WATO: improved linking with status GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c44850025c75f3d1f1268a3cac2947d4e865f445 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44850025c75f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 17:02:53 2011 +0200 WATO: improved linking with status GUI --- web/htdocs/config.py | 9 +++-- web/htdocs/htmllib.py | 4 ++- web/htdocs/images/icon_abort.png | Bin 0 -> 3681 bytes web/htdocs/images/icon_apply.png | Bin 0 -> 2855 bytes web/htdocs/images/icon_back.png | Bin 0 -> 2687 bytes web/htdocs/images/icon_new.png | Bin 0 -> 3005 bytes web/htdocs/images/icon_properties.png | Bin 0 -> 5083 bytes web/htdocs/images/icon_search.png | Bin 0 -> 3885 bytes web/htdocs/images/icon_status.png | Bin 0 -> 4401 bytes web/htdocs/images/icon_trash.png | Bin 0 -> 3550 bytes web/htdocs/images/icon_wato.png | Bin 0 -> 3408 bytes web/htdocs/images/icon_wato_changes.png | Bin 0 -> 1869 bytes web/htdocs/views.py | 2 +- web/htdocs/wato.py | 51 ++++++++++++++++++------------- web/plugins/sidebar/wato.py | 2 +- 15 files changed, 40 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c44850025c…

13 years, 2 months

Check_MK Git: check_mk: WATO: bring tree structure in status GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24c2d1eb0b9a1ef9497a46ac87bb831580bac8ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24c2d1eb0b9a1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 16:26:12 2011 +0200 WATO: bring tree structure in status GUI --- LIESMICH.baum | 33 ++++++++++++--- web/htdocs/check_mk.css | 10 ++++ web/htdocs/js/sidebar.js | 34 +++++++++++++++ web/htdocs/js/wato.js | 1 + web/htdocs/views.py | 52 +++++++++++++++++++---- web/htdocs/wato.py | 96 ++++++++++++++++++++++++----------------- web/plugins/sidebar/wato.py | 31 ++++++++++++-- web/plugins/views/filters.py | 1 - web/plugins/views/wato.py | 11 ++++- 9 files changed, 206 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=24c2d1eb0b…

13 years, 2 months

Check_MK Git: check_mk: Remove debug output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da4f68113bde3ee934d4ee9a7eb4c3ddc05a9753 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da4f68113bde3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 11:47:58 2011 +0200 Remove debug output --- modules/check_mk.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 71b9667..14c3699 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3615,8 +3615,6 @@ for _f in list_of_files: else: raise -import pprint ; pprint.pprint(host_paths) ; del pprint - # Strip off host tags from the list of all_hosts. Host tags can be # appended to the hostnames in all_hosts, separated by pipe symbols, # e.g. "zbghlnx04|bgh|linux|test" and are stored in a separate

13 years, 2 months

Check_MK Git: check_mk: WATO: snapin now also shows files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bdbcae396bead9226dbf29adf38a83889fd45188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdbcae396bead9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 12:07:25 2011 +0200 WATO: snapin now also shows files --- web/htdocs/wato.py | 87 ++++++++++++++++++++++-------------------- web/plugins/sidebar/wato.py | 2 +- 2 files changed, 47 insertions(+), 42 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14f8f0e..f12fc68 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1214,47 +1214,6 @@ def bulk_cleanup_attributes(the_file, hosts): return num_shown > 0 - - - - -# +----------------------------------------------------------------------+ -# | ____ _ _ _ | -# | / ___|(_) __| | ___| |__ __ _ _ __ | -# | \___ \| |/ _` |/ _ \ '_ \ / _` | '__| | -# | ___) | | (_| | __/ |_) | (_| | | | -# | |____/|_|\__,_|\___|_.__/ \__,_|_| | -# | | -# +----------------------------------------------------------------------+ -# | Functions called from the WATO sidebar snapin | -# +----------------------------------------------------------------------+ - -def render_link_tree(format): - load_folder_config() - - def render_folder(f): - - subfolders = f[".folders"] - path = f[".path"] - filename = "/" + "/".join(path) + "/" - if len(path) > 0: - url = "wato.py?filename=" + htmllib.urlencode(filename) - if len(subfolders) == 0: - title = format % (url, f["title"]) - else: - title = '<a target=main href="%s">%s</a>' % (url, f["title"]) - else: - title = '<a target=main href="wato.py">%s</a>' % f["title"] - - if len(subfolders) > 0: - html.begin_foldable_container('wato', filename, False, title) - for sf in sort_by_title(subfolders.values()): - render_folder(sf) - html.end_foldable_container() - else: - html.write(title) - - render_folder(g_root_folder) # +----------------------------------------------------------------------+ @@ -2808,6 +2767,52 @@ class API: result.append((attr.title(), content)) return result + # Get information about the folder and directory tree. + # This is useful for components that display hosts in + # the tree (e.g. the status GUI). + def get_folder_tree(self): + load_folder_config() + return g_root_folder + + + # Render clickable and foldable tree of all WATO folders + # and files (e.g. used by sidebar snapins) + def render_link_tree(self, format): + self._render_linktree_folder(self.get_folder_tree(), format) + + + # BELOW ARE PRIVATE HELPER FUNCTIONS + + def _render_linktree_folder(self, f, format): + subfolders = f.get(".folders", {}) + subfiles = f.get(".files", {}) + is_leaf = len(subfolders) == 0 and len(subfiles) == 0 + + path = f[".path"] + filename = "/" + "/".join(path) + if not filename.endswith(".mk"): + filename += "/" + + if len(path) > 0: + url = "wato.py?filename=" + htmllib.urlencode(filename) + if is_leaf: + title = format % (url, f["title"]) + else: + title = '<a target=main href="%s">%s</a>' % (url, f["title"]) + else: + title = '<a target=main href="wato.py">%s</a>' % f["title"] + + + if not is_leaf: + html.begin_foldable_container('wato', filename, False, title) + for sf in sort_by_title(subfolders.values()): + self._render_linktree_folder(sf, format) + for sf in sort_by_title(subfiles.values()): + self._render_linktree_folder(sf, format) + html.end_foldable_container() + else: + html.write(title) + def _cleanup_directory(self, thing): # drop 'parent' entry, recursively diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 8bed022..38e49d4 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -47,7 +47,7 @@ def render_wato_files(): def ajax_wato_files(): if config.may("use_wato"): format = ("<li>%s</li>" % link("XX", "XX")).replace("XX", "%s") - wato.render_link_tree(format) + wato.api.render_link_tree(format) sidebar_snapins["wato"] = {

13 years, 2 months

Check_MK Git: check_mk: Multisite: new filter for WATO folder of host

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bba8d401d05bd31b796f370b37222ae21a863856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bba8d401d05bd3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 25 12:08:22 2011 +0200 Multisite: new filter for WATO folder of host --- ChangeLog | 1 + web/htdocs/htmllib.py | 7 ++-- web/htdocs/views.py | 16 ++++++++++ web/plugins/views/wato.py | 73 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b101cd..8a11d3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' snapin foldable * Replace old main view by dashboard. + * new filter for WATO folder of host WATO: * Configration files can now be administered via the WEB UI diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4c0878d..ed73cbd 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -336,10 +336,9 @@ class html: def sorted_select(self, varname, options, deflt="", onchange=None): # Sort according to display texts, not keys - swapped = [ (disp, key) for key, disp in options ] - swapped.sort() - swapped = [ (key, disp) for disp, key in swapped ] - html.select(self, varname, swapped, deflt, onchange) + sorted = options[:] + sorted.sort(lambda a,b: cmp(a[1].lower(), b[1].lower())) + html.select(self, varname, sorted, deflt, onchange) def select(self, varname, options, deflt="", onchange=None): current = self.var(varname, deflt) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 238156f..bfb11ce 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -186,6 +186,22 @@ def declare_filter(sort_index, f, comment = None): f.sort_index = sort_index # Base class for all filters +# name: The unique id of that filter. This id is e.g. used in the +# persisted view configuration +# title: The title of the filter visible to the user. This text +# may be localized +# info: The datasource info this filter needs to work. If this +# is "service", the filter will also be available in tables +# showing service information. "host" is available in all +# service and host views. The log datasource provides both +# "host" and "service". Look into datasource.py for which +# datasource provides which information +# htmlvars: HTML variables this filter uses +# link_columns: If this filter is used for linking (state "hidden"), then +# these Livestatus columns are needed to fill the filter with +# the proper information. In most cases, this is just []. Only +# a few filters are useful for linking (such as the host_name and +# service_description filters with exact match) class Filter: def __init__(self, name, title, info, htmlvars, link_columns): self.name = name diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py new file mode 100644 index 0000000..69a087a --- /dev/null +++ b/web/plugins/views/wato.py @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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- +# ails. 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. + +import wato + + +class FilterWatoFile(Filter): + def __init__(self): + Filter.__init__(self, "watofile", "WATO Folder/File", "host", ["watofile"], []) + self.tree = wato.api.get_folder_tree() + self.path_to_tree = {} # keep mapping from string-paths to folders/files + self.selection = self.folder_selection(self.tree, "", 0) + + def display(self): + html.select(self.name, [("", "")] + self.selection) + + def filter(self, infoname): + current = html.var(self.name) + if current and current in self.path_to_tree: + return "Filter: host_custom_variables ~ PATH ^%s\n" % current + else: + return "" + + def folder_selection(self, folder, prefix, depth): + my_path = prefix + folder[".name"] + if not my_path.endswith(".mk"): + my_path += "/" + + if depth: + title_prefix = "   " * depth + "` " + "- " * depth + else: + title_prefix = "" + self.path_to_tree[my_path] = True + sel = [ (my_path , title_prefix + folder["title"]) ] + sel += self.sublist(folder.get(".files", {}), my_path, depth) + sel += self.sublist(folder.get(".folders", {}), my_path, depth) + return sel + + def sublist(self, elements, my_path, depth): + vs = elements.values() + vs.sort(lambda a, b: cmp(a["title"].lower(), b["title"].lower())) + sel = [] + for e in vs: + sel += self.folder_selection(e, my_path, depth + 1) + return sel + + + +declare_filter(10, FilterWatoFile()) +

13 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits