Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Fix styling of close symbol in filter lists

by Mathias Kettner

Module: check_mk Branch: master Commit: 92b1f506ab7eed1bc79a5a35d5d759c775ad363a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92b1f506ab7eed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 16:16:37 2014 +0200 Fix styling of close symbol in filter lists --- web/htdocs/views.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index ea89445..f0f1074 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -139,10 +139,11 @@ table.valuespec_listof td.vlof_content.filter { table.valuespec_listof td.vlof_buttons.filter { width: 1px; border-style: none; + vertical-align: top; } table.valuespec_listof td.vlof_buttons.filter img { position: relative; - top: -18px; + top: 2px; left: -28px; width: 16px; height: 16px;

9 years, 9 months

Check_MK Git: check_mk: Fix default value of avoptions valuespec

by Mathias Kettner

Module: check_mk Branch: master Commit: 95948442d5f010d5fd143212231e38ad72af1e51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95948442d5f010… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 16:08:05 2014 +0200 Fix default value of avoptions valuespec --- web/htdocs/views.py | 4 +- web/plugins/views/availability.py | 89 ++++++++++++++++++++++--------------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e5df3ce..9ccf5b7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2191,7 +2191,9 @@ def group_value(row, group_painters): def get_painter_option(name): opt = multisite_painter_options[name] - if not config.may("general.painter_options"): + if "forced_value" in opt: + return opt["forced_value"] + elif not config.may("general.painter_options"): return opt['valuespec'].default_value() else: return opt.get("value", opt['valuespec'].default_value()) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 698d726..bb17a82 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -195,7 +195,7 @@ avoption_entries = [ False, Timerange( title = _("Time Range"), - default_value = 'm1', + default_value = 'd0', ) ), @@ -229,7 +229,8 @@ avoption_entries = [ ( "honor", _("Honor scheduled downtimes") ), ( "ignore", _("Ignore scheduled downtimes") ), ( "exclude", _("Exclude scheduled downtimes" ) ), - ] + ], + default_value = "honor", ) ), ( "exclude_ok", @@ -249,13 +250,19 @@ avoption_entries = [ columns = 2, elements = [ ( "flapping", - Checkbox(label = _("Consider periods of flapping states")), + Checkbox( + label = _("Consider periods of flapping states"), + default_value = True), ), ( "host_down", - Checkbox(label = _("Consider times where the host is down")), + Checkbox( + label = _("Consider times where the host is down"), + default_value = True), ), ( "unmonitored", - Checkbox(label = _("Include unmonitored time")), + Checkbox( + label = _("Include unmonitored time"), + default_value = True), ), ], optional_keys = False, @@ -278,7 +285,8 @@ avoption_entries = [ ( "warn", _("WARN") ), ( "crit", _("CRIT") ), ( "unknown", _("UNKNOWN") ), - ] + ], + default_value = "warn", ), ), ( "unknown", @@ -289,7 +297,8 @@ avoption_entries = [ ( "warn", _("WARN") ), ( "crit", _("CRIT") ), ( "unknown", _("UNKNOWN") ), - ] + ], + default_value = "unknown", ), ), ( "host_down", @@ -301,7 +310,8 @@ avoption_entries = [ ( "crit", _("CRIT") ), ( "unknown", _("UNKNOWN") ), ( "host_down", _("Host Down") ), - ] + ], + default_value = "host_down", ), ), ], @@ -380,7 +390,8 @@ avoption_entries = [ ( "honor", _("Base report only on service times") ), ( "ignore", _("Include both service and non-service times" ) ), ( "exclude", _("Base report only on non-service times" ) ), - ] + ], + default_value = "honor", ) ), @@ -394,7 +405,8 @@ avoption_entries = [ ( "honor", _("Distinguish times in and out of notification period") ), ( "exclude", _("Exclude times out of notification period" ) ), ( "ignore", _("Ignore notification period") ), - ] + ], + default_value = "ignore", ) ), @@ -409,7 +421,8 @@ avoption_entries = [ ( "host", _("By Host") ), ( "host_groups", _("By Host group") ), ( "service_groups", _("By Service group") ), - ] + ], + default_value = None, ) ), @@ -423,6 +436,7 @@ avoption_entries = [ ("yyyy-mm-dd hh:mm:ss", _("YYYY-MM-DD HH:MM:SS") ), ("epoch", _("Unix Timestamp (Epoch)") ), ], + default_value = "yyyy-mm-dd hh:mm:ss", ) ), ( "timeformat", @@ -440,19 +454,20 @@ avoption_entries = [ ("hours", _("Hours") ), ("hhmmss", _("HH:MM:SS") ), ], + default_value = "percentage_2", ) ), - # Short time intervals ( "short_intervals", "single", True, Integer( title = _("Short Time Intervals"), + label = _("Ignore intervals shorter or equal"), minvalue = 0, unit = _("sec"), - label = _("Ignore intervals shorter or equal"), + default_value = 0, ), ), @@ -476,7 +491,7 @@ avoption_entries = [ ( "sum", _("Display total sum (for % the average)") ), ( "average", _("Display average") ), ], - default_value = sum, + default_value = "sum", ) ), @@ -495,10 +510,10 @@ avoption_entries = [ False, Age( title = _("Query Time Limit"), - default_value = 30, - unit = _("sec"), help = _("Limit the execution time of the query, in order to " "avoid a hanging system."), + unit = _("sec"), + default_value = 30, ), ) ] @@ -511,48 +526,50 @@ def get_availability_options_from_url(): html.unplug() return avoptions - -def render_availability_options(): - if html.var("_reset") and html.check_transaction(): - config.save_user_file("avoptions", {}) - for varname in html.vars.keys(): - if varname.startswith("avo_"): - html.del_var(varname) - html.del_var("avoptions") - - avoptions = { +def get_default_avoptions(): + return { "range" : (time.time() - 86400, time.time()), + "rangespec" : "d0", + "labelling" : [], "downtimes" : { "include" : "honor", "exclude_ok" : False, }, - "notification_period" : "ignore", - "service_period" : "honor", "consider" : { "flapping" : True, "host_down" : True, "unmonitored" : True, }, - "dateformat" : "yyyy-mm-dd hh:mm:ss", - "timeformat" : "percentage_2", - "labelling" : [], - "rangespec" : "d0", "state_grouping" : { "warn" : "warn", "unknown" : "unknown", "host_down" : "host_down", }, + "av_levels" : None, "outage_statistics" : ([],[]), + "av_mode" : False, + "service_period" : "honor", + "notification_period" : "ignore", + "grouping" : None, + "dateformat" : "yyyy-mm-dd hh:mm:ss", + "timeformat" : "percentage_2", "short_intervals" : 0, "dont_merge" : False, - "show_timeline" : False, "summary" : "sum", - "av_levels" : None, - "av_mode" : False, - "grouping" : None, + "show_timeline" : False, "timelimit" : 30, } +def render_availability_options(): + if html.var("_reset") and html.check_transaction(): + config.save_user_file("avoptions", {}) + for varname in html.vars.keys(): + if varname.startswith("avo_"): + html.del_var(varname) + html.del_var("avoptions") + + avoptions = get_default_avoptions() + # Users of older versions might not have all keys set. The following # trick will merge their options with our default options. avoptions.update(config.load_user_file("avoptions", {}))

