Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

3943 FIX ntp.time: fixed parameters in discovered checks

by Marcel Schulte

Module: check_mk Branch: master Commit: 55bff548e64186a0bf8f4f07d3dffe046cec047a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55bff548e64186… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Nov 28 09:27:49 2016 +0100 3943 FIX ntp.time: fixed parameters in discovered checks The services could crash with "KeyError ('alert_delay')" because of wrong parameters after discovery. This has been fixed now. --- .werks/3943 | 10 ++++++++++ ChangeLog | 1 + checks/ntp | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3943 b/.werks/3943 new file mode 100644 index 0000000..33be881 --- /dev/null +++ b/.werks/3943 @@ -0,0 +1,10 @@ +Title: ntp.time: fixed parameters in discovered checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480321449 + +The services could crash with "KeyError ('alert_delay')" because of wrong parameters after discovery. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 938124a..cb6ec53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 4093 FIX: oracle_tablespaces: Werk 3907 broke the space calculation... * 3942 FIX: rstcli: fixed previously failing check, changed check output to provide more information... * 4074 FIX: check_ftp: Fixed possible wrong service description caused by unintended use of global variable + * 3943 FIX: ntp.time: fixed parameters in discovered checks... Multisite: * 4070 Added a painter for the service check period diff --git a/checks/ntp b/checks/ntp index bd0b13d..57383a1 100644 --- a/checks/ntp +++ b/checks/ntp @@ -72,7 +72,7 @@ def inventory_ntp_summary(info): if ntp_inventory_mode not in [ "summary", "both" ]: return [] if len(info) > 0: - return [(None, "ntp_default_levels")] + return [(None, {})] def ntp_fmt_time(t): if t == '-':

7 years, 10 months

WATO: Highlighting "activate affected button" now

by Lars Michelsen

