Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: 6a5a3721067f3ae231c1a972cef2322ecc877db9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a5a3721067f3a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 2 14:19:29 2016 +0200 readded missing png --- web/htdocs/images/tree_black_90.png | Bin 0 -> 333 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/tree_black_90.png b/web/htdocs/images/tree_black_90.png new file mode 100644 index 0000000..58ae250 Binary files /dev/null and b/web/htdocs/images/tree_black_90.png differ

8 years

3869 ipmi: now IPMI sensors can be ignored by their status texts during discovery

by Simon Betz

Module: check_mk Branch: master Commit: 5d35a704a61564cfa016081b971c2a0ad4eb7690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d35a704a61564… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 2 14:18:37 2016 +0200 3869 ipmi: now IPMI sensors can be ignored by their status texts during discovery --- .werks/3869 | 9 ++ ChangeLog | 1 + checks/ipmi | 260 ++++++++++++++++++++++------------ web/plugins/wato/check_parameters.py | 19 ++- 4 files changed, 194 insertions(+), 95 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5d35a704a6…

8 years

Consolidated painter/display option handling - some cleanups left

by Lars Michelsen

Module: check_mk Branch: master Commit: 9701f897295bc1124920c407228a81e141c4bb60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9701f897295bc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 1 21:24:14 2016 +0200 Consolidated painter/display option handling - some cleanups left --- web/htdocs/mobile.py | 5 +- web/htdocs/views.py | 381 +++++++++++++++++++++++-------------- web/plugins/dashboard/dashlets.py | 1 + web/plugins/views/bi.py | 10 +- web/plugins/views/inventory.py | 6 +- web/plugins/views/layouts.py | 4 +- web/plugins/views/mobile.py | 6 +- web/plugins/views/painters.py | 20 +- 8 files changed, 263 insertions(+), 170 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9701f89729…

8 years

Removed broken try function from view editor

by Lars Michelsen

Module: check_mk Branch: master Commit: fc6d40a795be0cc8befe95d0c7d40df587edd33d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc6d40a795be0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 10:10:38 2016 +0200 Removed broken try function from view editor --- web/htdocs/views.py | 3 --- web/htdocs/visuals.py | 23 +++++------------------ 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 687c01e..2d76577 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -710,7 +710,6 @@ def page_edit_view(): load_handler = transform_view_to_valuespec_value, create_handler = create_view_from_valuespec, info_handler = get_view_infos, - try_handler = lambda view: show_view(view, False, False) ) def view_choices(only_with_hidden = False): @@ -2512,8 +2511,6 @@ def should_show_command_form(datasource, ignore_display_option=False): return False if not config.may("general.act"): return False - if html.has_var("try"): - return False # What commands are available depends on the Livestatus table we # deal with. If a data source provides information about more diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 66ba942..080ddfb 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -559,7 +559,7 @@ def render_context_specs(visual, context_specs): spec.render_input(ident, value) def page_edit_visual(what, all_visuals, custom_field_handler = None, - create_handler = None, try_handler = None, + create_handler = None, load_handler = None, info_handler = None, sub_pages = []): visual_type = visual_types[what] @@ -717,7 +717,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, if html.var("save%d" % nr): save_and_go = pagename - if save_and_go or html.var("save") or html.var("try") or html.var("search"): + if save_and_go or html.var("save") or html.var("search"): try: general_properties = vs_general.from_html_vars('general') vs_general.validate_value(general_properties, 'general') @@ -805,25 +805,12 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, html.show_localization_hint() html.button("save", _("Save")) + for nr, (title, pagename, icon) in enumerate(sub_pages): html.button("save%d" % nr, _("Save and go to ") + title) - html.hidden_fields() - - if try_handler: - html.write(" ") - html.button("try", _("Try out")) - html.end_form() - - if (html.has_var("try") or html.has_var("search")) and not html.has_user_errors(): - html.set_var("search", "on") - if visual: - import bi - bi.reset_cache_status() - try_handler(visual) - return # avoid second html footer - else: - html.end_form() + html.hidden_fields() + html.end_form() html.footer() #.

8 years

3847 Painter options can now be reset to defaults

by Lars Michelsen

