Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

5808 FIX Quicksearch: Searching for groups did not always return full results

by Andreas Boesl

Module: check_mk Branch: master Commit: dfc928abb2de3af153964d756157be8646c9c2f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfc928abb2de3a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 9 10:24:55 2018 +0200 5808 FIX Quicksearch: Searching for groups did not always return full results Choosing a specific value from the dropdown menu in the quicksearch snapin, also applied a site filter for the chosen group. The group results were hereby incorrectly restricted to a specific site. Change-Id: Ie07f0429e70f190c14989a581b1ffa681e1df84b --- .werks/5808 | 12 ++++++++++++ web/htdocs/sidebar.py | 11 +++++++++-- web/plugins/sidebar/search.py | 12 +++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.werks/5808 b/.werks/5808 new file mode 100644 index 0000000..6f2f89d --- /dev/null +++ b/.werks/5808 @@ -0,0 +1,12 @@ +Title: Quicksearch: Searching for groups did not always return full results +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525853954 + +Choosing a specific value from the dropdown menu in the quicksearch snapin, also applied +a site filter for the chosen group. The group results were hereby incorrectly restricted to a specific site. diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 0e5b85d..c72306e 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -890,9 +890,13 @@ class LivestatusSearchConductor(LivestatusSearchBase): for row in self._rows: entry = {"text_tokens": []} url_params = [] + skip_site = False for filter_shortname in self._used_filters: plugin = self._get_plugin_with_shortname(filter_shortname) + if plugin.is_group_match(): + skip_site = True + match_info = plugin.get_matches(target_view, row, self._livestatus_table, self._used_filters) if not match_info: continue @@ -900,8 +904,11 @@ class LivestatusSearchConductor(LivestatusSearchBase): url_params.extend(url_filters) entry["text_tokens"].append((plugin.get_filter_shortname(), text)) - entry["url"] = self._build_url([("view_name", target_view), - ("site", row.get("site"))] + url_params, restore_regex = True) + url_tokens = [("view_name", target_view)] + url_params + if not skip_site: + url_tokens.append(("site", row.get("site"))) + entry["url"] = self._build_url(url_tokens, restore_regex = True) + entry["raw_data"] = row self._elements.append(entry) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 3e2dcb71..0f29935 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -191,6 +191,10 @@ class QuicksearchMatchPlugin(object): raise NotImplementedError() + def is_group_match(self): + return False + + def _matches_regex(self, pattern, value): return re.match(pattern, value) @@ -212,6 +216,10 @@ class GroupMatchPlugin(QuicksearchMatchPlugin): self._group_type = group_type + def is_group_match(self): + return True + + def get_match_topic(self): if self._group_type == "host": return _("Hostgroup") @@ -400,7 +408,9 @@ class HosttagMatchPlugin(QuicksearchMatchPlugin): def _get_hosttag_dict(self): lookup_dict = {} - for group, text, values in config.host_tag_groups(): + for entry in config.host_tag_groups(): + group, text, values = entry[:3] + for value in values: lookup_dict[value[0]] = group return lookup_dict

6 years, 4 months

Nuked MongoDB global variable.

by Sven Panne

Module: check_mk Branch: master Commit: 1a6d4748bb9b1de9eb13f094c4614e8e419aa665 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a6d4748bb9b1d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 9 09:37:35 2018 +0200 Nuked MongoDB global variable. Change-Id: I9edd33550d606882d5032c37eaf46953ed630255 --- cmk/ec/main.py | 182 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 92 insertions(+), 90 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1a6d4748bb…

6 years, 4 months

6070 FIX oracle_locks: Fixed missing include which caused the NameError ' oracle_handle_ora_errors' is not defined

by Simon Betz

Module: check_mk Branch: master Commit: b35ac9856f3b32d469c0fbe068a598f19aaa6eb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b35ac9856f3b32… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 10:04:30 2018 +0200 6070 FIX oracle_locks: Fixed missing include which caused the NameError 'oracle_handle_ora_errors' is not defined Change-Id: I609f67bb1022f5d45948244ee7aa8815714fb8dc --- .werks/6070 | 10 ++++++++++ checks/oracle_locks | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/6070 b/.werks/6070 new file mode 100644 index 0000000..584996d --- /dev/null +++ b/.werks/6070 @@ -0,0 +1,10 @@ +Title: oracle_locks: Fixed missing include which caused the NameError 'oracle_handle_ora_errors' is not defined +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525853018 +Class: fix + + diff --git a/checks/oracle_locks b/checks/oracle_locks index 4463187..cd177a5 100644 --- a/checks/oracle_locks +++ b/checks/oracle_locks @@ -108,4 +108,5 @@ check_info["oracle_locks"] = { 'service_description': 'ORA %s Locks', "default_levels_variable" : "oracle_locks_defaults", 'group': 'oracle_locks', + 'includes': ['oracle.include'], }

