Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 9df93c4a0ff1a959e7ce38233f395a7b4db9c743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9df93c4a0ff1a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 15:56:02 2018 +0100 Moved savefloat() next to saveint() Change-Id: I3bf1ffde88fabc65210051fbac46df1a444139ef --- web/htdocs/lib.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 139858e..ac82440 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -33,15 +33,6 @@ import cmk.paths from log import logger -# TODO: Remove this helper function. Replace with explicit checks and covnersion -# in using code. -def savefloat(f): - try: - return float(f) - except: - return 0.0 - - def make_utf8(x): if type(x) == unicode: return x.encode('utf-8') @@ -144,6 +135,7 @@ def pnp_cleanup(s): .replace('/', '_') \ .replace('\\', '_') + # Quote string for use as arguments on the shell # TODO: Move to Check_MK library def quote_shell_string(s): @@ -155,6 +147,16 @@ def log_exception(msg=None): msg = _('Internal error') logger.error("%s %s: %s" % (html.request_uri(), msg, traceback.format_exc())) + +# TODO: Remove this helper function. Replace with explicit checks and covnersion +# in using code. +def savefloat(f): + try: + return float(f) + except: + return 0.0 + + # TODO: Remove this helper function. Replace with explicit checks and covnersion # in using code. def saveint(x):

6 years, 4 months

cleanup some make_utf8() calls

by Lars Michelsen

Module: check_mk Branch: master Commit: dcfcc2c6486e2525fb19f3a74bbdf9b67962fd11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcfcc2c6486e25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 15:51:36 2018 +0100 cleanup some make_utf8() calls Change-Id: Ie9bfdad385696dd49ad79e72f3795abf2ceb7107 --- web/plugins/userdb/htpasswd.py | 2 +- web/plugins/userdb/ldap.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py index 3c46989..71ebfea 100644 --- a/web/plugins/userdb/htpasswd.py +++ b/web/plugins/userdb/htpasswd.py @@ -114,7 +114,7 @@ class HtpasswdUserConnector(UserConnector): locksym = '!' else: locksym = "" - output += "%s:%s%s\n" % (make_utf8(id), locksym, user["password"]) + output += "%s:%s%s\n" % (id.encode("utf-8"), locksym, user["password"]) store.save_file(cmk.paths.htpasswd_file, output) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index ff35be0..aeb1ae5 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -478,6 +478,12 @@ class LDAPUserConnector(UserConnector): LDAP_CONTROL_PAGED_RESULTS, True, (page_size, '') ) + if type(base) == unicode: + base = base.encode("utf-8") + + if type(filt) == unicode: + filt = filt.encode("utf-8") + results = [] while True: # issue the ldap search command (async) @@ -529,8 +535,8 @@ class LDAPUserConnector(UserConnector): result = [] try: - for dn, obj in self.ldap_paged_async_search(make_utf8(base), - self.ldap_get_scope(scope), make_utf8(filt), columns): + for dn, obj in self.ldap_paged_async_search(base, + self.ldap_get_scope(scope), filt, columns): if dn is None: continue # skip unwanted answers new_obj = {}

6 years, 4 months

Moved byte value rendering functions to more specific places

by Lars Michelsen