Module: check_mk Branch: master Commit: 0f8819e741daaa43cf8d3aebf33773fb1f13bfa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f8819e741daaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 1 21:25:31 2016 +0200 3847 Painter options can now be reset to defaults In previous versions the user was not able to reset the once set painter options to the defaults. It was only possible to change the settings again to match with the defaults. It was not clear which was the original setting. --- .werks/3847 | 12 ++++++++++++ ChangeLog | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/3847 b/.werks/3847 new file mode 100644 index 0000000..37a8358 --- /dev/null +++ b/.werks/3847 @@ -0,0 +1,12 @@ +Title: Painter options can now be reset to defaults +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1472757856 +Class: feature + +In previous versions the user was not able to reset the once set +painter options to the defaults. It was only possible to change the +settings again to match with the defaults. It was not clear which +was the original setting. diff --git a/ChangeLog b/ChangeLog index 1d2b03e..66e1f62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -394,6 +394,7 @@ * 3713 new filter: hosts with certain service problems * 3780 availability: now limit of fetched logfile rows is configurable. * 3864 tactical overview now shows the number of stale hosts and services + * 3847 Painter options can now be reset to defaults... * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition

8 years

3868 f5_bigip_cluster_status: node states are configurable for F5 BigIP devices since version 11.2

by Simon Betz

