Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Sidebar: footnotelink now allows javascript URLs

by Mathias Kettner

Module: check_mk Branch: master Commit: 3100fe7942e670f28e06e789b2b04a1a0a308c33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3100fe7942e670… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 11:02:22 2014 +0200 Sidebar: footnotelink now allows javascript URLs --- web/htdocs/sidebar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index eea65b9..0607df6 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -69,7 +69,7 @@ def link(text, url, target="main", onclick = None): # [1] protocol://hostname/url/link.py # [2] /absolute/link.py # [3] relative.py - if not (":" in url[:10]) and url[0] != '/': + if not (":" in url[:10]) and not url.startswith("javascript") and url[0] != '/': url = defaults.url_prefix + "check_mk/" + url onclick = onclick and (' onclick="%s"' % html.attrencode(onclick)) or '' return '<a onfocus="if (this.blur) this.blur();" target="%s" ' \

9 years, 9 months

Check_MK Git: check_mk: Put reporting snapin into default sidebar

by Mathias Kettner

Module: check_mk Branch: master Commit: 19ce5e428558acefd161cd69b8346db5e65582b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19ce5e428558ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 09:58:16 2014 +0200 Put reporting snapin into default sidebar --- web/htdocs/views.py | 2 +- web/plugins/config/builtin.py | 1 + web/plugins/views/availability.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 960a795..7eaaf03 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1437,7 +1437,7 @@ def show_context_links(thisview, show_filters, display_options, bestof = config.context_buttons_to_show) if config.reporting_available(): - html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "pdf") + html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") links = visuals.collect_context_links(thisview) for linktitle, uri, icon, buttonid in links: diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 1c5f710..8c82e27 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -56,6 +56,7 @@ sidebar = [ ('tactical_overview', 'open'), ('search', 'open'), ('views', 'open'), + ('reports', 'closed'), # does not harm if not available ('bookmarks', 'open'), ('admin', 'open'), ('master_control', 'closed') diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 8601608..698d726 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -142,7 +142,7 @@ def render_availability(view, datasource, filterheaders, display_options, togglebutton("avoptions", html.has_user_errors(), "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") if config.reporting_available(): - html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "pdf") + html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") if timeline: html.context_button(_("Availability"), html.makeuri([("timeline", "")]), "availability") history_url = history_url_of(tl_site, tl_host, tl_service, range[0], range[1])

9 years, 9 months

Check_MK Git: check_mk: Repair comments in config module

by Mathias Kettner

Module: check_mk Branch: master Commit: dd720d3500d248eba5403ad2dcec64ad2145c63c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd720d3500d248… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 09:37:06 2014 +0200 Repair comments in config module --- web/htdocs/config.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index e329b7b..fe1eeb7 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -24,21 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# The following debug code can be used to tackle a mod_python -# problem when using the local hierarchy for plugins that refer -# to the config module. -# import time, os -# fn = "/tmp/config.load.%d" % os.getpid() -# if os.path.exists(fn): -# raise Exception("Mist: config zweimal geladen!!") -# -# file(fn, "a").write("[%d] Geladen: %s\n" % (os.getpid(), time.time())) - import os, pprint, glob from lib import * -# In case we start standalone and outside an check_mk enviroment, -# we have another path for the defaults +# In case we start standalone and outside a Check_MK enviroment, +# we have another path for the defaults. +# FIXME: Do we need thus rubbish anymore? try: import defaults except: @@ -46,6 +37,7 @@ except: # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets' +# FIXME: We should officially drop Python 2.3 support try: set() except NameError: @@ -110,7 +102,7 @@ aggregation_functions = {} #. -# .----------------------------------------------------------------------. +# .--Functions-----------------------------------------------------------. # | _____ _ _ | # | | ___| _ _ __ ___| |_(_) ___ _ __ ___ | # | | |_ | | | | '_ \ / __| __| |/ _ \| '_ \/ __| | @@ -428,6 +420,7 @@ def save_user_file(name, content, unlock = False): raise MKConfigError(_("Cannot save %s options for user <b>%s</b> into <b>%s</b>: %s") % \ (name, user_id, path, e)) +#. # .--Sites---------------------------------------------------------------. # | ____ _ _ | # | / ___|(_) |_ ___ ___ |