Module: check_mk Branch: master Commit: 367777ee9f5847cb9cf6e21838e423fb13eb0b77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=367777ee9f5847… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 16:33:09 2018 +0100 Moved byte value rendering functions to more specific places Change-Id: I3c4efa541b197a084750bc74d2e83f9774783603 --- web/htdocs/lib.py | 90 -------------------------------------- web/plugins/metrics/check_mk.py | 83 +++++++++++++++++++++++++++++++++-- web/plugins/perfometer/check_mk.py | 4 +- web/plugins/views/inventory.py | 4 +- web/plugins/wato/mkeventd.py | 4 +- 5 files changed, 88 insertions(+), 97 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index ac82440..5f4562d 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -464,93 +464,3 @@ def date_range_human_readable(start_time, end_time): def date_month_human_readable(timestamp): # TODO: %B will currently not be localized return time.strftime(_("%B %Y"), time.localtime(timestamp)) - - -def calculate_scaled_number(v, base=1024.0, precision=1): - base = float(base) - - if v >= base ** 4: - symbol = "T" - scale = base ** 4 - - elif v >= base ** 3: - symbol = "G" - scale = base ** 3 - - elif v >= base ** 2: - symbol = "M" - scale = base ** 2 - - elif v >= base: - symbol = "k" - scale = base - - else: - symbol = "" - scale = 1 - - return symbol, precision, scale - - -def calculate_scaled_bytes(v, base=1024.0, bytefrac=True): - digits = 2 - if not bytefrac: - digits = 0 - - return calculate_scaled_number(v, base, precision=digits) - - -def bytes_human_readable(b, *args, **kwargs): - if b < 0: - return "-" + bytes_human_readable(-b, *args, **kwargs) - - if "unit" in kwargs: - unit = kwargs.pop("unit") - else: - unit = "B" - - scale_symbol, places_after_comma, scale_factor = calculate_scaled_bytes(b, *args, **kwargs) - - scaled_value = float(b) / scale_factor - if scale_symbol == "" and unit == "B": - return u"%.0f %s%s" % (scaled_value, scale_symbol, unit) - else: - return (u"%%.%df %%s%%s" % places_after_comma) % (scaled_value, scale_symbol, unit) - - -def bytes_human_readable_list(values, *args, **kwargs): - if not values: - reference = 0 - else: - reference = min([ abs(v) for v in values ]) - - if "unit" in kwargs: - unit = kwargs.pop("unit") - else: - unit = "B" - - scale_symbol, places_after_comma, scale_factor = calculate_scaled_bytes(reference, *args, **kwargs) - - units = [] - scaled_values = [] - for value in values: - scaled_value = float(value) / scale_factor - scaled_values.append(("%%.%df" % places_after_comma) % scaled_value) - - return "%s%s" % (scale_symbol, unit), scaled_values - - -def metric_number_with_precision(v, *args, **kwargs): - if v < 0: - return "-" + metric_number_with_precision(-v, *args, **kwargs) - - subargs = { - "base": 1000.0, - "precision": kwargs.get("precision", 2), - } - scale_symbol, places_after_comma, scale_factor = calculate_scaled_number(v, *args, **subargs) - scaled_value = float(v) / scale_factor - text = ((u"%%.%df %%s" % places_after_comma) % (scaled_value, scale_symbol)).rstrip() - if kwargs.get("drop_zeroes"): - text = text.rstrip("0").rstrip(".") - return text diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index a305404..2725392 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import cmk.render + # TODO Graphingsystem: # - Default-Template: Wenn im Graph kein "range" angegeben ist, aber # in der Unit eine "range"-Angabe ist, dann soll diese genommen werden. @@ -68,6 +70,50 @@ unit_info[""] = { "render" : lambda v: render_scientific(v, 2), } + +# TODO: Check whether or not we can use functions from cmk.render or move it there +def calculate_scaled_number(v, base=1024.0, precision=1): + base = float(base) + + if v >= base ** 4: + symbol = "T" + scale = base ** 4 + + elif v >= base ** 3: + symbol = "G" + scale = base ** 3 + + elif v >= base ** 2: + symbol = "M" + scale = base ** 2 + + elif v >= base: + symbol = "k" + scale = base + + else: + symbol = "" + scale = 1 + + return symbol, precision, scale + + +def metric_number_with_precision(v, *args, **kwargs): + if v < 0: + return "-" + metric_number_with_precision(-v, *args, **kwargs) + + subargs = { + "base": 1000.0, + "precision": kwargs.get("precision", 2), + } + scale_symbol, places_after_comma, scale_factor = calculate_scaled_number(v, *args, **subargs) + scaled_value = float(v) / scale_factor + text = ((u"%%.%df %%s" % places_after_comma) % (scaled_value, scale_symbol)).rstrip() + if kwargs.get("drop_zeroes"): + text = text.rstrip("0").rstrip(".") + return text + + unit_info["count"] = { "title" : _("Count"), "symbol" : "", @@ -109,14 +155,14 @@ unit_info["hz"] = { unit_info["bytes"] = { "title" : _("Bytes"), "symbol" : _("B"), - "render" : bytes_human_readable, + "render" : cmk.render.bytes, "stepping" : "binary", # for vertical graph labels } unit_info["bytes/s"] = { "title" : _("Bytes per second"), "symbol" : _("B/s"), - "render" : lambda v: bytes_human_readable(v) + _("/s"), + "render" : lambda v: cmk.render.bytes(v) + _("/s"), "stepping" : "binary", # for vertical graph labels } @@ -127,11 +173,42 @@ unit_info["bits/s"] = { "graph_unit" : lambda v: physical_precision_list(v, 3, _("bit/s")), } +# TODO: Check whether or not we can use functions from cmk.render or move it there +def calculate_scaled_bytes(v, base=1024.0, bytefrac=True): + digits = 2 + if not bytefrac: + digits = 0 + + return calculate_scaled_number(v, base, precision=digits) + + +def bytes_human_readable_list(values, *args, **kwargs): + if not values: + reference = 0 + else: + reference = min([ abs(v) for v in values ]) + + if "unit" in kwargs: + unit = kwargs.pop("unit") + else: + unit = "B" + + scale_symbol, places_after_comma, scale_factor = calculate_scaled_bytes(reference, *args, **kwargs) + + units = [] + scaled_values = [] + for value in values: + scaled_value = float(value) / scale_factor + scaled_values.append(("%%.%df" % places_after_comma) % scaled_value) + + return "%s%s" % (scale_symbol, unit), scaled_values + + # Output in bytes/days, value is in bytes/s unit_info["bytes/d"] = { "title" : _("Bytes per day"), "symbol" : _("B/d"), - "render" : lambda v: bytes_human_readable(v * 86400.0, unit="B/d"), + "render" : lambda v: cmk.render.bytes(v * 86400.0) + "/d", "graph_unit" : lambda values: bytes_human_readable_list( [ v * 86400.0 for v in values ], unit=_("B/d")), "stepping" : "binary", # for vertical graph labels diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 21793ad..b89a44f 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import cmk.render + # Perf-O-Meters for Check_MK's checks # # They are called with: @@ -1055,7 +1057,7 @@ def perfometer_veeam_client(row, check_command, perf_data): duration_secs = int(graph[1]) h = perfometer_logarithmic_dual_independent(avgspeed_bytes, '#54b948', 10000000, 2, duration_secs, '#2098cb', 500, 2) - avgspeed = bytes_human_readable(avgspeed_bytes) + avgspeed = cmk.render.bytes(avgspeed_bytes) # Return Value always as minutes duration = age_human_readable(duration_secs, True) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 5c1b5ef..c41e13f 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -28,7 +28,7 @@ import inventory from cmk.regex import regex import cmk.defines as defines - +import cmk.render def paint_host_inventory_tree(row, invpath=".", column="host_inventory"): struct_tree = row.get(column) @@ -220,7 +220,7 @@ def inv_paint_bytes(b): @decorate_inv_paint def inv_paint_size(b): - return "number", bytes_human_readable(b) + return "number", cmk.render.bytes(b) @decorate_inv_paint diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 96da24e..ca1a949 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -31,6 +31,8 @@ import cStringIO import cmk.paths import cmk.ec.export as ec import cmk.ec.defaults +import cmk.store as store +import cmk.render mkeventd_enabled = config.mkeventd_enabled @@ -2164,7 +2166,7 @@ def show_mib_table(path, title): table.cell(_("Filename"), filename) table.cell(_("MIB"), mib.get("name", "")) table.cell(_("Organization"), mib.get("organization", "")) - table.cell(_("Size"), bytes_human_readable(mib.get("size", 0)), css="number") + table.cell(_("Size"), cmk.render.bytes(mib.get("size", 0)), css="number") table.end()