6 years, 4 months

6069 FIX netextreme_fan: Fixed crash if no speed information is sent from device

by Simon Betz

Module: check_mk Branch: master Commit: 830be0bb922e635a8ef656e6cd7ea2440e7d87bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=830be0bb922e63… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 09:59:36 2018 +0200 6069 FIX netextreme_fan: Fixed crash if no speed information is sent from device Change-Id: I40bf48b130a0d0e732a3468485b65a028aec03f6 --- .werks/6069 | 10 ++++++++++ checks/netextreme_fan | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6069 b/.werks/6069 new file mode 100644 index 0000000..1620235 --- /dev/null +++ b/.werks/6069 @@ -0,0 +1,10 @@ +Title: netextreme_fan: Fixed crash if no speed information is sent from device +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525852737 +Class: fix + + diff --git a/checks/netextreme_fan b/checks/netextreme_fan index e1c9a9a..74ea63f 100644 --- a/checks/netextreme_fan +++ b/checks/netextreme_fan @@ -45,7 +45,8 @@ def check_netextreme_fan(item, params, info): if fan_nr == item: state, state_readable = map_fan_status[fan_status] yield state, "Operational status: %s" % state_readable - yield check_fan(int(fan_speed_str), params) + if fan_speed_str: + yield check_fan(int(fan_speed_str), params) check_info['netextreme_fan'] = {

6 years, 4 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: cec5754549397446145a4c8b0ca54b6ae1effbbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cec57545493974… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 09:58:38 2018 +0200 Reserved 20 Werk IDS Change-Id: I6dfb1eef63abf12bc05642dd733bc248a8ac4337 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3ce8b89..385e1b5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6069 +6089

6 years, 4 months

Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 6df1a22689b47a356e9fe83b04e77bba286e91e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df1a22689b47a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 9 09:47:21 2018 +0200 Removed debug output Change-Id: I2e9a71bd1ae5e03bca20bf87f61fba823a5588ff --- cmk_base/core_config.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 2e9621c..41ef541 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -465,8 +465,6 @@ def get_cluster_attributes(hostname, nodes): for suffix, val in [ ("", node_ips), ("_4", node_ips_4), ("_6", node_ips_6) ]: attrs["_NODEIPS%s" % suffix] = " ".join(val) - print attrs - return attrs

6 years, 4 months

6060 FIX Clusters: Add missing custom variable containing the node names

by Lars Michelsen

Module: check_mk Branch: master Commit: e0629fe6b6308516cf223585a4c63c181c3d74e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0629fe6b63085… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 9 09:42:23 2018 +0200 6060 FIX Clusters: Add missing custom variable containing the node names In addition to the existing custom attributes _NODEIPS, _NODEIPS_4 and _NODEIPS_6 this change adds a new variable _NODENAMES. All the entries in this variables are now sorted by the node name. This means that e.g. the 2nd entry in all of the above variables belongs to the same node. Change-Id: Ie8d4ffeadd50397666fe6eca6327bf0a54c265d1 --- .werks/6060 | 14 ++++++++++++++ cmk_base/core_config.py | 12 +++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/6060 b/.werks/6060 new file mode 100644 index 0000000..07f0f0f --- /dev/null +++ b/.werks/6060 @@ -0,0 +1,14 @@ +Title: Clusters: Add missing custom variable containing the node names +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525851596 + +In addition to the existing custom attributes _NODEIPS, _NODEIPS_4 and +_NODEIPS_6 this change adds a new variable _NODENAMES. All the entries +in this variables are now sorted by the node name. This means that e.g. +the 2nd entry in all of the above variables belongs to the same node. diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index ce7ec8e..2e9621c 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -434,10 +434,14 @@ def _extra_host_attributes(hostname): def get_cluster_attributes(hostname, nodes): - attrs = {} + sorted_nodes = sorted(nodes) + + attrs = { + "_NODENAMES": " ".join(sorted_nodes), + } node_ips_4 = [] if config.is_ipv4_host(hostname): - for h in nodes: + for h in sorted_nodes: addr = ip_address_of(h, 4) if addr != None: node_ips_4.append(addr) @@ -446,7 +450,7 @@ def get_cluster_attributes(hostname, nodes): node_ips_6 = [] if config.is_ipv6_host(hostname): - for h in nodes: + for h in sorted_nodes: addr = ip_address_of(h, 6) if addr != None: node_ips_6.append(addr) @@ -461,6 +465,8 @@ def get_cluster_attributes(hostname, nodes): for suffix, val in [ ("", node_ips), ("_4", node_ips_4), ("_6", node_ips_6) ]: attrs["_NODEIPS%s" % suffix] = " ".join(val) + print attrs + return attrs

6 years, 4 months

Removed dead code

by Simon Betz

Module: check_mk Branch: master Commit: 7c8e2a87ee4027915f78e6673dc4984f5798ac36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c8e2a87ee4027… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 09:41:03 2018 +0200 Removed dead code Change-Id: I1d7340a1b1d2bd9f2e295593b64cca1027c76327 --- checks/storeonce_clusterinfo | 6 ------ checks/storeonce_servicesets | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/checks/storeonce_clusterinfo b/checks/storeonce_clusterinfo index 37a7e55..2393932 100644 --- a/checks/storeonce_clusterinfo +++ b/checks/storeonce_clusterinfo @@ -66,12 +66,6 @@ # | | # '----------------------------------------------------------------------' -#def parse_storeonce_clusterinfo(info): -# parsed = {} -# for line in info: -# parsed[line[0]] = line[1] -# return parsed - def inventory_storeonce_clusterinfo(parsed): if "Product Class" in parsed: diff --git a/checks/storeonce_servicesets b/checks/storeonce_servicesets index e1b0e48..d9e4d4f 100644 --- a/checks/storeonce_servicesets +++ b/checks/storeonce_servicesets @@ -61,6 +61,7 @@ def inventory_storeonce_servicesets(parsed): for key, values in parsed.iteritems(): yield ( values["ServiceSet ID"], {} ) + def check_storeonce_servicesets(item, params, parsed): for key, values in parsed.iteritems(): if not item == values["ServiceSet ID"]: @@ -96,6 +97,7 @@ def inventory_storeonce_servicesets_capacity(parsed): for key, values in parsed.iteritems(): yield ( values["ServiceSet ID"], {} ) + def check_storeonce_servicesets_capacity(item, params, parsed): for key, values in parsed.iteritems(): if not item == values["ServiceSet ID"]: @@ -110,7 +112,6 @@ def check_storeonce_servicesets_capacity(item, params, parsed): check_info['storeonce_servicesets.capacity'] = { - 'parse_function' : parse_storeonce_servicesets, 'inventory_function' : inventory_storeonce_servicesets_capacity, 'check_function' : check_storeonce_servicesets_capacity, 'service_description' : "ServiceSet %s Capacity",

6 years, 4 months

6059 FIX "All Services with this description" view: Shows services of all sites now

by Lars Michelsen

Module: check_mk Branch: master Commit: 247e7b0fd2aafcec11c42b996ddd2b7589cc98f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=247e7b0fd2aafc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 9 09:26:38 2018 +0200 6059 FIX "All Services with this description" view: Shows services of all sites now Change-Id: I6f1ee4da126f544ddd5fa82f16b1d4c50100b916 --- .werks/6059 | 11 +++++++++++ web/htdocs/views.py | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/.werks/6059 b/.werks/6059 new file mode 100644 index 0000000..fe67780 --- /dev/null +++ b/.werks/6059 @@ -0,0 +1,11 @@ +Title: "All Services with this description" view: Shows services of all sites now +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1525850760 + + diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d81970a..c57568e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2852,6 +2852,11 @@ def url_to_view(row, view_name): if filter_key in dict(url_vars): add_site_hint = False + # Hack for servicedesc view which is meant to show all services with the given + # description: Don't add the site filter for this view. + if view_name == "servicedesc": + add_site_hint = False + if add_site_hint and row.get('site'): url_vars.append(('site', row['site']))

6 years, 4 months

6008 FIX df.include: Fixed possibly missing parameter 'Show reserved space '

by Simon Betz

Module: check_mk Branch: master Commit: e13d544ea0b05ebd0ebc0eb9891ab8b88a80eaa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e13d544ea0b05e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 9 09:06:33 2018 +0200 6008 FIX df.include: Fixed possibly missing parameter 'Show reserved space' Change-Id: I606f31ab30780e5a0ca7fe58bbad23f3b7701129 --- .werks/6008 | 10 ++++++++++ checks/df.include | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6008 b/.werks/6008 new file mode 100644 index 0000000..e1f4dba --- /dev/null +++ b/.werks/6008 @@ -0,0 +1,10 @@ +Title: df.include: Fixed possibly missing parameter 'Show reserved space' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525849463 +Class: fix + + diff --git a/checks/df.include b/checks/df.include index 093b867..9cf5e02 100644 --- a/checks/df.include +++ b/checks/df.include @@ -356,7 +356,7 @@ def df_check_filesystem_single(mountpoint, size_mb, avail_mb, reserved_mb, inode (show_levels == "onmagic" and (status > 0 or levels.get("magic", 1.0) != 1.0)): infotext += ", " + levels["levels_text"] - if reserved_mb > 0 and params["show_reserved"]: + if reserved_mb > 0 and params.get("show_reserved"): reserved_perc = 100.0 * float(reserved_mb) / size_mb infotext += ", therein reserved for root: %.1f%% (%.2f MB)" % (reserved_perc, reserved_mb) perfdata.append(("reserved", reserved_mb))

6 years, 4 months

← Newer
1
...
25
26
27
28
29
30
31
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018