9 years, 9 months

Check_MK Git: check_mk: More clean check for availability of reporting

by Mathias Kettner

Module: check_mk Branch: master Commit: d1fec08d64a595c72c26418ceb8d30755d6792e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1fec08d64a595… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 09:14:49 2014 +0200 More clean check for availability of reporting --- web/htdocs/config.py | 72 ++++++++++++++++++++++++++++--------- web/htdocs/index.py | 5 --- web/htdocs/views.py | 14 +------- web/htdocs/visuals.py | 2 +- web/plugins/views/availability.py | 5 +-- 5 files changed, 59 insertions(+), 39 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 3bceae3..e329b7b 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -51,6 +51,19 @@ try: except NameError: from sets import Set as set +#. +# .--Declarations--------------------------------------------------------. +# | ____ _ _ _ | +# | | _ \ ___ ___| | __ _ _ __ __ _| |_(_) ___ _ __ ___ | +# | | | | |/ _ \/ __| |/ _` | '__/ _` | __| |/ _ \| '_ \/ __| | +# | | |_| | __/ (__| | (_| | | | (_| | |_| | (_) | | | \__ \ | +# | |____/ \___|\___|_|\__,_|_| \__,_|\__|_|\___/|_| |_|___/ | +# | | +# +----------------------------------------------------------------------+ +# | Declarations of global variables and constants | +# '----------------------------------------------------------------------' + + user = None user_id = None builtin_role_ids = [ "user", "admin", "guest" ] # hard coded in various permissions @@ -151,15 +164,27 @@ def load_config(): include(p) +def reporting_available(): + try: + # Check the existance of one arbitrary config variable from the + # reporting module + reporting_filename + return True + except: + return False + + #. -# ------------------------------------------------------------------- -# ____ _ _ -# | _ \ ___ _ __ _ __ ___ (_)___ ___(_) ___ _ __ ___ -# | |_) / _ \ '__| '_ ` _ \| / __/ __| |/ _ \| '_ \/ __| -# | __/ __/ | | | | | | | \__ \__ \ | (_) | | | \__ \ -# |_| \___|_| |_| |_| |_|_|___/___/_|\___/|_| |_|___/ -# -# ------------------------------------------------------------------- +# .--Permissions---------------------------------------------------------. +# | ____ _ _ | +# | | _ \ ___ _ __ _ __ ___ (_)___ ___(_) ___ _ __ ___ | +# | | |_) / _ \ '__| '_ ` _ \| / __/ __| |/ _ \| '_ \/ __| | +# | | __/ __/ | | | | | | | \__ \__ \ | (_) | | | \__ \ | +# | |_| \___|_| |_| |_| |_|_|___/___/_|\___/|_| |_|___/ | +# | | +# +----------------------------------------------------------------------+ +# | Handling of users, permissions and roles | +# '----------------------------------------------------------------------' def declare_permission(name, title, description, defaults): perm = { "name" : name, "title" : title, "description" : description, "defaults" : defaults } @@ -403,14 +428,16 @@ def save_user_file(name, content, unlock = False): raise MKConfigError(_("Cannot save %s options for user <b>%s</b> into <b>%s</b>: %s") % \ (name, user_id, path, e)) -# ------------------------------------------------------------------- -# ____ _ _ -# / ___|(_) |_ ___ ___ -# \___ \| | __/ _ \/ __| -# ___) | | || __/\__ \ -# |____/|_|\__\___||___/ -# -# ------------------------------------------------------------------- +# .--Sites---------------------------------------------------------------. +# | ____ _ _ | +# | / ___|(_) |_ ___ ___ | +# | \___ \| | __/ _ \/ __| | +# | ___) | | || __/\__ \ | +# | |____/|_|\__\___||___/ | +# | | +# +----------------------------------------------------------------------+ +# | The config module provides some helper functions for sites. | +# '----------------------------------------------------------------------' sites = { "": {} } use_siteicons = False @@ -468,6 +495,19 @@ def read_site_config(): def save_site_config(): save_user_file("siteconfig", user_siteconf) +#. +# .--Plugins-------------------------------------------------------------. +# | ____ _ _ | +# | | _ \| |_ _ __ _(_)_ __ ___ | +# | | |_) | | | | |/ _` | | '_ \/ __| | +# | | __/| | |_| | (_| | | | | \__ \ | +# | |_| |_|\__,_|\__, |_|_| |_|___/ | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Handling of our own plugins. In plugins other software pieces can | +# | declare defaults for configuration variables. | +# '----------------------------------------------------------------------' + def load_plugins(): load_web_plugins("config", globals()) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index f4c85b0..b43ddb6 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -76,11 +76,6 @@ def load_all_plugins(): else: module.load_plugins() - # Load reporting plugins (only available in subscription version) - try: - reporting.load_plugins() - except: - pass __builtin__.load_all_plugins = load_all_plugins diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e7deaa4..960a795 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -713,14 +713,6 @@ def page_view(): html.set_page_context(dict(visuals.get_context_html_vars(view))) - if config.may("reporting.instant"): - if html.var("instant_report"): - import reporting - reporting.instant_report() - return - - html.add_status_icon("report", _("Export as PDF (instant report)"), html.makeuri([("instant_report", "1")])) - show_view(view, True, True, True) @@ -1444,12 +1436,8 @@ def show_context_links(thisview, show_filters, display_options, html.context_button(_("WATO"), url, "wato", id="wato", bestof = config.context_buttons_to_show) - try: - # FIXME: Berechtigung prüfen - config.reporting_available + if config.reporting_available(): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "pdf") - except: - pass links = visuals.collect_context_links(thisview) for linktitle, uri, icon, buttonid in links: diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 786ecfa..95d6f24 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -899,7 +899,7 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): # Now apply the multiple context filters for info_key in only_infos: - for filter_name, filter_vars in visual.get('context', {}).items(): + for filter_name, filter_vars in visual['context'].items(): if type(filter_vars) == dict: # this is a multi-context filter # We add the filter only if *none* if its HTML variables are present on the URL # This important because checkbox variables are not present if the box is not checked. diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 920809c..8601608 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -141,11 +141,8 @@ def render_availability(view, datasource, filterheaders, display_options, html.begin_context_buttons() togglebutton("avoptions", html.has_user_errors(), "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") - try: - config.reporting_available + if config.reporting_available(): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "pdf") - except: - pass if timeline: html.context_button(_("Availability"), html.makeuri([("timeline", "")]), "availability") history_url = history_url_of(tl_site, tl_host, tl_service, range[0], range[1])