6 years, 4 months

5998 FIX check_mk_agent.aix: Fixed parameter substitution for environment variables MK_LIBDIR, MK_CONFDIR and MK_VARDIR

by Simon Betz

Module: check_mk Branch: master Commit: f8c2d838d26a87e2c0549db20eb256cfbc48a476 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8c2d838d26a87… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 7 18:38:41 2018 +0200 5998 FIX check_mk_agent.aix: Fixed parameter substitution for environment variables MK_LIBDIR,MK_CONFDIR and MK_VARDIR Change-Id: I00493dfaa97bb23e446feea85fdfb67c5adceb2b --- .werks/5998 | 10 ++++++++++ agents/check_mk_agent.aix | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/5998 b/.werks/5998 new file mode 100644 index 0000000..3a26753 --- /dev/null +++ b/.werks/5998 @@ -0,0 +1,10 @@ +Title: check_mk_agent.aix: Fixed parameter substitution for environment variables MK_LIBDIR,MK_CONFDIR and MK_VARDIR +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525711070 +Class: fix + + diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 49959cb..9ca376e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -34,9 +34,9 @@ fi export LC_ALL=C unset LANG -export MK_LIBDIR=${MK_LIBDIR-/usr/check_mk/lib} -export MK_CONFDIR=${MK_CONFDIR-/usr/check_mk/conf} -export MK_VARDIR=${MK_VARDIR-/tmp/check_mk} +export MK_LIBDIR=${MK_LIBDIR:-/usr/check_mk/lib} +export MK_CONFDIR=${MK_CONFDIR:-/usr/check_mk/conf} +export MK_VARDIR=${MK_VARDIR:-/tmp/check_mk} # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own

