Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6631 FIX docker_container_node_name: Fix broken inventory plugin

by Konstantin Büttner

Module: check_mk Branch: master Commit: f623f741e93f8efb6601b28b8776ca1d1346fdcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f623f741e93f8e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 26 17:28:56 2018 +0200 6631 FIX docker_container_node_name: Fix broken inventory plugin Change-Id: Iafe7659afe8b840c8e53bf7db3f3d47a09903388 --- .werks/6631 | 11 +++++++++++ inventory/docker_container_node_name | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/6631 b/.werks/6631 new file mode 100644 index 0000000..830bf4b --- /dev/null +++ b/.werks/6631 @@ -0,0 +1,11 @@ +Title: docker_container_node_name: Fix broken inventory plugin +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537975699 + + diff --git a/inventory/docker_container_node_name b/inventory/docker_container_node_name index 38301c6..55966c0 100644 --- a/inventory/docker_container_node_name +++ b/inventory/docker_container_node_name @@ -26,10 +26,9 @@ def inv_docker_container_node_name(info, inventory_tree): - import json - data = json.loads(info[0][0]) + node_name = info[0][0] container = inventory_tree.get_dict("software.applications.docker.container.") - container["node_name"] = data + container["node_name"] = node_name inv_info['docker_container_node_name'] = {

5 years, 11 months

6576 agent_vsphere: Display snapshots on ESX host

by Moritz Kiemer

Module: check_mk Branch: master Commit: 0ecd71cf46e03e6b57273739b15d17900050bd39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ecd71cf46e03e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Sep 26 14:07:06 2018 +0200 6576 agent_vsphere: Display snapshots on ESX host An aggregation of the created VM snapshots can now be shown for every ESX host (configurable via WATO rule "Check state of VMWare ESX via vSphere"). Change-Id: I01012ebdd0dbe81e5ea3d59b1d41bc8eb205f133 --- .werks/6576 | 12 +++++++++++ agents/special/agent_vsphere | 32 +++++++++++++++++++++++++++-- checks/agent_vsphere | 3 +++ checks/esx_vsphere_vm | 2 +- cmk/gui/plugins/wato/datasource_programs.py | 17 +++++++++++++++ 5 files changed, 63 insertions(+), 3 deletions(-) diff --git a/.werks/6576 b/.werks/6576 new file mode 100644 index 0000000..2bebde7 --- /dev/null +++ b/.werks/6576 @@ -0,0 +1,12 @@ +Title: agent_vsphere: Display snapshots on ESX host +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1537963438 +Class: feature + +An aggregation of the created VM snapshots can now be shown for +every ESX host (configurable via WATO rule +"Check state of VMWare ESX via vSphere"). diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index ff742be..e0ef0b7 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -834,14 +834,17 @@ OPTIONS: Default (no option) is on the queried vCenter or ESX-Host Possible WHERE options: * esxhost : show on ESX host * vm : show on virtual machine - + --snapshot_display WHERE Specifies where the virtual machines snapshots should be shown + Default (no option) is on the VM + Possible WHERE options: * esxhost : show on ESX host + * vCenter : show on vCenter """) short_options = "hi:u:s:Dat:H:Pp:S:" long_options = [ "help", "user=", "secret=", "direct", "agent", "debug", "modules=", "timeout=", "no-cert-check", "hostname=", "tracefile=", "pysphere", "port=", "spaces=", "host_pwr_display=", "vm_pwr_display=", - "vm_piggyname=" + "snapshot_display=", "vm_piggyname=" ] opt_debug = False @@ -855,6 +858,7 @@ opt_pysphere = False opt_tracefile = None opt_host_pwr_display = None opt_vm_pwr_display = None +opt_snapshot_display = None opt_vm_piggyname = "alias" opt_spaces = "underscore" opt_no_cert = False @@ -908,6 +912,8 @@ for o,a in opts: opt_vm_pwr_display = a elif o in [ '--host_pwr_display' ]: opt_host_pwr_display = a + elif o in [ '--snapshot_display' ]: + opt_snapshot_display = a elif o in [ '-S', '--spaces']: if a not in [ "cut", "underscore" ]: usage() @@ -1175,6 +1181,24 @@ def login(): cookie_file.write(server_cookie) +def output_aggregated_snapshots(vms, hostsystems=None): + + aggregated = {} + for data in vms.itervalues(): + if hostsystems is not None: + running_on = hostsystems.get(data.get("runtime.host"), data.get("runtime.host")) + else: + running_on = '' + snapshots = data.get("snapshot.rootSnapshotList") + if snapshots is not None: + aggregated.setdefault(running_on, []).append(snapshots) + + for piggytarget, sn_list in aggregated.iteritems(): + output('<<<<%s>>>>' % piggytarget) + output('<<<esx_vsphere_vm>>>') + output('snapshot.rootSnapshotList %s' % '|'.join(sn_list)) + output('<<<<>>>>') + # .--Main----------------------------------------------------------------. # | __ __ _ | @@ -1600,6 +1624,10 @@ if not error: for entry in sorted(data.items()): output("%s %s" % entry) + if opt_snapshot_display == 'esxhost': + output_aggregated_snapshots(vms, hostsystems) + elif opt_snapshot_display == 'vCenter': + output_aggregated_snapshots(vms) output("<<<<>>>>") diff --git a/checks/agent_vsphere b/checks/agent_vsphere index c44a9bb..d6abe5c 100644 --- a/checks/agent_vsphere +++ b/checks/agent_vsphere @@ -74,6 +74,9 @@ def agent_vsphere_arguments(params, hostname, ipaddress): if params.get("host_pwr_display"): args += ' --host_pwr_display %s' % params.get("host_pwr_display") + if params.get("snapshot_display", False): + args += ' --snapshot_display %s' % params.get("snapshot_display") + if "ssl" in params: if params["ssl"] is False: args += ' --no-cert-check ' + quote_shell_string(ipaddress) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 3b1547b..38e6b5f 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -404,7 +404,7 @@ def check_esx_vsphere_vm_snapshots(_no_item, params, info): return powerd_on_list = [s for s in snapshots if s.state == "poweredOn"] - yield 0, "Powered On: %s" % powerd_on_list[0].name if powerd_on_list else "None" + yield 0, "Powered On: %s" % (', '.join(s.name for s in powerd_on_list) or "None") latest_snapshot = max(snapshots, key=lambda s: s.time) latest_snapshot_age = time.time() - latest_snapshot.time diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 67c237a..f0e99f5 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -208,6 +208,23 @@ register_rule(group, default = None, ) ), + ( "snapshot_display", + DropdownChoice( + title = _("Additionally display snapshots on"), + help = _("The created snapshots can be displayed additionally either " + "on the ESX host or the vCenter. This will result in services " + "for both the queried system and the ESX host / vCenter. " + "By disabling the unwanted services it is then possible " + "to configure where the services are displayed." + ), + choices = [ + ( None, _("The Virtual Machine") ), + ( "esxhost", _("The ESX Host") ), + ( "vCenter", _("The queried ESX system (vCenter / Host)") ), + ], + default = None, + ) + ), ( "vm_piggyname", DropdownChoice( title = _("Piggyback name of virtual machines"),

5 years, 11 months

6724 FIX Add missing permission for viewing host/service availability

by Lars Michelsen

Module: check_mk Branch: master Commit: dff573b2942742c9c8298d41c791e0e9e1b75a94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dff573b2942742… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 17:41:48 2018 +0200 6724 FIX Add missing permission for viewing host/service availability A new permission named "See the availability" has been added. It can be used to hide the availability context buttons and views from users. Change-Id: I9086935086b0bb4bb016833b9b09a4e93b1c0d54 --- .werks/6724 | 12 ++++++++++++ cmk/gui/default_permissions.py | 5 +++++ cmk/gui/plugins/views/availability.py | 3 +++ cmk/gui/views.py | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/6724 b/.werks/6724 new file mode 100644 index 0000000..d394452 --- /dev/null +++ b/.werks/6724 @@ -0,0 +1,12 @@ +Title: Add missing permission for viewing host/service availability +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537976434 + +A new permission named "See the availability" has been added. It can +be used to hide the availability context buttons and views from users. diff --git a/cmk/gui/default_permissions.py b/cmk/gui/default_permissions.py index 9b68ef9..15d0400 100644 --- a/cmk/gui/default_permissions.py +++ b/cmk/gui/default_permissions.py @@ -103,6 +103,11 @@ def load_plugins(force): [ 'admin', 'user' ] ) + config.declare_permission("general.see_availability", + _("See the availability"), + _("See the availability views of hosts and services"), + [ "admin", "user", "guest" ]) + config.declare_permission('general.edit_notifications', _('Edit personal notification settings'), _('This allows a user to edit his personal notification settings. You also need the permission ' diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index e0ee642..6150a03 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -148,6 +148,7 @@ def render_availability_options(what): # is (currently) called by views.py, when showing a view but # availability mode is activated. def render_availability_page(view, datasource, context, filterheaders, only_sites, limit): + config.user.need_permission("general.see_availability") if handle_edit_annotations(): return @@ -508,6 +509,8 @@ def render_timeline_bar(timeline_layout, style): # logic for getting the aggregates. As soon as we have cleaned of the visuals, # filters, contexts etc we can unify the code! def render_bi_availability(title, aggr_rows): + config.user.need_permission("general.see_availability") + av_mode = html.var("av_mode", "availability") avoptions = get_availability_options_from_url("bi") if av_mode == "timeline": diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 535115a..6067a10 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1512,7 +1512,7 @@ def show_context_links(thisview, datasource, show_filters, html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) if display_options.enabled(display_options.E): - if show_availability: + if show_availability and config.user.may("general.see_availability"): html.context_button(_("Availability"), html.makeuri([("mode", "availability")]), "availability") if show_combined_graphs and config.combined_graphs_available(): html.context_button(_("Combined graphs"),

5 years, 11 months

6720 FIX Bulk mail notifications: Single notifications in bulks use non-bulk subject

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c0b9f7eecb78b90a4457ebcdd9a7a69b5bcc70d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c0b9f7eecb78b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 17:07:45 2018 +0200 6720 FIX Bulk mail notifications: Single notifications in bulks use non-bulk subject All 1.5 releases were always using the bulk notification subjects for mails. Previous versions were using the single notification subject in case a bulk notification only contained a single notification. This has been changed back to the original behaviour. Change-Id: I9c4e16b024e0b0124bdc510582cb0de3a2fa24fe --- .werks/6720 | 14 ++++++++++++++ cmk/notification_plugins/asciimail.py | 5 ++++- cmk/notification_plugins/mail.py | 5 ++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/6720 b/.werks/6720 new file mode 100644 index 0000000..051b61d --- /dev/null +++ b/.werks/6720 @@ -0,0 +1,14 @@ +Title: Bulk mail notifications: Single notifications in bulks use non-bulk subject +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537967537 + +All 1.5 releases were always using the bulk notification subjects for mails. +Previous versions were using the single notification subject in case a bulk +notification only contained a single notification. This has been changed back +to the original behaviour. diff --git a/cmk/notification_plugins/asciimail.py b/cmk/notification_plugins/asciimail.py index 3826661..0483056 100644 --- a/cmk/notification_plugins/asciimail.py +++ b/cmk/notification_plugins/asciimail.py @@ -152,7 +152,10 @@ def main(): mailto = context['CONTACTEMAIL'] # Assume the same in each context subject = context['SUBJECT'] hosts.add(context["HOSTNAME"]) - subject = utils.get_bulk_notification_subject(contexts, hosts) + + # Use the single context subject in case there is only one context in the bulk + if len(contexts) > 1: + subject = utils.get_bulk_notification_subject(contexts, hosts) else: # gather all options from env diff --git a/cmk/notification_plugins/mail.py b/cmk/notification_plugins/mail.py index f55892a..3a6882f 100644 --- a/cmk/notification_plugins/mail.py +++ b/cmk/notification_plugins/mail.py @@ -933,7 +933,10 @@ def main(): mailto = context['CONTACTEMAIL'] # Assume the same in each context subject = context['SUBJECT'] hosts.add(context["HOSTNAME"]) - subject = utils.get_bulk_notification_subject(contexts, hosts) + + # Use the single context subject in case there is only one context in the bulk + if len(contexts) > 1: + subject = utils.get_bulk_notification_subject(contexts, hosts) else: # gather all options from env

5 years, 11 months

6719 FIX Simplified user setting: Temporarily disable notifications

by Lars Michelsen

Module: check_mk Branch: master Commit: 972c896248150e97878a8e70d00bf96553961954 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=972c896248150e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 14:48:35 2018 +0200 6719 FIX Simplified user setting: Temporarily disable notifications The user profile setting for temporarily disabling all notifications was a set of two nested checkboxes which both had to be checked for disabling the notifications. This has now been fixed to be only a single checkbox again. Change-Id: Ie5131f189bbd385dd9153e000db89a9c9f5377a9 --- .werks/6719 | 13 +++++++++++++ cmk/gui/plugins/userdb/user_attributes.py | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6719 b/.werks/6719 new file mode 100644 index 0000000..0d37c60 --- /dev/null +++ b/.werks/6719 @@ -0,0 +1,13 @@ +Title: Simplified user setting: Temporarily disable notifications +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537964762 + +The user profile setting for temporarily disabling all notifications was a set +of two nested checkboxes which both had to be checked for disabling the +notifications. This has now been fixed to be only a single checkbox again. diff --git a/cmk/gui/plugins/userdb/user_attributes.py b/cmk/gui/plugins/userdb/user_attributes.py index 171ee5f..af69171 100644 --- a/cmk/gui/plugins/userdb/user_attributes.py +++ b/cmk/gui/plugins/userdb/user_attributes.py @@ -104,7 +104,10 @@ class DisableNotificationsUserAttribute(UserAttribute): "sure that you know what you do. Moreover you can customize a timerange " "within no notifications are generated."), elements = [ - ("disable", Checkbox(title=_("Temporarily disable all notifications!"), label=_("Disable"))), + ("disable", FixedValue(True, + title=_("Temporarily disable all notifications!"), + totext="", + )), ("timerange", Tuple(title=_("Customize timerange"), elements = [ AbsoluteDate(title=_("From:"), include_time=True), AbsoluteDate(title=_("To:"), include_time=True),

5 years, 11 months

esx_vsphere_vms: clean up snapshot check

by Moritz Kiemer

Module: check_mk Branch: master Commit: 65e231766e19b036f7cef7bcd6c9e73d54e85539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65e231766e19b0… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Sep 26 12:11:24 2018 +0200 esx_vsphere_vms: clean up snapshot check Change-Id: I316669110c7ce1036ba5fdb70bd9a6507eb5c24e --- checks/esx_vsphere_vm | 98 ++++++++++------------ .../datasets/esx_vsphere_vm_snapshots.py | 36 ++++++++ 2 files changed, 81 insertions(+), 53 deletions(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 6d4a1ee..3b1547b 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -392,59 +392,51 @@ def check_esx_vsphere_vm_snapshots(_no_item, params, info): if 'snapshot.rootSnapshotList' not in data: yield 0, "No snapshots found" - else: - last_snapshot = None - oldest_snapshot = None - powered_on_snapshot = None - snapshots = [x.split(" ", 3) for x in " ".join(data["snapshot.rootSnapshotList"]).split("|")] - snapshots = [(int(x[0]), int(x[1]), x[2], x[3]) for x in snapshots] - yield 0, "Number of Snapshots %d" % len(snapshots) - - if len(snapshots) > 0: - perfdata = [] - last_time = max(zip(*snapshots)[1]) - oldest_time = min(zip(*snapshots)[1]) - last_snapshot = snapshots[0] - oldest_snapshot = snapshots[0] - for snapshot in snapshots: - if last_time == snapshot[1]: - last_snapshot = snapshot - elif oldest_time == snapshot[1]: - oldest_snapshot = snapshot - - if snapshot[2] == "poweredOn": - powered_on_snapshot = snapshot - - yield 0, "Powered On: %s" % (powered_on_snapshot and powered_on_snapshot[3] or "None") - - last_snapshot_age = time.time() - last_snapshot[1] - if params.get("age"): - warn, crit = params["age"] - state, message = check_levels(last_snapshot_age, warn, crit) - if state > 0: - yield state, "Last %s" % message, - perfdata = [ ("age", last_snapshot_age, warn, crit) ] - else: - perfdata = [ ("age", last_snapshot_age) ] - yield 0, "Last Snapshot: %s %s" % (last_snapshot[3], - time.strftime("%D %H:%M",time.localtime(last_snapshot[1]))),\ - perfdata - - # Display oldest snapshot only, if it is not identical with the last snapshot - if not oldest_snapshot == last_snapshot: - oldest_snapshot_age = time.time() - oldest_snapshot[1] - if params.get("age_oldest"): - warn, crit = params["age_oldest"] - state, message = check_levels(oldest_snapshot_age, warn, crit) - if state > 0: - yield state, "Oldest %s" % message, - perfdata = [ ("age_oldst", oldest_snapshot_age, warn, crit) ] - else: - perfdata = [ ("age_oldest", oldest_snapshot_age) ] - - yield 0, "Oldest Snapshot: %s %s" % (oldest_snapshot[3], - time.strftime("%D %H:%M",time.localtime(oldest_snapshot[1]))),\ - perfdata + return + + Snapshot = collections.namedtuple("Snapshot", ["time", "state", "name"]) + + snapshots = (x.split(" ", 3) for x in " ".join(data["snapshot.rootSnapshotList"]).split("|")) + snapshots = [Snapshot(int(x[1]), x[2], x[3]) for x in snapshots] + yield 0, "Number of Snapshots %d" % len(snapshots) + + if not snapshots: + return + + powerd_on_list = [s for s in snapshots if s.state == "poweredOn"] + yield 0, "Powered On: %s" % powerd_on_list[0].name if powerd_on_list else "None" + + latest_snapshot = max(snapshots, key=lambda s: s.time) + latest_snapshot_age = time.time() - latest_snapshot.time + perfdata = [] + if params.get("age"): + warn, crit = params["age"] + state, message = check_levels(latest_snapshot_age, warn, crit) + if state > 0: + yield state, "Latest %s" % message, + perfdata = [("age", latest_snapshot_age, warn, crit)] + else: + perfdata = [("age", latest_snapshot_age)] + + timestamp = get_timestamp_human_readable(latest_snapshot.time) + yield 0, "Latest Snapshot: %s %s" % (latest_snapshot.name, timestamp), perfdata + + oldest_snapshot = min(snapshots, key=lambda s: s.time) + # Display oldest snapshot only, if it is not identical with the last snapshot + if oldest_snapshot != latest_snapshot: + perfdata = [] + oldest_snapshot_age = time.time() - oldest_snapshot.time + if params.get("age_oldest"): + warn, crit = params["age_oldest"] + state, message = check_levels(oldest_snapshot_age, warn, crit) + if state > 0: + yield state, "Oldest %s" % message, + perfdata = [("age_oldest", oldest_snapshot_age, warn, crit)] + else: + perfdata = [("age_oldest", oldest_snapshot_age)] + + timestamp = get_timestamp_human_readable(oldest_snapshot.time) + yield 0, "Oldest Snapshot: %s %s" % (oldest_snapshot.name, timestamp), perfdata check_info['esx_vsphere_vm.snapshots'] = { diff --git a/tests/unit/checks/generictests/datasets/esx_vsphere_vm_snapshots.py b/tests/unit/checks/generictests/datasets/esx_vsphere_vm_snapshots.py new file mode 100644 index 0000000..ccd91d6 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/esx_vsphere_vm_snapshots.py @@ -0,0 +1,36 @@ + + +checkname = 'esx_vsphere_vm' + + +info = [['snapshot.rootSnapshotList', + '1', + '1363596734', + 'poweredOff', + '20130318_105600_snapshot_LinuxI|2', + '1413977827', + 'poweredOn', + 'LinuxI', + 'Testsnapshot']] + + +discovery = {'cpu': [], + 'datastores': [], + 'guest_tools': [], + 'heartbeat': [], + 'mem_usage': [], + 'mounted_devices': [], + 'name': [], + 'running_on': [], + 'snapshots': [(None, {})]} + + +checks = { + 'snapshots': [ + (None, 'default', [(0, 'Number of Snapshots 2', []), + (0, 'Powered On: LinuxI Testsnapshot', []), + (0, 'Latest Snapshot: LinuxI Testsnapshot 2014-10-22 13:37:07', []), + (0, 'Oldest Snapshot: 20130318_105600_snapshot_LinuxI 2013-03-18 09:52:14', []), + ]), + ] +}

5 years, 11 months

Moved urlfunc handling to Dashlet()

by Lars Michelsen

Module: check_mk Branch: master Commit: 22f699ea7d41ec7c6522f3765a83cc86aa6c2d75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22f699ea7d41ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 07:47:46 2018 +0200 Moved urlfunc handling to Dashlet() Change-Id: If7e10545e895ad86331eebcf755d973a4a019392 --- cmk/gui/dashboard.py | 36 +------------------------- cmk/gui/plugins/dashboard/utils.py | 53 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 35 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 1d9eb1c..74f5a4a 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -260,7 +260,6 @@ class LegacyDashlet(cmk.gui.plugins.dashboard.Dashlet): return super(LegacyDashlet, self)._get_iframe_url() - # Pre Check_MK 1.6 the dashlets were declared with dictionaries like this: # # dashlet_types["hoststats"] = { @@ -536,9 +535,6 @@ def draw_dashboard(name): dashlet_container_begin(nr, dashlet) try: - # TODO: Fix this - gather_dashlet_url(dashlet) - # TODO: Make use of dashlet_instance here register_for_refresh(name, board, nr, dashlet, wato_folder) register_for_on_resize(name, board, nr, dashlet, wato_folder) @@ -758,7 +754,7 @@ def used_dashlet_types(board): # refreshed by us but need to do that themselves. def register_for_refresh(name, board, nr, dashlet, wato_folder): dashlet_type = get_dashlet_type(dashlet) - if "url" in dashlet or (not dashlet_type.is_iframe_dashlet() and dashlet_type.refresh_interval()): + if dashlet_type.type_name() == "url" or (not dashlet_type.is_iframe_dashlet() and dashlet_type.refresh_interval()): refresh = dashlet.get("refresh", dashlet_type.refresh_interval()) if not refresh: return @@ -807,36 +803,6 @@ def get_dashlet(board, ident): raise MKGeneralException(_('The dashlet does not exist.')) -# Use the URL returned by urlfunc as dashlet URL -# -# We need to support function pointers to be compatible to old dashboard plugin -# based definitions. The new dashboards use strings to reference functions within -# the global context or functions of a module. An example would be: -# -# urlfunc: "my_custom_url_rendering_function" -# -# or within a module: -# -# urlfunc: "my_module.render_my_url" -def gather_dashlet_url(dashlet): - # dashlets using the 'urlfunc' method will dynamically compute - # an url (using HTML context variables at their wish). - if "urlfunc" not in dashlet: - return - - urlfunc = dashlet['urlfunc'] - if type(urlfunc) == type(lambda x: x): - dashlet["url"] = urlfunc() - else: - if '.' in urlfunc: - module_name, func_name = urlfunc.split('.', 1) - module = __import__(module_name) - fp = module.__dict__[func_name] - else: - fp = globals()[urlfunc] - dashlet["url"] = fp() - - # Create the HTML code for one dashlet. Each dashlet has an id "dashlet_%d", # where %d is its index (in board["dashlets"]). Javascript uses that id # for the resizing. Within that div there is an inner div containing the diff --git a/cmk/gui/plugins/dashboard/utils.py b/cmk/gui/plugins/dashboard/utils.py index 64620ae..9e64a68 100644 --- a/cmk/gui/plugins/dashboard/utils.py +++ b/cmk/gui/plugins/dashboard/utils.py @@ -165,6 +165,11 @@ class Dashlet(object): self._wato_folder = wato_folder + @property + def dashlet_id(self): + return self._dashlet_id + + def display_title(self): return self.title() @@ -285,6 +290,54 @@ class Dashlet(object): return None + def _get_refresh_url(self): + """Returns the URL to be used for loading the dashlet contents""" + dashlet_url = self._get_dashlet_url_from_urlfunc() + if dashlet_url is not None: + return dashlet_url + + if self._dashlet.get("url"): + return self._dashlet["url"] + + return html.makeuri_contextless([ + ("name", self._dashboard_name), + ("id", self._dashlet_id), + ], filename="dashboard_dashlet.py") + + + # TODO: This is specific for the 'url' dashlet type. Move it to that + # dashlets class once it has been refactored to a class + def _get_dashlet_url_from_urlfunc(self): + """Use the URL returned by urlfunc as dashlet URL + + Dashlets using the 'urlfunc' method will dynamically compute + an url (using HTML context variables at their wish). + + We need to support function pointers to be compatible to old dashboard plugin + based definitions. The new dashboards use strings to reference functions within + the global context or functions of a module. An example would be: + + urlfunc: "my_custom_url_rendering_function" + + or within a module: + + urlfunc: "my_module.render_my_url" + """ + if "urlfunc" not in self._dashlet: + return None + + urlfunc = self._dashlet['urlfunc'] + if type(urlfunc) == type(lambda x: x): + return urlfunc() + + if '.' in urlfunc: + module_name, func_name = urlfunc.split('.', 1) + module = __import__(module_name) + return module.__dict__[func_name]() + + return globals()[urlfunc]() + + class DashletRegistry(cmk.gui.plugin_registry.ClassRegistry):

5 years, 11 months

Refactored dashlet rendering to use common dashlet instance object

by Lars Michelsen

Module: check_mk Branch: master Commit: 13347387a59a0d280148ce163e2acdca9608dec1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13347387a59a0d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 08:05:28 2018 +0200 Refactored dashlet rendering to use common dashlet instance object Change-Id: Ie0b23ee9e16f9499b5f6e99735ebc2000d3f7811 --- cmk/gui/dashboard.py | 154 ++++++++++++++++++------------------- cmk/gui/plugins/dashboard/utils.py | 95 +++++++++++++++++------ tests/unit/web/test_dashboard.py | 153 +++++++++++++++++++++++++++++++++++- 3 files changed, 298 insertions(+), 104 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=13347387a5…

5 years, 11 months

Refactored dashlet plugin registering to new plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 5929dedb5f647d67dcddbc309a55b00e7f047180 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5929dedb5f647d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 08:27:44 2018 +0200 Refactored dashlet plugin registering to new plugin registry * All existing dashlets still use the old API * Add compatibility layer (LegacyDashlet()) to be able to still work with dashlets using the old dashlet API * Add tests to verify LegacyDashlet() functionality Change-Id: If90b4bc1b1dc346e989e0113f5c40cc28ff1e02d --- cmk/gui/dashboard.py | 389 +++++++++++++++++++++------------- cmk/gui/plugins/dashboard/__init__.py | 2 + cmk/gui/plugins/dashboard/dashlets.py | 5 +- cmk/gui/plugins/dashboard/utils.py | 267 ++++++++++++++++++++++- tests/unit/web/test_dashboard.py | 155 ++++++++++++++ 5 files changed, 670 insertions(+), 148 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5929dedb5f…

5 years, 11 months

Minor cleanup of some globals and javascript data hand over

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ff15425ae507edebc4f9dae79a6c56965d158b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff15425ae507e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Sep 23 22:55:12 2018 +0200 Minor cleanup of some globals and javascript data hand over Change-Id: I9a524efd5063d6f1a7146e77443863f73de6d09e --- cmk/gui/dashboard.py | 45 ++++++++++++++++++++++---------------- cmk/gui/plugins/dashboard/utils.py | 1 - 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/cmk/gui/dashboard.py b/cmk/gui/dashboard.py index 4b8c97e..9775f35 100644 --- a/cmk/gui/dashboard.py +++ b/cmk/gui/dashboard.py @@ -527,19 +527,22 @@ def draw_dashboard(name): dashlet_javascripts(board) dashlet_styles(board) - # TODO: Cleanup these globals - global g_refresh_dashlets, g_on_resize - g_refresh_dashlets = [] # Dashlets with automatic refresh, for Javascript - dashlets_js = [] - g_on_resize = [] # javascript function to execute after ressizing the dashlet + refresh_dashlets = [] # Dashlets with automatic refresh, for Javascript + dashlet_coords = [] # Dimensions and positions of dashlet + on_resize_dashlets = [] # javascript function to execute after ressizing the dashlet for nr, dashlet in enumerate(board["dashlets"]): dashlet_container_begin(nr, dashlet) dashlet_type = get_dashlet_type(dashlet) dashlet_instance = dashlet_type(name, board, nr, dashlet, wato_folder) try: - register_for_refresh(dashlet_instance) - register_for_on_resize(dashlet_instance) + refresh = get_dashlet_refresh(dashlet_instance) + if refresh: + refresh_dashlets.append(refresh) + + on_resize = get_dashlet_on_resize(dashlet_instance) + if on_resize: + on_resize_dashlets.append(on_resize) draw_dashlet(dashlet_instance) except MKUserError, e: @@ -552,7 +555,7 @@ def draw_dashboard(name): dashlet_error(nr, dashlet, detail) dashlet_container_end() - dashlets_js.append(get_dashlet_dimensions(dashlet_instance)) + dashlet_coords.append(get_dashlet_dimensions(dashlet_instance)) dashboard_edit_controls(name, board) @@ -567,10 +570,10 @@ var GROW = %d; var grid_size = %d; var header_height = %d; var screen_margin = %d; -var dashlet_padding = Array%s; -var dashlet_min_size = Array%s; +var dashlet_padding = %s; +var dashlet_min_size = %s; var corner_overlap = %d; -var refresh_dashlets = [%s]; +var refresh_dashlets = %s; var on_resize_dashlets = {%s}; var dashboard_name = '%s'; var dashboard_mtime = %d; @@ -579,9 +582,9 @@ var dashlets = %s; calculate_dashboard(); window.onresize = function () { calculate_dashboard(); } dashboard_scheduler(1); - """ % (MAX, GROW, raster, header_height, screen_margin, dashlet_padding, Dashlet.minimum_size, - corner_overlap, ','.join(g_refresh_dashlets), ','.join(g_on_resize), - name, board['mtime'], json.dumps(dashlets_js))) + """ % (MAX, GROW, raster, header_height, screen_margin, json.dumps(dashlet_padding), json.dumps(Dashlet.minimum_size), + corner_overlap, json.dumps(refresh_dashlets), ','.join(on_resize_dashlets), + name, board['mtime'], json.dumps(dashlet_coords))) if mode == 'edit': html.javascript('toggle_dashboard_edit(true)') @@ -753,7 +756,8 @@ def used_dashlet_types(board): # dashlets using the 'url' method will be refreshed by us. Those # dashlets using static content (such as an iframe) will not be # refreshed by us but need to do that themselves. -def register_for_refresh(dashlet_instance): +# TODO: Refactor this to Dashlet or later Dashboard class +def get_dashlet_refresh(dashlet_instance): if dashlet_instance.type_name() == "url" or (not dashlet_instance.is_iframe_dashlet() and dashlet_instance.refresh_interval()): refresh = dashlet_instance.refresh_interval() if not refresh: @@ -761,16 +765,19 @@ def register_for_refresh(dashlet_instance): action = dashlet_instance.get_refresh_action() if action: - g_refresh_dashlets.append('[%d, %d, %s]' % - (dashlet_instance.dashlet_id, refresh, action)) + return [ dashlet_instance.dashlet_id, refresh, action ] + return None -def register_for_on_resize(dashlet_instance): +# TODO: Refactor this to Dashlet or later Dashboard class +def get_dashlet_on_resize(dashlet_instance): on_resize = dashlet_instance.on_resize() if on_resize: - g_on_resize.append('%d: function() {%s}' % (dashlet_instance.dashlet_id, on_resize)) + return '%d: function() {%s}' % (dashlet_instance.dashlet_id, on_resize) + return None +# TODO: Refactor this to Dashlet or later Dashboard class def get_dashlet_dimensions(dashlet_instance): dimensions = {} dimensions['x'], dimensions['y'] = dashlet_instance.position() diff --git a/cmk/gui/plugins/dashboard/utils.py b/cmk/gui/plugins/dashboard/utils.py index 5a1b5cb..c6deb89 100644 --- a/cmk/gui/plugins/dashboard/utils.py +++ b/cmk/gui/plugins/dashboard/utils.py @@ -253,7 +253,6 @@ class Dashlet(object): html.javascript('reload_on_resize["%d"] = "%s"' % (self._dashlet_id, iframe_url)) - # TODO: Move this to Dashlet() def _get_iframe_url(self): if not self.is_iframe_dashlet(): return

5 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018