9 years, 9 months

Check_MK Git: check_mk: Button for adding to also for availability

by Mathias Kettner

Module: check_mk Branch: master Commit: e75daab34b1bac0e6ccebaf5a578324f8d28269c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75daab34b1bac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 19:40:20 2014 +0200 Button for adding to also for availability For dashboards this is probably not working yet... --- web/htdocs/htmllib.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d79a2c5..83af97a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -843,10 +843,12 @@ class html: '<img class=statusicon src="images/status_download_csv.png" title="%s"></a>\n' % \ (self.makeuri([("output_format", "csv_export")]), _("Export as CSV")) + if self.myfile == "view": + mode_name = self.var('mode') == "availability" and "availability" or "view" h += '<div class="visualadd"><a class="visualadd" href="javascript:void(0)" ' \ - 'onclick="toggle_add_to_visual(this, \'view\', %s, {\'name\': \'%s\'})">' \ + 'onclick="toggle_add_to_visual(this, \'%s\', %s, {\'name\': \'%s\'})">' \ '<img class=statusicon src="images/status_add_dashlet.png" title="%s"></a></div>\n' % \ - (self.page_context, self.attrencode(self.var('view_name')), _("Add this view to...")) + (mode_name, self.attrencode(self.page_context), self.var('view_name'), _("Add this view to...")) for img, tooltip in self.status_icons.items(): if type(tooltip) == tuple:

9 years, 9 months

Check_MK Git: check_mk: Function for getting context from URI supports single infos

by Mathias Kettner