9 years, 9 months

Check_MK Git: check_mk: Some corrected spellings

by Konstantin Büttner

Module: check_mk Branch: master Commit: 63822f759c14489896620c483c719a9a63b62d2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63822f759c1448… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 9 15:46:11 2014 +0200 Some corrected spellings --- web/htdocs/views.py | 2 +- web/plugins/wato/check_parameters.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7eaaf03..ede7d28 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -223,7 +223,7 @@ def DatasourceSelection(): return DropdownChoice( title = _('Datasource'), - help = _('The datasources defines which type of objects should be displayed with this view.'), + help = _('The datasources define which type of objects should be displayed with this view.'), choices = datasources, sorted = True, columns = 1, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 14a849b..c49ab8c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1442,7 +1442,7 @@ register_check_parameters( Dictionary( elements = [ ( "error_states", ListChoice( - title = _("Modem States whats lead to critical state"), + title = _("Modem States that lead to a critical state"), help = _("If one of the selected state occur, the check will repsond with a Critical state "), choices = [ ( 1, "other" ), @@ -2024,8 +2024,8 @@ filesystem_elements = [ Integer(title = _("Critical if below"), unit = _("hours"), default_value = 6, ), ])), ( "trend_showtimeleft", - Checkbox( title = _("Display timeleft in check output"), label = _("Enable"), - help = _("Normally the timeleft until disk full is only displayed when " + Checkbox( title = _("Display time left in check output"), label = _("Enable"), + help = _("Normally, the time left until the disk is full is only displayed when " "the configured levels have been breached. If you set this option " "the check always reports this information")) ), @@ -2318,7 +2318,7 @@ register_check_parameters( Alternative( title = _("Used bandwidth (traffic)"), help = _("Settings levels on the used bandwidth is optional. If you do set " - "levels you might also consider using an averaging."), + "levels you might also consider using averaging."), elements = [ Tuple( title = _("Percentual levels (in relation to policy speed)"), @@ -2492,7 +2492,7 @@ register_check_parameters( "currently used memory (RAM or SWAP) by all processes and sets this in relation " "to the total RAM of the system. This means that the memory usage can exceed 100%. " "A usage of 200% means that the total size of all processes is twice as large as " - "the main memory, so <b>at least</b> the half of it is currently swapped out. " + "the main memory, so <b>at least</b> half of it is currently swapped out. " "Besides Linux and UNIX systems, these parameters are also used for memory checks " "of other devices, like Fortigate devices."), elements = [ @@ -2551,7 +2551,7 @@ register_check_parameters( title = _("Averaging"), help = _("If this parameter is set, all measured values will be averaged " "over the specified time interval before levels are being applied. Per " - "default, averaging is turned off. "), + "default, averaging is turned off."), unit = _("minutes"), minvalue = 1, default_value = 60, @@ -2748,7 +2748,7 @@ register_check_parameters( _("State of ESX hosts and virtual machines"), Dictionary( help = _("Usually the check goes to WARN if a VM or host is powered off and OK otherwise. " - "You can change this behaviour on a per-state-base here."), + "You can change this behaviour on a per-state-basis here."), optional_keys = False, elements = [ ( "states", @@ -5749,7 +5749,7 @@ register_check_parameters(subgroup_applications, Checkbox( title = _("Monitoring of forwarded logfiles"), label = _("Warn if list of forwarded logfiles changes"), - help = _("If this option is enabled then the check monitors the list of forwarded " + help = _("If this option is enabled, the check monitors the list of forwarded " "logfiles and will warn you if at any time a logfile is missing or exceeding " "when compared to the initial list that was snapshotted during service detection. " "Reinventorize this check in order to make it OK again."), @@ -5768,9 +5768,9 @@ register_check_parameters(subgroup_applications, register_rule(group + '/' + subgroup_applications, varname = "logwatch_groups", title = _('Logfile Grouping Patterns'), - help = _('The check <tt>logwatch</tt> normaly creates one service for each logfile ' + help = _('The check <tt>logwatch</tt> normally creates one service for each logfile. ' 'By defining grouping patterns you can switch to the check <tt>logwatch.groups</tt>. ' - 'That check monitors a list of logfiles at once. This is usefull if you have ' + 'That check monitors a list of logfiles at once. This is useful if you have ' 'e.g. a folder with rotated logfiles where the name of the current logfile' 'also changes with each rotation'), valuespec = ListOf( @@ -5923,7 +5923,7 @@ register_check_parameters( help = _("By activating averaging, Check_MK will compute the average of " "the CPU utilization over a given interval. If you have defined " "alerting levels then these will automatically be applied on the " - "averaged value. This helps to mask out short peaks. "), + "averaged value. This helps to mask out short peaks."), unit = _("minutes"), minvalue = 1, default_value = 15,

9 years, 9 months

Check_MK Git: check_mk: Fix exception when creating a new view

by Mathias Kettner

Module: check_mk Branch: master Commit: c5feb6c2f84ea3d8fa67cdbac0bab12bf1eaceb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5feb6c2f84ea3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 15:26:52 2014 +0200 Fix exception when creating a new view --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4c30441..e5df3ce 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -517,7 +517,7 @@ def render_view_config(view, general_properties=True): view['datasource'] = ds_name for ident, vs in view_editor_specs(ds_name, general_properties): - vs.render_input(ident, view[ident]) + vs.render_input(ident, view.get(ident)) # Is used to change the view structure to be compatible to # the valuespec This needs to perform the inverted steps of the

9 years, 9 months

Check_MK Git: check_mk: Added time filter information to datasources

by Mathias Kettner

Module: check_mk Branch: master Commit: d82b0c77c90243b4ce411af61096efebf7a6ffcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d82b0c77c90243… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 14:36:12 2014 +0200 Added time filter information to datasources --- mkeventd/web/plugins/views/mkeventd.py | 2 ++ web/plugins/views/datasources.py | 4 ++++ web/plugins/visuals/filters.py | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 71d6e3d..d8cd4bc 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -284,6 +284,7 @@ if mkeventd_enabled: "infos" : [ "event", "host" ], "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id' ], + "time_filters" : [ "event_first" ], } multisite_datasources["mkeventd_history"] = { @@ -292,6 +293,7 @@ if mkeventd_enabled: "infos" : [ "history", "event", "host" ], "keys" : [], "idkeys" : [ 'site', 'host_name', 'event_id', 'history_line' ], + "time_filters" : [ "history_time" ], } diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 88b5a4a..61e85ff 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -174,6 +174,7 @@ multisite_datasources["log"] = { "infos" : [ "log", "host", "service", "contact", "command" ], "keys" : [], "idkeys" : [ "log_lineno" ], + "time_filters" : [ "logtime" ], } multisite_datasources["log_events"] = { @@ -183,6 +184,7 @@ multisite_datasources["log_events"] = { "infos" : [ "log", "host", "service" ], "keys" : [], "idkeys" : [ "log_lineno" ], + "time_filters" : [ "logtime" ], } multisite_datasources["log_host_events"] = { @@ -192,6 +194,7 @@ multisite_datasources["log_host_events"] = { "infos" : [ "log", "host" ], "keys" : [], "idkeys" : [ "log_lineno" ], + "time_filters" : [ "logtime" ], } multisite_datasources["alert_stats"] = { @@ -203,4 +206,5 @@ multisite_datasources["alert_stats"] = { "keys" : [], "idkeys" : [ 'host_name', 'service_description' ], "ignore_limit" : True, + "time_filters" : [ "logtime" ], } diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index e63c225..a006712 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -536,12 +536,6 @@ declare_filter(234, FilterNumberRange("host_num_services", _("Number of Services # Filter for setting time ranges, e.g. on last_state_change and last_check -# Variante eins: -# age [ ] seconds [ ] minutes [ ] hours [ ] days -# Variante zwei: (not implemented) -# since [2010-01-02] [00:00:00] -# Variante drei: (not implemented) -# from [2010-01-02] [00:00:00] until [2010-01-02] [00:00:00] class FilterTime(Filter): def __init__(self, info, name, title, column): self.column = column

9 years, 9 months

Check_MK Git: check_mk: Feature for showing context buttons also for non-single contexts

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c38c662bb0ace4fc43f113f649ba97976ca4793 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c38c662bb0ace… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 13:59:14 2014 +0200 Feature for showing context buttons also for non-single contexts --- web/htdocs/views.py | 6 +++-- web/htdocs/visuals.py | 67 +++++++++++++++++++++++++++++++------------------ 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7eaaf03..4c30441 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -711,7 +711,7 @@ def page_view(): if not view: raise MKGeneralException(_("No view defined with the name '%s'.") % html.attrencode(view_name)) - html.set_page_context(dict(visuals.get_context_html_vars(view))) + html.set_page_context(dict(visuals.get_singlecontext_html_vars(view))) show_view(view, True, True, True) @@ -1421,8 +1421,8 @@ def show_context_links(thisview, show_filters, display_options, view_optiondial_off("refresh") - # WATO: If we have a host context, then show button to WATO, if permissions allow this if 'B' in display_options: + # WATO: If we have a host context, then show button to WATO, if permissions allow this if html.has_var("host") \ and config.wato_enabled \ and config.may("wato.use") \ @@ -1436,9 +1436,11 @@ def show_context_links(thisview, show_filters, display_options, html.context_button(_("WATO"), url, "wato", id="wato", bestof = config.context_buttons_to_show) + # Button for creating an instant report (if reporting is available) if config.reporting_available(): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") + # Buttons to other views, dashboards, etc. 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 95d6f24..1a2b118 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -32,18 +32,22 @@ import config, table visual_types = { 'views': { - 'ident_attr': 'view_name', - 'title': _("view"), - 'plural_title': _("views"), - 'module_name': 'views', + 'show_url' : 'view.py', + 'ident_attr' : 'view_name', + 'title' : _("view"), + 'plural_title' : _("views"), + 'module_name' : 'views', + 'multicontext_links' : False, }, 'dashboards': { - 'ident_attr': 'name', - 'title': _("dashboard"), - 'plural_title': _("dashboards"), - 'module_name': 'dashboard', - 'popup_add_handler': 'popup_list_dashboards', - 'add_visual_handler': 'popup_add_dashlet', + 'show_url' : 'dashboard.py', + 'ident_attr' : 'name', + 'title' : _("dashboard"), + 'plural_title' : _("dashboards"), + 'module_name' : 'dashboard', + 'popup_add_handler' : 'popup_list_dashboards', + 'add_visual_handler' : 'popup_add_dashlet', + 'multicontext_links' : False, }, } @@ -1089,7 +1093,7 @@ def visual_title(what, visual): # Beware: if a single context visual is being visited *without* a context, then # the value of the context variable(s) is None. In order to avoid exceptions, # we simply drop these here. - extra_titles = [ v for k, v in get_context_html_vars(visual) if v != None ] + extra_titles = [ v for k, v in get_singlecontext_html_vars(visual) if v != None ] # FIXME: Is this really only needed for visuals without single infos? if not visual['single_infos']: used_filters = [ multisite_filters[fn] for fn in visual["context"].keys() ] @@ -1130,7 +1134,7 @@ def get_single_info_keys(visual): keys += info_params(info_key) return list(set(keys)) -def get_context_html_vars(visual): +def get_singlecontext_html_vars(visual): vars = [] for key in get_single_info_keys(visual): vars.append((key, html.var(key, visual['context'].get(key)))) @@ -1141,7 +1145,7 @@ def get_context_html_vars(visual): def collect_context_links(this_visual, mobile = False, only_types = []): # compute list of html variables needed for this visual active_filter_vars = set([]) - for var, val in get_context_html_vars(this_visual): + for var, val in get_singlecontext_html_vars(this_visual): if html.has_var(var): active_filter_vars.add(var) @@ -1151,14 +1155,15 @@ def collect_context_links(this_visual, mobile = False, only_types = []): context_links += collect_context_links_of(what, this_visual, active_filter_vars, mobile) return context_links -def collect_context_links_of(what, this_visual, active_filter_vars, mobile): +def collect_context_links_of(visual_type_name, this_visual, active_filter_vars, mobile): context_links = [] # FIXME: Make this cross module access cleaner - module_name = visual_types[what]["module_name"] + visual_type = visual_types[visual_type_name] + module_name = visual_type["module_name"] thing_module = __import__(module_name) - thing_module.__dict__['load_%s'% what]() - available = thing_module.__dict__['permitted_%s' % what]() + thing_module.__dict__['load_%s'% visual_type_name]() + available = thing_module.__dict__['permitted_%s' % visual_type_name]() # sort buttons somehow visuals = available.values() @@ -1178,23 +1183,35 @@ def collect_context_links_of(what, this_visual, active_filter_vars, mobile): or mobile and not visual.get('mobile'): continue - if not visual['single_infos']: - continue # skip non single visuals + # For dashboards and views we currently only show a link button, + # if the target dashboard/view shares a single info with the + # current visual. + if not visual['single_infos'] and not visual_type["multicontext_links"]: + continue # skip non single visuals for dashboard, views - needed_vars = get_context_html_vars(visual) + # We can show a button only if all single contexts of the + # target visual are known currently + needed_vars = get_singlecontext_html_vars(visual) skip = False vars_values = [] for var, val in needed_vars: if var not in active_filter_vars: - skip = True + skip = True # At least one single context missing break - vars_values.append((var, val)) if not skip: - # add context link to this visual - uri = html.makeuri_contextless(vars_values + [(visual_types[what]['ident_attr'], name)], - filename = what[:-1] + '.py') + # add context link to this visual. For reports we put in + # the *complete* context, even the non-single one. + if visual_type["multicontext_links"]: + uri = html.makeuri([(visual_type['ident_attr'], name)], + filename = visual_type["show_url"]) + + # For views and dashboards currently the current filter + # settings + else: + uri = html.makeuri_contextless(vars_values + [(visual_type['ident_attr'], name)], + filename = visual_type["show_url"]) icon = visual.get("icon") buttonid = "cb_" + name context_links.append((_u(linktitle), uri, icon, buttonid))

9 years, 9 months

Check_MK Git: check_mk: htmllib: Fix bug from this morning:

by Mathias Kettner

make new argument optional Message-ID: <5436736b.DSufwa/IpuD7wIIS%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 011f47dcef77df12122aeb1f3ad4071f59851d3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=011f47dcef77df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 13:37:06 2014 +0200 htmllib: Fix bug from this morning: make new argument optional --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 56ddb8f..e24a5f4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -197,7 +197,7 @@ class html: self.write("</form>\n") self.form_name = None - def form_submitted(self, form_name): + def form_submitted(self, form_name=None): if form_name: return self.var("filled_in") == form_name else:

9 years, 9 months

Check_MK Git: check_mk: Fixed some spellings

by Konstantin Büttner

Module: check_mk Branch: master Commit: a56561954f745d4f9b0ef6606e61940d33fd3ef3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a56561954f745d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 9 12:10:27 2014 +0200 Fixed some spellings --- web/plugins/wato/active_checks.py | 58 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a56561954f…

9 years, 9 months

Check_MK Git: check_mk: htmllib: form_submitted can now take form name

by Mathias Kettner

Module: check_mk Branch: master Commit: 8610f407e1e55da321d36265fba57369a7f458e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8610f407e1e55d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 11:02:02 2014 +0200 htmllib: form_submitted can now take form name --- web/htdocs/htmllib.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 83af97a..56ddb8f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -197,8 +197,11 @@ class html: self.write("</form>\n") self.form_name = None - def form_submitted(self): - return self.has_var("filled_in") + def form_submitted(self, form_name): + if form_name: + return self.var("filled_in") == form_name + else: + return self.has_var("filled_in") def add_user_error(self, varname, message): if type(varname) == list:

9 years, 9 months

Check_MK Git: check_mk: valuespec Age: nicer value_to_text output

by Mathias Kettner

Module: check_mk Branch: master Commit: 04ab6ce7be25c7a4acd3fdbcc74744131f545118 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04ab6ce7be25c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 11:02:36 2014 +0200 valuespec Age: nicer value_to_text output --- web/htdocs/valuespec.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6ad2027..20c92f0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -197,7 +197,20 @@ class Age(ValueSpec): days, rest = divmod(value, 60*60*24) hours, rest = divmod(rest, 60*60) minutes, seconds = divmod(rest, 60) - return "%sd %sh %sm %ss" % (days, hours, minutes, seconds) + parts = [] + for title, count in [ + ( _("days"), days, ), + ( _("hours"), hours, ), + ( _("minutes"), minutes, ), + ( _("seconds"), seconds, )]: + if count: + parts.append("%d %s" % (count, title)) + + if parts: + return " ".join(parts) + else: + return _("no time") + def validate_datatype(self, value, varprefix): if type(value) != int:

9 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
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