6 years, 4 months

IWYU mapping tweaks.

by Sven Panne

Module: check_mk Branch: master Commit: 086eeb774f720c9d50b4d9ae7c60e68d15623500 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=086eeb774f720c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 7 15:56:27 2018 +0200 IWYU mapping tweaks. Change-Id: I02793d99c6b9e1d6c9b1f8aac74ada2765d12e98 --- livestatus/iwyu-mappings/check_mk.imp | 1 + livestatus/iwyu-mappings/gcc.stl.headers.imp | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/livestatus/iwyu-mappings/check_mk.imp b/livestatus/iwyu-mappings/check_mk.imp index a906dd3..3291f6d 100644 --- a/livestatus/iwyu-mappings/check_mk.imp +++ b/livestatus/iwyu-mappings/check_mk.imp @@ -18,6 +18,7 @@ { include: ["<bits/types/struct_tm.h>", private, "<time.h>", public ] }, { include: ["<bits/types/time_t.h>", private, "<time.h>", public ] }, { include: ["<experimental/bits/fs_ops.h>", private, "<experimental/filesystem>", public ] }, + { include: ["<experimental/fs_ops.h>", private, "<experimental/filesystem>", public ] }, { include: ["<linux/if_ether.h>", private, "<netinet/if_ether.h>", public ] }, { include: ["<pcap/bpf.h>", private, "<pcap.h>", public ] }, { include: ["<pcap/dlt.h>", private, "<pcap.h>", public ] }, diff --git a/livestatus/iwyu-mappings/gcc.stl.headers.imp b/livestatus/iwyu-mappings/gcc.stl.headers.imp index 625e448..b53e041 100644 --- a/livestatus/iwyu-mappings/gcc.stl.headers.imp +++ b/livestatus/iwyu-mappings/gcc.stl.headers.imp @@ -114,9 +114,7 @@ { include: ["<tr1_impl/unordered_set>", private, "<unordered_set>", public ] }, { include: ["<tr1_impl/utility>", private, "<tr1/utility>", public ] }, { include: ["<tr1_impl/utility>", private, "<utility>", public ] }, - # This didn't come from the grep, but seems to be where swap() - # is defined? - { include: ["<bits/move.h>", private, "<algorithm>", public ] }, # for swap<>() + { include: ["<bits/move.h>", private, "<utility>", public ] }, # Hash and hashtable-based containers. { include: ["<tr1_impl/functional_hash.h>", private, "<tr1/functional>", public ] }, { include: ["<tr1_impl/functional_hash.h>", private, "<tr1/unordered_map>", public ] },

6 years, 4 months

Use clang 6.0.

by Sven Panne