Module: check_mk Branch: master Commit: acdd19bcc740adcde8f17ff481d59268889b6443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acdd19bcc740ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 19:40:36 2014 +0200 Function for getting context from URI supports single infos --- web/htdocs/visuals.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 7da8639..786ecfa 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -914,14 +914,18 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): # Vice versa: find all filters that belong to the current URI variables # and create a context dictionary from that. -def get_context_from_uri_vars(only_infos=None): +def get_context_from_uri_vars(only_infos=None, single_infos=[]): context = {} for filter_name, filter_object in multisite_filters.items(): if only_infos == None or filter_object.info in only_infos: this_filter_vars = {} for varname in filter_object.htmlvars: if html.has_var(varname): - this_filter_vars[varname] = html.var(varname) + if filter_object.info in single_infos: + context[filter_name] = html.var(varname) + break + else: + this_filter_vars[varname] = html.var(varname) if this_filter_vars: context[filter_name] = this_filter_vars return context

9 years, 9 months

Check_MK Git: check_mk: Visual editor: fix clone mode detection

by Mathias Kettner

Module: check_mk Branch: master Commit: cb30e6aeca90090378add9f607b5a4cfd27f454e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb30e6aeca9009… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 17:20:33 2014 +0200 Visual editor: fix clone mode detection --- web/htdocs/visuals.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 9252a2a..7da8639 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -534,6 +534,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, visual = all_visuals.get((config.user_id, visualname)) if not visual: visual = all_visuals.get(('', visualname)) # load builtin visual + mode = 'clone' single_infos = visual['single_infos']

9 years, 9 months

Check_MK Git: check_mk: Integrate buttons for PDF export

by Mathias Kettner