Module: check_mk Branch: master Commit: d7fe58298bec139a0b91c8d9c569201247a866a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7fe58298bec13… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 2 11:04:05 2016 +0200 3868 f5_bigip_cluster_status: node states are configurable for F5 BigIP devices since version 11.2 --- .werks/3868 | 9 ++++++ ChangeLog | 1 + checkman/f5_bigip_cluster_status | 4 +++ checks/f5_bigip_cluster_status | 58 ++++++++++++++++++++-------------- web/plugins/wato/check_parameters.py | 13 ++++++++ 5 files changed, 62 insertions(+), 23 deletions(-) diff --git a/.werks/3868 b/.werks/3868 new file mode 100644 index 0000000..e2c769e --- /dev/null +++ b/.werks/3868 @@ -0,0 +1,9 @@ +Title: f5_bigip_cluster_status: node states are configurable for F5 BigIP devices since version 11.2 +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472807033 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 80f23c9..1d2b03e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,6 +152,7 @@ * 3865 oracle_sessions: now relative levels for sessions are configurable... * 3647 check_http: Improved rendering of the extended performance data * 3867 filter 'Servicegroup (Regex)' can be negated + * 3868 f5_bigip_cluster_status: node states are configurable for F5 BigIP devices since version 11.2 * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/f5_bigip_cluster_status b/checkman/f5_bigip_cluster_status index 8b0eb21..6dd8ee9 100644 --- a/checkman/f5_bigip_cluster_status +++ b/checkman/f5_bigip_cluster_status @@ -12,6 +12,10 @@ description: If you run this check on a cluster node, it will raise no warning if the cluster node state differs from {active}. + Since version 11.2 you are able to configure the node states. Default values are: + unknown will be treated as UNKNOWN, offline as CRIT, forced offline as CRIT, + standby as OK and active as OK. + inventory: Creates on service diff --git a/checks/f5_bigip_cluster_status b/checks/f5_bigip_cluster_status index 9366531..1d7d83f 100644 --- a/checks/f5_bigip_cluster_status +++ b/checks/f5_bigip_cluster_status @@ -24,29 +24,48 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + #SNMPv2-SMI::enterprises.3375.2.1.1.1.1.19.0 = INTEGER: 0 #Version < 11.2 #SNMPv2-SMI::enterprises.3375.2.1.14.3.1.0 = INTEGER: 3 #Version >= 11.2 + factory_settings["f5_bigip_cluster_default_levels"] = { "type" : "active_standby", } + +def scan_f5_bigip_cluster_status(oid, is_v11_2 = False): + if not (".1.3.6.1.4.1.3375.2" in oid(".1.3.6.1.2.1.1.2.0") and\ + "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower()): + return False + + version = oid(".1.3.6.1.4.1.3375.2.1.4.2.0") + if not version: + return False + + expected_version = 11.2 + version_float = float(".".join(version.split(".")[:2])) + return (version_float >= expected_version) == is_v11_2 + + def parse_f5_bigip_cluster_status(info): - cluster_status = {} - for status in info: - cluster_status[status[0]] = int(status[1]) - return cluster_status + parsed = {} + for node, status in info: + parsed[node] = status + return parsed + def inventory_f5_bigip_cluster_status(parsed): if parsed: return [ ( None, None ) ] + def check_f5_bigip_cluster_status(_no_item, params, parsed, is_v11_2 = False): if is_v11_2: - node_state = ["unknown", "offline", "forcedOffline", "standby", "active"] + node_states = ["unknown", "offline", "forced offline", "standby", "active"] active_value = 4 else: - node_state = ["standby", "active 1", "active 2", "active"] + node_states = ["standby", "active 1", "active 2", "active"] active_value = 3 if params["type"] == "active_standby" and parsed.values().count(active_value) > 1: @@ -55,21 +74,15 @@ def check_f5_bigip_cluster_status(_no_item, params, parsed, is_v11_2 = False): yield 2, "No active node found: " for node in sorted(parsed): - node_name = node and "[%s] " % node or "" - yield 0, "Node %sis %s" % (node_name, node_state[parsed[node]]) - -def scan_f5_bigip_cluster_status(oid, is_v11_2 = False): - if not (".1.3.6.1.4.1.3375.2" in oid(".1.3.6.1.2.1.1.2.0") and\ - "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower()): - return False - - version = oid(".1.3.6.1.4.1.3375.2.1.4.2.0") - if not version: - return False - - expected_version = 11.2 - version_float = float(".".join(version.split(".")[:2])) - return (version_float >= expected_version) == is_v11_2 + node_name = node and "[%s] " % node or "" + node_state = parsed[node] + state = 0 + if is_v11_2: + if node_state in params.get("v11_2_states", []): + state = params["v11_2_states"][node_state] + else: + state = { "0" : 3, "1" : 2, "2" : 2, "3" : 0, "4" : 0, }[node_state] + yield state, "Node %sis %s" % (node_name, node_states[int(node_state)]) check_info["f5_bigip_cluster_status"] = { @@ -84,6 +97,7 @@ check_info["f5_bigip_cluster_status"] = { "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2 = False) } + check_info["f5_bigip_cluster_status_v11_2"] = { "parse_function" : parse_f5_bigip_cluster_status, "check_function" : lambda x,y,z: check_f5_bigip_cluster_status(x,y,z, is_v11_2 = True), @@ -95,5 +109,3 @@ check_info["f5_bigip_cluster_status_v11_2"] = { "snmp_info" : (".1.3.6.1.4.1.3375.2.1.14.3.1", ["0"]), # sysCmFailoverStatusId "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2 = True) } - - diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e5042b1..de571f1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -480,6 +480,19 @@ register_check_parameters( default_value = "active_standby" ) ), + ("v11_2_states", + Dictionary( + title = _("Interpretation of failover cluster state"), + help = _("Here you can set the failover state for BIG-IP system of version 11.2.0"), + elements = [ + ("0", MonitoringState(title = "Unknown", default_value = 3)), + ("1", MonitoringState(title = "Offline", default_value = 2)), + ("2", MonitoringState(title = "Forced offline", default_value = 2)), + ("3", MonitoringState(title = "Standby", default_value = 0)), + ("4", MonitoringState(title = "Active", default_value = 0)), + ] + ) + ) ], required_keys = ["type"] ),

8 years

Fixed comment header in mk_oracle.ps1

by Mathias Kettner

Module: check_mk Branch: master Commit: 669ee75c92ff94938d45eb708f5c21a8821d654b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=669ee75c92ff94… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 2 09:45:05 2016 +0200 Fixed comment header in mk_oracle.ps1 --- agents/windows/plugins/mk_oracle.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index 4c5b12d..bd212b9 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -54,7 +54,7 @@ # | \____\___/|_| |_|_| |_|\__, | | # | |___/ | # +----------------------------------------------------------------------+ -# | The user can override and set variables in mk_oracle_cfg.ps1 | +# | The user can override and set variables in mk_oracle_cfg.ps1 | # '----------------------------------------------------------------------'

8 years

more user friendly ipmi discovery rule

by Simon Betz