Module: check_mk Branch: master Commit: 74f958cce255976b4d68b0e0cb2b74d0e282743c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74f958cce25597… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 09:14:03 2016 +0100 WATO: Highlighting "activate affected button" now --- web/htdocs/check_mk.css | 15 +++++++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9970828..840b641 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -150,6 +150,21 @@ input.button:disabled:active { box-shadow: 0 0 1.5px #000000; } +input.button.hot { + border-color: #d4a466 #633e0d #633e0d #d4a466; + background-color: #c37d19; +} + +input.button.hot:hover { + background-color: #deb548; +} + +input.button.hot:active { + background-color: #c37d19; + border-color: #6d5723 #d9bf81 #d9bf81 #6d5723; +} + + /* pattern / regex input styling */ input.regexp { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1746766..d568387 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4828,7 +4828,7 @@ class ModeActivateChanges(WatoMode, ActivateChanges): forms.end() html.jsbutton("activate_affected", _("Activate affected"), - "activate_changes(\"affected\")") + "activate_changes(\"affected\")", cssclass="hot") html.jsbutton("activate_selected", _("Activate selected"), "activate_changes(\"selected\")")

7 years, 10 months

Added button id to export pdf button

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e52546476a3b70a1c674bdb0cb96ed011020e91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e52546476a3b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 09:04:51 2016 +0100 Added button id to export pdf button --- web/htdocs/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e8f1872..138257e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2106,7 +2106,8 @@ def show_context_links(thisview, show_filters, # Button for creating an instant report (if reporting is available) if config.reporting_available() and config.user.may("general.reporting"): - html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") + html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), + "report", id="context_pdf_export") # Buttons to other views, dashboards, etc. links = visuals.collect_context_links(thisview)

7 years, 10 months

Audit log: display changes button first

by Lars Michelsen

Module: check_mk Branch: master Commit: 82b122196923fd76531c17524e2acff5dde84111 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82b122196923fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 09:18:30 2016 +0100 Audit log: display changes button first --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d568387..1164e61 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4367,8 +4367,8 @@ class ModeAuditLog(WatoMode): def buttons(self): - home_button() changelog_button() + home_button() if self._log_exists() and config.user.may("wato.auditlog") and config.user.may("wato.edit"): html.context_button(_("Download"), html.makeactionuri([("_action", "csv")]), "download")

7 years, 10 months

4074 FIX check_ftp: Fixed possible wrong service description caused by unintended use of global variable

by Lars Michelsen

Module: check_mk Branch: master Commit: e89b6bea3492dc62e5bb4f4f291816b11c4805c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e89b6bea3492dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Nov 27 13:22:53 2016 +0100 4074 FIX check_ftp: Fixed possible wrong service description caused by unintended use of global variable --- .werks/4074 | 10 ++++++++++ ChangeLog | 1 + checks/check_ftp | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4074 b/.werks/4074 new file mode 100644 index 0000000..6ad62b4 --- /dev/null +++ b/.werks/4074 @@ -0,0 +1,10 @@ +Title: check_ftp: Fixed possible wrong service description caused by unintended use of global variable +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480249368 + + diff --git a/ChangeLog b/ChangeLog index c0620ea..938124a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up in case of interface groups * 4093 FIX: oracle_tablespaces: Werk 3907 broke the space calculation... * 3942 FIX: rstcli: fixed previously failing check, changed check output to provide more information... + * 4074 FIX: check_ftp: Fixed possible wrong service description caused by unintended use of global variable Multisite: * 4070 Added a painter for the service check period diff --git a/checks/check_ftp b/checks/check_ftp index b3c0e34..1a7739b 100644 --- a/checks/check_ftp +++ b/checks/check_ftp @@ -73,7 +73,7 @@ def check_ftp_arguments(params): def check_ftp_get_item(params): if type(params) == tuple: - return "FTP " + args[0] + return "FTP " + params[0] else: if "port" in params and params["port"] != 21: return "FTP Port " + str(params["port"])

7 years, 10 months

3942 FIX rstcli: fixed previously failing check, changed check output to provide more information

by Marcel Schulte

Module: check_mk Branch: master Commit: b7e55fc8dcf00b42a612429449411354a711d3a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7e55fc8dcf00b… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Sat Nov 26 00:25:01 2016 +0100 3942 FIX rstcli: fixed previously failing check, changed check output to provide more information The check failed with "unsupported item name". This has been fixed now. Additionally, check output has been changed to provide more information. --- .werks/3942 | 11 +++++++++++ ChangeLog | 1 + checks/rstcli | 8 +++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/3942 b/.werks/3942 new file mode 100644 index 0000000..3350a80 --- /dev/null +++ b/.werks/3942 @@ -0,0 +1,11 @@ +Title: rstcli: fixed previously failing check, changed check output to provide more information +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1480115995 +Class: fix + +The check failed with "unsupported item name". This has been fixed now. + +Additionally, check output has been changed to provide more information. diff --git a/ChangeLog b/ChangeLog index 9373d7c..c0620ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 4069 FIX: cmciii.phase: Fixed broken check with some devices... * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up in case of interface groups * 4093 FIX: oracle_tablespaces: Werk 3907 broke the space calculation... + * 3942 FIX: rstcli: fixed previously failing check, changed check output to provide more information... Multisite: * 4070 Added a painter for the service check period diff --git a/checks/rstcli b/checks/rstcli index 4ea3736..25694a5 100644 --- a/checks/rstcli +++ b/checks/rstcli @@ -157,7 +157,7 @@ def inventory_rstcli_pdisks(parsed): def check_rstcli_pdisks(item, params, parsed): reg = regex("(.*)/([0-9\-]*)") match = reg.match(item) - if match: + if not match: return 3, "unsupported item name" volume, disk_id = match.group(1), match.group(2) @@ -165,8 +165,10 @@ def check_rstcli_pdisks(item, params, parsed): disks = parsed.get(volume, {}).get('Disks', []) for disk in disks: if disk['ID'] == disk_id: - return rstcli_states.get(disk['State'], 2), \ - "[%s] state %s" % (disk['Serial Number'], disk['State']) + infotext = "%s (unit: %s, size: %s, type: %s, model: %s, serial: %s)" % \ + (disk['State'], volume, disk['Size'], disk['Disk Type'], + disk['Model'], disk['Serial Number']) + return rstcli_states.get(disk['State'], 2), infotext check_info["rstcli.pdisks"] = {

7 years, 10 months

Fixed wrong disabled filter declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c8ddbd3499c877d0cb76d4da2144da7fc3750b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c8ddbd3499c87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 17:01:10 2016 +0100 Fixed wrong disabled filter declaration --- web/plugins/views/inventory.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 2925906..46c747a 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -87,9 +87,8 @@ def declare_inv_column(invpath, datatype, title, short = None): # Declare filter. Sync this with declare_invtable_columns() if datatype == "str": visuals.declare_filter(800, visuals.FilterInvText(name, invpath, title)) - # TODO: - #elif datatype == "bool": - # visuals.declare_filter(800, visuals.FilterInvBool(name, invpath, title)) + elif datatype == "bool": + visuals.declare_filter(800, visuals.FilterInvBool(name, invpath, title)) else: filter_info = inv_filter_info.get(datatype, {}) visuals.declare_filter(800, visuals.FilterInvFloat(name, invpath, title, @@ -965,8 +964,9 @@ def declare_invtable_columns(infoname, invpath, topic): if not filter_class: if paint_name == "str": filter_class = visuals.FilterInvtableText - elif paint_name == "bool": - filter_class = visuals.FilterInvtableBool + # TODO: + #elif paint_name == "bool": + # filter_class = visuals.FilterInvtableBool else: filter_class = visuals.FilterInvtableIDRange

7 years, 10 months

4073 FIX Cleaned up cluster host handling in HW/SW inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a63e5d1a273fdc8755f2abf4d07018f65c78d75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a63e5d1a273fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 25 16:47:27 2016 +0100 4073 FIX Cleaned up cluster host handling in HW/SW inventory Previously the manual inventory calls on the command line were not possible on the command line, but when adding a "Check_MK inventory" service to a cluster host, the inventory was tried and did work in case the cluster has a host address configured. These differences have now been cleaned up and changed a bit. You can perform the inventory now on command line and add a "Check_MK inventory" service to the hosts, but the regular inventory with all the plugins is not performed against cluster hosts. Instead the clusters only get the following inventory nodes added: <ul> <li>Software > Applications > Check_MK > Cluster > Cluster host: Yes</li> <li>Software > Applications > Check_MK > Cluster > Nodes: List of nodes</li> </ul> The first node is also added to all other hosts but set to <i>No</i>. You can then use a filter to include or exclude the hosts of your choice from your inventory list views. --- .werks/4073 | 28 ++++++++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- modules/inventory.py | 50 ++++++++++++++++++++++++++++------------ web/plugins/views/inventory.py | 24 +++++++++++++++---- web/plugins/visuals/inventory.py | 28 ++++++++++++++++++++++ 6 files changed, 113 insertions(+), 20 deletions(-) diff --git a/.werks/4073 b/.werks/4073 new file mode 100644 index 0000000..576a4f1 --- /dev/null +++ b/.werks/4073 @@ -0,0 +1,28 @@ +Title: Cleaned up cluster host handling in HW/SW inventory +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i3 +Date: 1480088542 +Class: fix + +Previously the manual inventory calls on the command line were +not possible on the command line, but when adding a "Check_MK inventory" +service to a cluster host, the inventory was tried and did work in case +the cluster has a host address configured. + +These differences have now been cleaned up and changed a bit. + +You can perform the inventory now on command line and add a "Check_MK inventory" +service to the hosts, but the regular inventory with all the plugins is not +performed against cluster hosts. Instead the clusters only get the following +inventory nodes added: + +<ul> +<li>Software > Applications > Check_MK > Cluster > Cluster host: Yes</li> +<li>Software > Applications > Check_MK > Cluster > Nodes: List of nodes</li> +</ul> + +The first node is also added to all other hosts but set to <i>No</i>. You +can then use a filter to include or exclude the hosts of your choice from +your inventory list views. diff --git a/ChangeLog b/ChangeLog index b93da3e..9373d7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 4067 FIX: Fixed broken inventory history view in current master... * 3917 FIX: Fixed broken dicttable rendering * 3918 FIX: Inventory history: Fixed possible exception when renedering history tables... + * 4073 FIX: Cleaned up cluster host handling in HW/SW inventory... 1.4.0i2: diff --git a/modules/check_mk.py b/modules/check_mk.py index d2bc850..2f689cf 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4697,7 +4697,7 @@ try: elif o in [ '-i', '--inventory' ]: load_module("inventory") if args: - hostnames = parse_hostname_list(args, with_clusters = False) + hostnames = parse_hostname_list(args, with_clusters=True) else: hostnames = None do_inv(hostnames) diff --git a/modules/inventory.py b/modules/inventory.py index 62aa5bb..46854ab 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -172,7 +172,7 @@ def do_inv(hostnames): # No hosts specified: do all hosts and force caching if hostnames == None: - hostnames = all_active_realhosts() + hostnames = all_active_hosts() set_use_cachefile() errors = [] @@ -246,15 +246,44 @@ def count_nodes(tree): else: return 1 + def do_inv_for(hostname): + global g_inv_tree + g_inv_tree = {} + + node = inv_tree("software.applications.check_mk.cluster.") + + if is_cluster(hostname): + node["is_cluster"] = True + do_inv_for_cluster(hostname) + else: + node["is_cluster"] = False + do_inv_for_realhost(hostname) + + # Remove empty paths + inv_cleanup_tree(g_inv_tree) + old_timestamp = save_inv_tree(hostname) + + console.verbose("..%s%s%d%s entries" % (tty.bold, tty.yellow, count_nodes(g_inv_tree), tty.normal)) + + run_inv_export_hooks(hostname, g_inv_tree) + return g_inv_tree, old_timestamp + + +def do_inv_for_cluster(hostname): + inv_node = inv_tree_list("software.applications.check_mk.cluster.nodes:") + for node_name in nodes_of(hostname): + inv_node.append({ + "name" : node_name, + }) + + +def do_inv_for_realhost(hostname): try: ipaddress = lookup_ip_address(hostname) except: raise MKGeneralException("Cannot resolve hostname '%s'." % hostname) - global g_inv_tree - g_inv_tree = {} - # If this is an SNMP host then determine the SNMP sections # that this device supports. if is_snmp_host(hostname): @@ -294,15 +323,6 @@ def do_inv_for(hostname): extend_tree_with_check_mk_inventory_info(hostname) - # Remove empty paths - inv_cleanup_tree(g_inv_tree) - old_timestamp = save_inv_tree(hostname) - - console.verbose("..%s%s%d%s entries" % (tty.bold, tty.yellow, count_nodes(g_inv_tree), tty.normal)) - - run_inv_export_hooks(hostname, g_inv_tree) - return g_inv_tree, old_timestamp - def extend_tree_with_check_mk_inventory_info(hostname): persisted_file = cmk.paths.omd_root + "/var/check_mk/persisted/%s" % hostname @@ -318,11 +338,11 @@ def extend_tree_with_check_mk_inventory_info(hostname): except Exception, e: raise MKGeneralException(_("Cannot parse persisted file of %s: %s") % (hostname, e)) - add_check_mk_inventory_info_to_tree(persisted_data) + add_check_mk_inventory_info_to_tree(hostname, persisted_data) console.verbose(tty.green + tty.bold + "check_mk_sections" + " " + tty.normal) -def add_check_mk_inventory_info_to_tree(persisted_data): +def add_check_mk_inventory_info_to_tree(hostname, persisted_data): node = inv_tree_list("software.applications.check_mk.inventory.sections:") section_ages = [] for section, sectiondata in persisted_data: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index e953bed..2925906 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -30,8 +30,6 @@ import cmk.defines as defines def paint_host_inventory(row, invpath): invdata = inventory.get(row.get("host_inventory"), invpath) - if not invdata: - return "", "" # _("No inventory data available") hint = inv_display_hint(invpath) if "paint_function" in hint: @@ -89,6 +87,9 @@ def declare_inv_column(invpath, datatype, title, short = None): # Declare filter. Sync this with declare_invtable_columns() if datatype == "str": visuals.declare_filter(800, visuals.FilterInvText(name, invpath, title)) + # TODO: + #elif datatype == "bool": + # visuals.declare_filter(800, visuals.FilterInvBool(name, invpath, title)) else: filter_info = inv_filter_info.get(datatype, {}) visuals.declare_filter(800, visuals.FilterInvFloat(name, invpath, title, @@ -392,7 +393,7 @@ multisite_painters["inventory_tree"] = { def inv_paint_hz(hz): if hz == None: - return "", _("unknown") + return "", "" if hz < 10: return "number", "%.2f" % hz @@ -409,7 +410,7 @@ def inv_paint_hz(hz): def inv_paint_bytes(b): if b == None: - return "", _("unknown") + return "", "" elif b == 0: return "number", "0" @@ -547,6 +548,13 @@ def inv_paint_age(age): else: return "", "" + +def inv_paint_bool(value): + if value == None: + return "", "" + return "", (_("Yes") if value else _("No")) + + def inv_paint_timestamp_as_age(timestamp): age = time.time() - timestamp return inv_paint_age(age) @@ -717,6 +725,12 @@ inventory_displayhints.update({ ".software.applications." : { "title" : _("Applications"), }, ".software.applications.check_mk." : { "title" : _("Check_MK"), }, + ".software.applications.check_mk.cluster.is_cluster" : { "title" : _("Cluster host"), + "short" : _("Cluster"), + "paint" : "bool", + }, + ".software.applications.check_mk.cluster.nodes:" : { "title" : _("Nodes"), + "render" : render_inv_dicttable, }, ".software.applications.check_mk.inventory." : { "title" : _("Hardware/Software Inventory"), }, ".software.applications.check_mk.inventory.oldest_section" : { "title" : _("Oldest agent section"), "paint" : "timestamp_as_age" }, ".software.applications.check_mk.inventory.sections:" : { "title" : _("Agent sections"), @@ -951,6 +965,8 @@ def declare_invtable_columns(infoname, invpath, topic): if not filter_class: if paint_name == "str": filter_class = visuals.FilterInvtableText + elif paint_name == "bool": + filter_class = visuals.FilterInvtableBool else: filter_class = visuals.FilterInvtableIDRange diff --git a/web/plugins/visuals/inventory.py b/web/plugins/visuals/inventory.py index c449028..af54a35 100644 --- a/web/plugins/visuals/inventory.py +++ b/web/plugins/visuals/inventory.py @@ -312,6 +312,7 @@ class FilterInvtableVersion(Filter): return new_rows + class FilterInvText(Filter): def __init__(self, name, invpath, title): self._invpath = invpath @@ -400,6 +401,33 @@ class FilterInvFloat(Filter): newrows.append(row) return newrows + +class FilterInvBool(FilterTristate): + def __init__(self, name, invpath, title): + self._invpath = invpath + FilterTristate.__init__(self, name, title, "host", name) + + def need_inventory(self): + return True + + def filter(self, infoname): + return "" # No Livestatus filtering right now + + def filter_table(self, rows): + tri = self.tristate_value() + if tri == -1: + return rows + else: + wanted_value = tri == 1 + + newrows = [] + for row in rows: + invdata = inventory.get(row["host_inventory"], self._invpath) + if wanted_value == invdata: + newrows.append(row) + return newrows + + class FilterHasInventory(FilterTristate): def __init__(self): FilterTristate.__init__(self, "has_inv", _("Has Inventory Data"), "host", "host_inventory")

7 years, 10 months

3993 Some minor performance improvements during config generation

by Andreas Boesl

Module: check_mk Branch: master Commit: 869d9e28aca8f152c64434d50c5a548e1296d492 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=869d9e28aca8f1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 25 16:41:45 2016 +0100 3993 Some minor performance improvements during config generation Rules with host tags as well as explicit set host names now being processed faster. However, those kinds of rules are quite rare... --- .werks/3993 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 26 ++++++++++++++++++-------- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.werks/3993 b/.werks/3993 new file mode 100644 index 0000000..60d0d0d --- /dev/null +++ b/.werks/3993 @@ -0,0 +1,10 @@ +Title: Some minor performance improvements during config generation +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1480088343 +Class: feature + +Rules with host tags as well as explicit set host names now being processed faster. +However, those kinds of rules are quite rare... diff --git a/ChangeLog b/ChangeLog index fe41b15..b93da3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 4096 avaya_chassis_card, avaya_chassis_ps, avaya_chassis_temp: New checks for Avaya devices... * 4094 apc_rackpdu_power: now detects all phases or banks connected to this pdu NOTE: Please refer to the migration notes! + * 3993 Some minor performance improvements during config generation... * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/modules/check_mk.py b/modules/check_mk.py index 173df00..d2bc850 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -893,16 +893,26 @@ def all_matching_hosts(tags, hostlist, with_foreign_hosts): else: valid_hosts = all_active_hosts() - # Speed up matching process by filter out single matches + # Contains matched hosts matching = set([]) - if not tags and not [x for x in hostlist if x[0] in ["@", "!", "~"]]: - for hostname in hostlist: - if hostname in valid_hosts: - matching.add(hostname) - elif not tags and len(hostlist) == 1 and "@all" in hostlist: - matching.update(set(valid_hosts)) + + # Check if the rule has only specific hosts set + only_specific_hosts = not bool([x for x in hostlist if x[0] in ["@", "!", "~"]]) + + # If no tags are specified and there are only specific hosts we already have the matches + if not tags and only_specific_hosts: + matching = valid_hosts.intersection(hostlist) + # If no tags are specified and the hostlist only include @all (all hosts) + elif not tags and hostlist == [ "@all" ]: + matching = valid_hosts else: - for hostname in valid_hosts: + # If the rule has only exact host restrictions, we can thin out the list of hosts to check + if only_specific_hosts: + hosts_to_check = valid_hosts.intersection(set(hostlist)) + else: + hosts_to_check = valid_hosts + + for hostname in hosts_to_check: # When no tag matching is requested, do not filter by tags. Accept all hosts # and filter only by hostlist if in_extraconf_hostlist(hostlist, hostname) and \

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 7e067cf1b17c42a3e0b3c3e66d04d2f3956bfa49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e067cf1b17c42… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 25 16:10:27 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/Query.cc | 16 +++++++++++++--- livestatus/src/VariadicFilter.cc | 13 +------------ livestatus/src/VariadicFilter.h | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 74577eb..5770ab8 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -270,7 +270,17 @@ void Query::parseAndOrLine(char *line, LogicalOperator andor, return; } - filter.combineFilters(_logger, number, andor); + if (number > static_cast<int>(filter.size())) { + invalidHeader("error combining filters for table " + _table->name() + + " with '" + + (andor == LogicalOperator::and_ ? "AND" : "OR") + + "': expected " + to_string(number) + + " filters, but only " + to_string(filter.size()) + " " + + (filter.size() == 1 ? "is" : "are") + " on stack"); + return; + } + + filter.combineFilters(number, andor); } void Query::parseNegateLine(char *line, VariadicFilter &filter, @@ -878,13 +888,13 @@ void Query::computeStatsGroupSpec(Query::_stats_group_spec_t &groupspec, void Query::doWait() { // If no wait condition and no trigger is set, // we do not wait at all. - if (!_wait_condition.hasSubFilters() && _wait_trigger == nullptr) { + if (_wait_condition.size() == 0 && _wait_trigger == nullptr) { return; } // If a condition is set, we check the condition. If it // is already true, we do not need to way - if (_wait_condition.hasSubFilters() && + if (_wait_condition.size() > 0 && _wait_condition.accepts(_wait_object, _auth_user, _timezone_offset)) { Debug(_logger) << "Wait condition true, no waiting neccessary"; return; diff --git a/livestatus/src/VariadicFilter.cc b/livestatus/src/VariadicFilter.cc index ddf6666..bd9bd44 100644 --- a/livestatus/src/VariadicFilter.cc +++ b/livestatus/src/VariadicFilter.cc @@ -23,10 +23,8 @@ // Boston, MA 02110-1301 USA. #include "VariadicFilter.h" -#include <ostream> #include "AndingFilter.h" #include "FilterVisitor.h" -#include "Logger.h" #include "OringFilter.h" using std::make_unique; @@ -70,16 +68,7 @@ void VariadicFilter::findIntLimits(const string &colum_nname, int *lower, } } -void VariadicFilter::combineFilters(Logger *logger, int count, - LogicalOperator andor) { - if (count > static_cast<int>(_subfilters.size())) { - Informational(logger) << "Cannot combine " << count << " filters with '" - << (andor == LogicalOperator::and_ ? "AND" : "OR") - << "': only " << _subfilters.size() - << " are on stack"; - return; - } - +void VariadicFilter::combineFilters(int count, LogicalOperator andor) { auto variadic = VariadicFilter::make(andor); for (auto i = 0; i < count; ++i) { variadic->addSubfilter(_subfilters.back()); diff --git a/livestatus/src/VariadicFilter.h b/livestatus/src/VariadicFilter.h index 1dcb7d2..efb6c72 100644 --- a/livestatus/src/VariadicFilter.h +++ b/livestatus/src/VariadicFilter.h @@ -26,12 +26,12 @@ #define VariadicFilter_h #include "config.h" // IWYU pragma: keep +#include <cstddef> #include <deque> #include <memory> #include <string> #include "Filter.h" class FilterVisitor; -class Logger; enum class LogicalOperator { and_, or_ }; @@ -44,8 +44,8 @@ public: void accept(FilterVisitor &v) override; void addSubfilter(Filter *); Filter *stealLastSubfiler(); - void combineFilters(Logger *logger, int count, LogicalOperator andor); - bool hasSubFilters() { return !_subfilters.empty(); } + void combineFilters(int count, LogicalOperator andor); + size_t size() { return _subfilters.size(); } _subfilters_t::iterator begin() { return _subfilters.begin(); } _subfilters_t::iterator end() { return _subfilters.end(); } void findIntLimits(const std::string &colum_nname, int *lower, int *upper,

7 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016