Module: check_mk Branch: master Commit: 5d7495af3a1327faf23e8b99382c2320a3892e56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d7495af3a1327… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon May 7 13:38:31 2018 +0200 Use clang 6.0. Change-Id: I230cd4d19107e61cded6516f0a9bef5935378747 --- Makefile | 2 +- livestatus/src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 84cb29b..a2c62dd 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ TAROPTS := --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=*.swp --exclude=.f12 # We could add clang's -Wshorten-64-to-32 and g++'c/clang's -Wsign-conversion here. CXX_FLAGS := -g -O3 -Wall -Wextra -CLANG_VERSION := 5.0 +CLANG_VERSION := 6.0 CLANG_FORMAT := clang-format-$(CLANG_VERSION) CLANG_TIDY := clang-tidy-$(CLANG_VERSION) export RUN_CLANG_TIDY := run-clang-tidy-$(CLANG_VERSION).py diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 3669467..445de40 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -22,7 +22,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -CLANG_VERSION ?= 5.0 +CLANG_VERSION ?= 6.0 BEAR ?= bear CPPCHECK ?= cppcheck

6 years, 4 months

iptables: compute config hash with hashlib

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3e8f4d1041b14baf5b253adf9c96b3314465a755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e8f4d1041b14b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon May 7 15:15:38 2018 +0200 iptables: compute config hash with hashlib Change-Id: Ia70831e957732e405d7013fc681e4fcf0e13d7d9 --- checks/iptables | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/checks/iptables b/checks/iptables index b99f72a..a0be9e4 100644 --- a/checks/iptables +++ b/checks/iptables @@ -55,6 +55,10 @@ #-A RH-Firewall-1-INPUT -j REJECT --reject-with icmp-host-prohibited #COMMIT +def iptables_hash(config): + import hashlib + return hashlib.sha256(config).hexdigest() + def parse_iptables(info): config_lines = [" ".join(sublist) for sublist in info] @@ -63,7 +67,7 @@ def parse_iptables(info): def inventory_iptables(parsed): - return [(None, {"config_hash": hash(parsed)})] + return [(None, {"config_hash": iptables_hash(parsed)})] def check_iptables(_no_item, params, parsed): @@ -71,11 +75,11 @@ def check_iptables(_no_item, params, parsed): if not item_state: set_item_state("iptables.config", - {"config": parsed, "hash": hash(parsed)}) + {"config": parsed, "hash": iptables_hash(parsed)}) return 0, "saved initial configuration" initial_config_hash = params["config_hash"] - new_config_hash = hash(parsed) + new_config_hash = iptables_hash(parsed) if initial_config_hash == new_config_hash: if initial_config_hash != item_state.get("hash"):

6 years, 4 months

5804 FIX BI aggregations: increased render performance

by Andreas Boesl

Module: check_mk Branch: master Commit: 0afeed9eb46a2e310454e9dc554eb8b35d6881e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0afeed9eb46a2e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 7 14:10:35 2018 +0200 5804 FIX BI aggregations: increased render performance The livestatus data required for rendering the BI tree is no longer fetched consecutive from one site after another. The new mechanism queries all sites in parallel, hereby increasing the livestatus query performance. Change-Id: I022516125d28d58da93c7d47648c2e8d5db67fa3 --- .werks/5804 | 12 ++++++++++++ web/htdocs/bi.py | 50 ++++++++++++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/.werks/5804 b/.werks/5804 new file mode 100644 index 0000000..a2a51cd --- /dev/null +++ b/.werks/5804 @@ -0,0 +1,12 @@ +Title: BI aggregations: increased render performance +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525694777 + +The livestatus data required for rendering the BI tree is no longer fetched consecutive from one site after another. +The new mechanism queries all sites in parallel, hereby increasing the livestatus query performance. diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index ca5cfb8..9c93275 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2483,33 +2483,31 @@ def execute_rule_node(node, status_info, aggregation_options): # a known lists of lists (list of site/host pairs) def get_status_info(required_hosts): # Query each site only for hosts that that site provides - site_hosts = {} + req_hosts = set() + req_sites = set() + for site, host in required_hosts: - hosts = site_hosts.get(site) - if hosts == None: - site_hosts[site] = [host] - else: - hosts.append(host) - - tuples = [] - for site, hosts in site_hosts.iteritems(): - filter = "" - for host in hosts: - filter += "Filter: name = %s\n" % host - if len(hosts) > 1: - filter += "Or: %d\n" % len(hosts) - sites.live().set_auth_domain('bi') - sites.live().set_only_sites([site]) - data = sites.live().query( - "GET hosts\n" - "Columns: name state hard_state plugin_output scheduled_downtime_depth " - "acknowledged in_service_period services_with_fullstate\n" - + filter) - sites.live().set_auth_domain('read') - sites.live().set_only_sites(None) - tuples += [((site, e[0]), e[1:]) for e in data] - - return dict(tuples) + req_hosts.add(host) + req_sites.add(site) + + host_filter = "" + for host in req_hosts: + host_filter += "Filter: name = %s\n" % host + if len(req_hosts) > 1: + host_filter += "Or: %d\n" % len(req_hosts) + sites.live().set_auth_domain('bi') + sites.live().set_only_sites(list(req_sites)) + sites.live().set_prepend_site(True) + data = sites.live().query( + "GET hosts\n" + "Columns: name state hard_state plugin_output scheduled_downtime_depth " + "acknowledged in_service_period services_with_fullstate\n" + + host_filter) + sites.live().set_auth_domain('read') + sites.live().set_only_sites(None) + sites.live().set_prepend_site(False) + return dict([((e[0], e[1]), e[2:]) for e in data]) + # This variant of the function is configured not with a list of # hosts but with a livestatus filter header and a list of columns