Module: check_mk Branch: master Commit: 7093c124587a3ae3da960e6975533338bb5f979d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7093c124587a3a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 2 09:10:28 2016 +0200 more user friendly ipmi discovery rule --- web/plugins/wato/check_parameters.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f6eae09..e5042b1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -515,17 +515,20 @@ register_rule(group + '/' + subgroup_inventory, ) ), ( "summarize", - Checkbox( - title = _("Display only a summary of all sensors"), - label = _("Summarize"), + DropdownChoice( + title = _("Display single sensors or a summary of all sensors"), help = _("If active, only a single summary item is displayed. The summary " "will explicitly mention sensors in warn/crit state but the " "sensors that are ok are aggregated."), - default_value = True - ) - ) - ] - ), + choices = [ + (False, _("Single sensors")), + (True, _("Summarize")), + ], + default_value = True, + ), + ), + ] + ), match = 'first' )

8 years

3846 FIX Nagios: define_contactgroups = False is handled correctly again

by Lars Michelsen

Module: check_mk Branch: master Commit: 118a6e974a0fdef57bde36f308e9aa841ffc1c8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=118a6e974a0fde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 1 13:26:48 2016 +0200 3846 FIX Nagios: define_contactgroups = False is handled correctly again --- .werks/3846 | 10 ++++++++++ ChangeLog | 1 + modules/nagios.py | 41 ++++++++++++++++++++++++----------------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.werks/3846 b/.werks/3846 new file mode 100644 index 0000000..74d469b --- /dev/null +++ b/.werks/3846 @@ -0,0 +1,10 @@ +Title: Nagios: define_contactgroups = False is handled correctly again +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472729184 + + diff --git a/ChangeLog b/ChangeLog index d43b52f..80f23c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 3617 FIX: cmk -I without host specification now (again) always uses cache files... * 3149 FIX: fixed rare crash if alert handling tried to long non-latin characters * 3843 FIX: Fixed reporting of crashes when using Nagios core + * 3846 FIX: Nagios: define_contactgroups = False is handled correctly again Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/nagios.py b/modules/nagios.py index 01ecda6..21b1765 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -709,24 +709,31 @@ define servicegroup { """ % (make_utf8(sg), make_utf8(alias))) def create_nagios_config_contactgroups(outfile): + if define_contactgroups == False: + return + cgs = list(contactgroups_to_define) - cgs.sort() - if cgs: - outfile.write("\n# ------------------------------------------------------------\n") - outfile.write("# Contact groups (controlled by define_contactgroups)\n") - outfile.write("# ------------------------------------------------------------\n\n") - for name in cgs: - if type(define_contactgroups) == dict: - alias = define_contactgroups.get(name, name) - else: - alias = name - outfile.write("\ndefine contactgroup {\n" - " contactgroup_name\t\t%s\n" - " alias\t\t\t\t%s\n" % (make_utf8(name), make_utf8(alias))) - members = contactgroup_members.get(name) - if members: - outfile.write(" members\t\t\t%s\n" % ",".join(members)) - outfile.write("}\n") + if not cgs: + return + + outfile.write("\n# ------------------------------------------------------------\n") + outfile.write("# Contact groups (controlled by define_contactgroups)\n") + outfile.write("# ------------------------------------------------------------\n\n") + for name in sorted(cgs): + if type(define_contactgroups) == dict: + alias = define_contactgroups.get(name, name) + else: + alias = name + + outfile.write("\ndefine contactgroup {\n" + " contactgroup_name\t\t%s\n" + " alias\t\t\t\t%s\n" % (make_utf8(name), make_utf8(alias))) + + members = contactgroup_members.get(name) + if members: + outfile.write(" members\t\t\t%s\n" % ",".join(members)) + + outfile.write("}\n") def create_nagios_config_commands(outfile):

8 years

Views: Time graphs can now be configured not to have a legend or controls

by Lars Michelsen

Module: check_mk Branch: master Commit: d11a5ce733c4d57aaa10aa146966edd84318afd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d11a5ce733c4d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 1 13:02:08 2016 +0200 Views: Time graphs can now be configured not to have a legend or controls --- web/htdocs/views.py | 64 ++++++++++++++++++++++++++++++++++------- web/plugins/views/painters.py | 17 +++++++---- 2 files changed, 65 insertions(+), 16 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index afea5b9..26ef668 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -28,6 +28,7 @@ import config, defaults, time, os, re, pprint import weblib, traceback, forms, valuespec, inventory, visuals, metrics import sites import bi +import inspect from lib import * # Datastructures and functions needed before plugins can be loaded @@ -1030,6 +1031,20 @@ class Cell(object): return self.painter().get("options", []) + # The parameters configured in the view for this painter. In case the + # painter has params, it defaults to the valuespec default value and + # in case the painter has no params, it returns None. + def painter_parameters(self): + vs_painter_params = get_painter_params_valuespec(self.painter()) + if not vs_painter_params: + return + + if vs_painter_params and self._painter_params == None: + return vs_painter_params.default_value() + else: + return self._painter_params + + def title(self, use_short=True): painter = self.painter() if use_short: @@ -1212,11 +1227,25 @@ class Cell(object): if not row: return "", "" # nothing to paint + painter = self.painter() + paint_func = painter["paint"] + + # Painters can request to get the cell object handed over. + # Detect that and give the painter this argument. + arg_names = inspect.getargspec(paint_func)[0] + painter_args = [] + for arg_name in arg_names: + if arg_name == "row": + painter_args.append(row) + elif arg_name == "cell": + painter_args.append(self) + + # Add optional painter arguments from painter specification if "args" in painter: - return painter["paint"](row, *painter["args"]) - else: - return painter["paint"](row) + painter_args += painter["args"] + + return painter["paint"](*painter_args) def paint(self, row, tdattrs="", is_last_cell=False): @@ -2313,17 +2342,24 @@ def allowed_for_datasource(collection, datasourcename): return allowed +# Returns either the valuespec of the painter parameters or None +def get_painter_params_valuespec(painter): + if "params" not in painter: + return + + if type(lambda: None) == type(painter["params"]): + return painter["params"]() + else: + return painter["params"] + + def painter_choices(painters, add_params=False): choices = [] for name, painter in painters.items(): # Add the optional valuespec for painter parameters if add_params and "params" in painter: - if type(lambda: None) == type(painter["params"]): - vs_params = painter["params"]() - else: - vs_params = painter["params"] - + vs_params = get_painter_params_valuespec(painter) choices.append((name, painter["title"], vs_params)) else: choices.append((name, painter["title"])) @@ -2777,16 +2813,22 @@ def create_dict_key(value): return value -def get_painter_option(name): +def get_painter_option(name, fallback_to_default=True): opt = multisite_painter_options[name] + + if fallback_to_default: + default = get_painter_option_valuespec(opt).default_value() + else: + default = None + if "forced_value" in opt: return opt["forced_value"] elif not config.may("general.painter_options"): - return get_painter_option_valuespec(opt).default_value() + return default else: - return opt.get("value", get_painter_option_valuespec(opt).default_value()) + return opt.get("value", default) def get_painter_option_valuespec(opt): diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index de7824d..7241b9b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -944,9 +944,9 @@ multisite_painters["svc_group_memberlist"] = { "paint" : paint_service_group_memberlist, } -def paint_time_graph(row): +def paint_time_graph(row, cell): if metrics.cmk_graphs_possible(row["site"]): - return paint_time_graph_cmk(row) + return paint_time_graph_cmk(row, cell) else: return paint_time_graph_pnp(row) @@ -956,7 +956,7 @@ def time_graph_params(): return metrics.vs_graph_render_options() -def paint_time_graph_cmk(row, show_timeranges=False): +def paint_time_graph_cmk(row, cell, show_timeranges=False): graph_specification = ( "template", { "site" : row["site"], @@ -964,7 +964,14 @@ def paint_time_graph_cmk(row, show_timeranges=False): "service_description" : row.get("service_description", "_HOST_"), }) graph_data_range = { "time_range" : get_graph_timerange_from_painter_options() } - graph_render_options = get_graph_render_options_from_painter_options() + + # Load the graph render options from + # a) the painter parameters configured in the view + # b) the painter options set per user and view + graph_render_options = cell.painter_parameters().copy() + painter_options = get_graph_render_options_from_painter_options() + if painter_options != None: + graph_render_options.update(painter_options) if html.is_mobile(): graph_render_options.update({ @@ -993,7 +1000,7 @@ def paint_time_graph_cmk(row, show_timeranges=False): def get_graph_render_options_from_painter_options(): - return get_painter_option("graph_render_options") + return get_painter_option("graph_render_options", fallback_to_default=False) def get_graph_timerange_from_painter_options():

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016