Module: check_mk Branch: master Commit: 62f41504b208a73c89efeb0add70688c6aa9ab04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62f41504b208a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 16:57:26 2014 +0200 Integrate buttons for PDF export --- web/htdocs/views.py | 7 +++++++ web/htdocs/visuals.py | 14 ++++++++++++++ web/plugins/views/availability.py | 20 ++++++++++++++------ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 573c211..e7deaa4 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1444,6 +1444,13 @@ def show_context_links(thisview, show_filters, display_options, html.context_button(_("WATO"), url, "wato", id="wato", bestof = config.context_buttons_to_show) + try: + # FIXME: Berechtigung prüfen + config.reporting_available + html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "pdf") + except: + pass + links = visuals.collect_context_links(thisview) for linktitle, uri, icon, buttonid in links: html.context_button(linktitle, url=uri, icon=icon, id=buttonid, bestof=config.context_buttons_to_show) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index ce9f581..9252a2a 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -911,6 +911,20 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): for uri_varname, value in filter_vars.items(): html.set_var(uri_varname, value) +# Vice versa: find all filters that belong to the current URI variables +# and create a context dictionary from that. +def get_context_from_uri_vars(only_infos=None): + context = {} + for filter_name, filter_object in multisite_filters.items(): + if only_infos == None or filter_object.info in only_infos: + this_filter_vars = {} + for varname in filter_object.htmlvars: + if html.has_var(varname): + this_filter_vars[varname] = html.var(varname) + if this_filter_vars: + context[filter_name] = this_filter_vars + return context + # Compute Livestatus-Filters based on a given context. Returns # the only_sites list and a string with the filter headers diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 2741203..920809c 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -93,13 +93,8 @@ def render_availability(view, datasource, filterheaders, display_options, if handle_edit_annotations(): return - # We need the availability options now, but cannot display the - # form code for that yet. Ignore the HTML code. - html.plug() - avoptions = render_availability_options() + avoptions = get_availability_options_from_url() range, range_title = avoptions["range"] - html.drain() - html.unplug() timeline = not not html.var("timeline") if timeline: @@ -146,6 +141,11 @@ def render_availability(view, datasource, filterheaders, display_options, html.begin_context_buttons() togglebutton("avoptions", html.has_user_errors(), "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") + try: + config.reporting_available + html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "pdf") + except: + pass if timeline: html.context_button(_("Availability"), html.makeuri([("timeline", "")]), "availability") history_url = history_url_of(tl_site, tl_host, tl_service, range[0], range[1]) @@ -506,6 +506,14 @@ avoption_entries = [ ) ] +# Get availability options without rendering the valuespecs +def get_availability_options_from_url(): + html.plug() + avoptions = render_availability_options() + html.drain() + html.unplug() + return avoptions + def render_availability_options(): if html.var("_reset") and html.check_transaction():

9 years, 9 months

Check_MK Git: check_mk: Repair sidebar service search after renaming filters

by Mathias Kettner

Module: check_mk Branch: master Commit: 82d72737a8348afd164e17afd57f866e7131b9d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82d72737a8348a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 16:38:22 2014 +0200 Repair sidebar service search after renaming filters --- web/htdocs/sidebar.py | 4 ++-- web/plugins/sidebar/search.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 457217c..eea65b9 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -759,7 +759,7 @@ def search_url_tmpl(used_filters, row, exact = True): elif ty == 'servicegroups': return 'view.py?view_name=servicegroup&servicegroup=%(name)s&site=%(site)s' elif ty == 'services': - return 'view.py?view_name=allservices&service=%(name)s&site=%(site)s' + return 'view.py?view_name=allservices&service_regex=%(name)s&site=%(site)s' else: # Get the search template if plugin.get("search_url_tmpl_func"): return plugin['search_url_tmpl_func'](used_filters, row_data) @@ -775,7 +775,7 @@ def search_url_tmpl(used_filters, row, exact = True): elif ty == 'servicegroups': return 'view.py?view_name=svcgroups&servicegroup_name=%(name)s&site=%(site)s' elif ty == 'services': - return 'view.py?view_name=allservices&service=%(name)s&site=%(site)s' + return 'view.py?view_name=allservices&service_regex=%(name)s&site=%(site)s' # Search the template url_tmpl = find_tmpl() diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index b700396..41b3976 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -217,7 +217,7 @@ def match_host_service_url_tmpl(used_filters, row_dict, host_is_ip = False): if type(row_dict[entry]) == list: row_dict[entry] = row_dict[entry][0] - for param, key in [ ("service", "service_description"), + for param, key in [ ("service_regex", "service_description"), (host_is_ip and "host_address" or "host", "host_name"), ("opthostgroup", "host_groups"), ("optservicegroup", "service_groups"), @@ -242,7 +242,7 @@ def search_host_service_url_tmpl(used_filters, data, host_is_ip = False): filters_combined[key] = value[0] tmpl = 'view.py?view_name=searchsvc&filled_in=filter' - for url_param, qs_name in [ ("service", "services" ), + for url_param, qs_name in [ ("service_regex", "services" ), host_is_ip and ("host_address", "host" )\ or ("host", "hosts" ), ("opthostgroup", "hostgroups" ),

9 years, 9 months

Check_MK Git: check_mk: visuals: new helper function for getting filter headers

by Mathias Kettner

Module: check_mk Branch: master Commit: cea80ffb8d19e46c811ec843330e59e1880508c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cea80ffb8d19e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 16:05:18 2014 +0200 visuals: new helper function for getting filter headers --- web/htdocs/visuals.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 689875b..ce9f581 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -912,6 +912,32 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): html.set_var(uri_varname, value) +# Compute Livestatus-Filters based on a given context. Returns +# the only_sites list and a string with the filter headers +def get_filter_headers(datasource, context): + # Prepare Filter headers for Livestatus + filter_headers = "" + only_sites = None + html.stash_vars() + for filter_name, filter_vars in context.items(): + # first set the HTML variables. Sorry - the filters need this + if type(filter_vars) == dict: # this is a multi-context filter + for uri_varname, value in filter_vars.items(): + html.set_var(uri_varname, value) + else: + html.set_var(filter_name, filter_vars) + + # Now compute filter headers for all infos of the used datasource + our_infos = datasource["infos"] + for filter_name, filter_object in multisite_filters.items(): + if filter_object.info in our_infos: + header = filter_object.filter(datasource["table"]) + if header.startswith("Sites:"): + only_sites = header.strip().split(" ")[1:] + else: + filter_headers += header + html.unstash_vars() + return filter_headers, only_sites #.

9 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014