6 years, 4 months

5993 FIX Fixed execution of management board checks

by Simon Betz

Module: check_mk Branch: master Commit: 0a146f9d268ac01fe01a860a5c37cb67bb749bc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a146f9d268ac0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 26 15:48:59 2018 +0200 5993 FIX Fixed execution of management board checks This concerns hosts which have configured a management board. During checking the wrong data source was used and therefore the wrong data was checked. Fixed that! Change-Id: If124e1dc01019c3b754d8e0b121a38069028c0f1 --- .werks/5993 | 12 ++++++++++++ cmk_base/checks.py | 11 ++++++++++- cmk_base/data_sources/abstract.py | 15 ++++++++++++++- cmk_base/discovery.py | 3 ++- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/.werks/5993 b/.werks/5993 new file mode 100644 index 0000000..0948caa --- /dev/null +++ b/.werks/5993 @@ -0,0 +1,12 @@ +Title: Fixed execution of management board checks +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524749776 +Class: fix + +This concerns hosts which have configured a management board. +During checking the wrong data source was used and therefore +the wrong data was checked. Fixed that! diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 4750b0e..38bedb3 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -765,7 +765,8 @@ def do_status_data_inventory_for(hostname): return False -def filter_by_management_board(hostname, found_check_plugin_names, for_mgmt_board): +def filter_by_management_board(hostname, found_check_plugin_names, + for_mgmt_board, for_discovery=False): # #1 SNMP host with MGMT board # MGMT board: # SNMP management board precedence: mgmt_prec_check @@ -819,6 +820,14 @@ def filter_by_management_board(hostname, found_check_plugin_names, for_mgmt_boar if for_mgmt_board: final_collection.update(mgmt_precedence) final_collection.update(mgmt_only) + if not for_discovery and not config.is_snmp_host(hostname): + # Compatibility: in CMK version 1.4.0 if a TCP host has configured + # a SNMP management board then SNMP checks (non-"SNMP management board"-checks) + # were discovered. During checking we do not change that behaviour. + # Then an upgrade to >=1.5.0 is done. + # After a rediscovery the non-"SNMP management board"-checks are vanished and + # "SNMP management board"-checks are discovered. + final_collection.update(host_precedence) else: final_collection.update(host_precedence) if not has_mgmt_board: diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index c1f39cb..9959eb0 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -314,11 +314,24 @@ class DataSource(object): @abc.abstractmethod def _gather_check_plugin_names(self): + """ + Returns the list of check plugin names which are supported by + the device. + + Example: SNMP scan + """ raise NotImplementedError() def enforce_check_plugin_names(self, check_plugin_names): - self._enforced_check_plugin_names = check_plugin_names + """ + Returns a subset of beforehand gathered check plugin names which are + supported by the data source. + + Example: management board checks only for management board data sources + """ + self._enforced_check_plugin_names = checks.filter_by_management_board(self._hostname, + check_plugin_names, self._for_mgmt_board) @abc.abstractmethod diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index da640f3..ebc0e5a 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -804,7 +804,8 @@ def snmp_scan(access_data, on_error="ignore", for_inv=False, do_snmp_scan=True, if for_inv: filtered = found_check_plugin_names else: - filtered = checks.filter_by_management_board(hostname, found_check_plugin_names, for_mgmt_board) + filtered = checks.filter_by_management_board(hostname, found_check_plugin_names, + for_mgmt_board, for_discovery=True) _output_snmp_check_plugins("SNMP filtered check plugin names", filtered) snmp.write_single_oid_cache(access_data) return sorted(filtered)

6 years, 4 months

Fix missing display hints for non list "*" placeholder

by Lars Michelsen

Module: check_mk Branch: master Commit: 23f60f6d2a660d73bf1f2cc12343ef2f5d17ccf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23f60f6d2a660d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 2 07:45:22 2018 +0200 Fix missing display hints for non list "*" placeholder * Add display hints for ".level1.*.level3." paths Display hints for paths like "software.applications.docker.container.networks.*." were not working at all. Added a simple implementation that was one of such "*" placeholders in a path. * "%s" placeholders have been added to display hint titles Just like %d for *-matching on lists, the %s is now working for path part matching. * Cleaned up previous replaement of ":*." list item syntax a bit * Moved display hint matching to a central place. Change-Id: Idb3352c0461222e8cf292c1347977cfa65d14dad --- web/plugins/views/inventory.py | 130 ++++++++++++++++++++++++++++++----------- 1 file changed, 95 insertions(+), 35 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index b7dd386..3d00f97 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -79,7 +79,7 @@ def _paint_host_inventory_tree_value(struct_tree, parsed_path, tree_renderer, in tree_renderer.show_numeration(child, path=invpath) else: tree_renderer.show_attribute(child.get_child_data().get(attributes_key), - inv_display_hint(invpath)) + _inv_display_hint(invpath)) code = html.drain() return "invtree", code @@ -407,13 +407,71 @@ def inv_paint_timestamp_as_age_days(timestamp): # '----------------------------------------------------------------------' -# Convert .foo.bar:18.test to .foo.bar:*.test -def inv_display_hint(invpath): - r = regex(".[0-9]+") - invpath = r.sub(":*", invpath) - hint = inventory_displayhints.get(invpath, {}) +def _inv_display_hint(invpath): + """Generic access function to display hints + Don't use other methods to access the hints!""" + hint_id = _find_display_hint_id(invpath) + hint = inventory_displayhints.get(hint_id, {}) + return _convert_display_hint(hint) - # Convert paint type to paint function, for the convenciance of the called + +def _find_display_hint_id(invpath): + """Looks up the display hint for the given inventory path. + + It returns either the ID of the display hint matching the given invpath + or None in case no entry was found. + + In case no exact match is possible try to match display hints that use + some kind of *-syntax. There are two types of cases here: + + :* -> Entries in lists (* resolves to list index numbers) + .* -> Path entries (* resolves to a path element) + + The current logic has some limitations related to the ways stars can + be used. + """ + invpath = invpath.rstrip(".:") + + # Convert index of lists to *-syntax + # e.g. ".foo.bar:18.test" to ".foo.bar:*.test" + r = regex("([^\.]):[0-9]+") + invpath = r.sub("\\1:*", invpath) + + candidates = [ + invpath, + ] + + # Produce a list of invpath candidates with a "*" going from back to front. + # + # This algorithm only allows one ".*" in a invpath. It finds the match with + # the longest path prefix before the ".*". + # + # TODO: Implement a generic mechanism that allows as many stars as possible + invpath_parts = invpath.split(".") + star_index = len(invpath_parts) - 1 + while star_index >= 0: + parts = invpath_parts[:star_index] + ["*"] + invpath_parts[star_index+1:] + invpath_with_star = "%s" % ".".join(parts) + candidates.append(invpath_with_star) + star_index -= 1 + + for candidate in candidates: + # TODO: Better cleanup trailing ":" and "." from display hints at all. They are useless + # for finding the right entry. + if candidate in inventory_displayhints: + return candidate + + if candidate+"." in inventory_displayhints: + return candidate+"." + + if candidate+":" in inventory_displayhints: + return candidate+":" + + return None + + +def _convert_display_hint(hint): + """Convert paint type to paint function, for the convenciance of the called""" if "paint" in hint: paint_function_name = "inv_paint_" + hint["paint"] hint["paint_function"] = globals()[paint_function_name] @@ -422,7 +480,7 @@ def inv_display_hint(invpath): def inv_titleinfo(invpath, node): - hint = inv_display_hint(invpath) + hint = _inv_display_hint(invpath) icon = hint.get("icon") if "title" in hint: title = hint["title"] @@ -1486,32 +1544,15 @@ class NodeRenderer(object): for _, node in container.get_edge_nodes(): node_abs_path = node.get_absolute_path() - #FIXME clean this up - _titleinfo = [] - for part in node_abs_path: - try: - part = int(part) - except ValueError: - pass - else: - last = _titleinfo.pop(-1) - part = "%s:%d" % (last, part) - finally: - _titleinfo.append(part) - - titleinfo_path = ".%s." % ".".join(_titleinfo) - icon, title = inv_titleinfo(titleinfo_path, node) + raw_invpath = self._get_raw_path(".".join(map(str, node_abs_path))) + invpath = ".%s." % raw_invpath - if "%d" in title: # Replace with list index - list_index = int(titleinfo_path.split(":")[-1].rstrip(".")) + 1 - title = title % list_index + icon, title = inv_titleinfo(invpath, node) - # Some displayhints may end with ":", eg. ".software.packages:" - if "%s:" % titleinfo_path[:-1] in inventory_displayhints: - icon, title = inv_titleinfo("%s:" % titleinfo_path[:-1], node) + # Replace placeholders in title with the real values for this path + if "%d" in title or "%s" in title: + title = self._replace_placeholders(title, invpath) - raw_invpath = self._get_raw_path(".".join(map(str, node_abs_path))) - invpath = ".%s." % raw_invpath header = self._get_header(title, ".".join(map(str, node_abs_path)), "#666") fetch_url = html.makeuri_contextless([("host", self._hostname), ("path", invpath), @@ -1526,13 +1567,32 @@ class NodeRenderer(object): child.show(self, path=raw_invpath) html.end_foldable_container() + + def _replace_placeholders(self, raw_title, invpath): + hint_id = _find_display_hint_id(invpath) + invpath_parts = invpath.strip(".").split(".") + + # Use the position of the stars in the path to build a list of texts + # that should be used for replacing the tile placeholders + replace_vars = [] + hint_parts = hint_id.strip(".").split(".") + for index, hint_part in enumerate(hint_parts): + if hint_part == "*": + replace_vars.append(invpath_parts[index]) + + # Now replace the variables in the title. Handle the case where we have + # more stars than macros in the title. + num_macros = raw_title.count("%d") + raw_title.count("%s") + return raw_title % tuple(replace_vars[:num_macros]) + + # ---numeration----------------------------------------------------------- def show_numeration(self, numeration, path=None): #FIXME these kind of paths are required for hints. # Clean this up one day. invpath = ".%s:" % self._get_raw_path(path) - hint = inv_display_hint(invpath) + hint = _inv_display_hint(invpath) keyorder = hint.get("keyorder", []) # well known keys data = numeration.get_child_data() @@ -1541,7 +1601,7 @@ class NodeRenderer(object): for key in keyorder: sub_invpath = "%s0.%s" % (invpath, key) icon, title = inv_titleinfo(sub_invpath, None) - sub_hint = inv_display_hint(sub_invpath) + sub_hint = _inv_display_hint(sub_invpath) short_title = sub_hint.get("short", title) titles.append((short_title, key)) @@ -1588,7 +1648,7 @@ class NodeRenderer(object): for title, key in titles: value = entry.get(key) sub_invpath = "%s%d.%s" % (invpath, index, key) - hint = inv_display_hint(sub_invpath) + hint = _inv_display_hint(sub_invpath) if "paint_function" in hint: #FIXME At the moment we need it to get tdclass # Clean this up one day. @@ -1616,7 +1676,7 @@ class NodeRenderer(object): for key, value in attributes.get_child_data().iteritems(): sub_invpath = "%s.%s" % (invpath, key) icon, title = inv_titleinfo(sub_invpath, key) - hint = inv_display_hint(sub_invpath) + hint = _inv_display_hint(sub_invpath) html.open_tr() html.open_th(title=sub_invpath)

6 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018