Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

6838 FIX skype.data_proxy, wmi_webservices: Fix failing inventory for missing items

by Moritz Kiemer

Module: check_mk Branch: master Commit: 944f44069226041aac4562156e6685682ca7e368 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=944f4406922604… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 9 07:57:04 2018 +0100 6838 FIX skype.data_proxy, wmi_webservices: Fix failing inventory for missing items No longer report fail in service discovery if no items are listed in wmi tables. Change-Id: Ie9b0486843de2b7d91d8e071c33b7f174f73ad97 --- .werks/6838 | 12 ++++++++++++ checks/skype | 2 +- checks/wmi_webservices | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/6838 b/.werks/6838 new file mode 100644 index 0000000..3c3982d --- /dev/null +++ b/.werks/6838 @@ -0,0 +1,12 @@ +Title: skype.data_proxy, wmi_webservices: Fix failing inventory for missing items +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541746494 + +No longer report fail in service discovery if no items are +listed in wmi tables. diff --git a/checks/skype b/checks/skype index 6bae956..ee8bd83 100644 --- a/checks/skype +++ b/checks/skype @@ -506,7 +506,7 @@ def check_skype_data_proxy(item, params, parsed): check_info['skype.data_proxy'] = { - 'inventory_function' : lambda parsed: inventory_wmi_table(parsed, required_tables=[ + 'inventory_function' : lambda parsed: inventory_wmi_table_instances(parsed, required_tables=[ "LS:DATAPROXY - Server Connections"]), 'check_function' : check_skype_data_proxy, 'has_perfdata' : True, diff --git a/checks/wmi_webservices b/checks/wmi_webservices index 16d986a..dbc51e5 100644 --- a/checks/wmi_webservices +++ b/checks/wmi_webservices @@ -32,7 +32,7 @@ def check_wmi_webservices(item, params, parsed): check_info['wmi_webservices'] = { - 'inventory_function' : inventory_wmi_table, + 'inventory_function' : inventory_wmi_table_instances, 'check_function' : check_wmi_webservices, 'parse_function' : parse_wmi_table, 'has_perfdata' : True,

5 years, 7 months

Second pass yapf with new setting on cmk/gui/plugins

by Óscar Nájera

Module: check_mk Branch: master Commit: 0a0a5e951f32a7fb2a99e44f81e26eb8dfbdb9f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a0a5e951f32a7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Nov 9 17:19:27 2018 +0100 Second pass yapf with new setting on cmk/gui/plugins CMK-1180 Change-Id: I8e467b78e23f4bef7c3a74247532d5e58517a0aa --- cmk/gui/plugins/metrics/check_mk.py | 393 ++++-------- cmk/gui/plugins/userdb/ldap_connector.py | 215 +++---- cmk/gui/plugins/wato/backup_domains.py | 30 +- cmk/gui/plugins/wato/bi.py | 101 ++- cmk/gui/plugins/wato/check_mk_configuration.py | 3 +- cmk/gui/plugins/wato/check_parameters.py | 136 ++-- cmk/gui/plugins/wato/utils/__init__.py | 840 +++++++++++++------------ cmk/gui/plugins/wato/utils/context_buttons.py | 37 +- cmk/gui/plugins/webapi/utils.py | 5 +- cmk/gui/plugins/webapi/webapi.py | 48 +- 10 files changed, 827 insertions(+), 981 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0a0a5e951f…

5 years, 7 months

wmi.include: Refactor inventory function

by Moritz Kiemer

Module: check_mk Branch: master Commit: 40f25d78072f1f1ca4a45746778d1d821d4606a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f25d78072f1f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Nov 8 14:17:48 2018 +0100 wmi.include: Refactor inventory function Split up 'inventory_wmi_table' function into two separate functions 'inventory_wmi_table_instance' (with strings as items) and 'inventory_wmi_table_total' (with None as only item). Change-Id: I8d963ccc56dc14c672800811c4923165a1fe0cf5 --- checks/wmi.include | 62 ++++++++++++++++++++++++++++++++++++++++++------------ checks/wmi_cpuload | 4 +--- 2 files changed, 49 insertions(+), 17 deletions(-) diff --git a/checks/wmi.include b/checks/wmi.include index 8162ee0..9b746de 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -251,13 +251,17 @@ def wmi_filter_global_only(tables, row): # | |___/ | # '----------------------------------------------------------------------' +def _required_tables_missing(tables, required_tables): + is_subset = set(required_tables).issubset(set(tables.keys())) + contains_null = any(isinstance(table, NullTable) for table in tables.itervalues()) + return not is_subset or contains_null -def inventory_wmi_table(tables, **kwargs): - required_tables = kwargs.get('required_tables', tables.keys()) - if (not set(required_tables) <= set(tables.keys()) or - any(isinstance(table, NullTable) for table in tables.itervalues())): - # if table is missing, nothing gets inventorized. This can - # only happen if required_tables was set + +def inventory_wmi_table_instances(tables, required_tables=None, filt=None, levels=None): + if required_tables is None: + required_tables = tables.keys() + + if _required_tables_missing(tables, required_tables): return [] potential_instances = set() @@ -269,16 +273,46 @@ def inventory_wmi_table(tables, **kwargs): else: potential_instances = set(table_rows) - # if there are multiple instances, don't include the summary line as it is redundant - if len(potential_instances) > 1: - potential_instances.discard(None) + # don't include the summary line + potential_instances.discard(None) + + return [(row, levels) for row in potential_instances if filt is None or filt(tables, row)] + + + +def inventory_wmi_table_total(tables, required_tables=None, filt=None, levels=None): + if required_tables is None: + required_tables = tables.keys() + + if not tables or _required_tables_missing(tables, required_tables): + return [] + + if filt is not None and not filt(tables, None): + return [] + + total_present = all(None in tables[required_table].row_labels() + for required_table in required_tables) + + if not total_present: + return [] + return [(None, levels)] + + +def inventory_wmi_table(tables, required_tables=None, filt=None, levels=None): + '''DO NOT USE + + Please use either inventory_wmi_table_instances or inventory_wmi_table_total + directly. This function sometimes returns strings and sometimes None as an item. + ''' + instances = inventory_wmi_table_instances(tables, required_tables, filt, levels) + if instances: + return instances - # apply row-filter if the caller provided one - filt = kwargs.get('filt', lambda tables, row: True) + total = inventory_wmi_table_total(tables, required_tables, filt, levels) + if total: + return total - return [(row, kwargs.get('levels', None)) - for row in potential_instances - if filt(tables, row)] + return [] #. diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index a4dc9ed..607ee4d 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -26,9 +26,7 @@ def inventory_wmi_cpuload(tables): - if ("computer_system" not in tables.keys() or - "system_perf" not in tables.keys() or - any(isinstance(table, NullTable) for table in tables.itervalues())): + if _required_tables_missing(tables, ["computer_system", "system_perf"]): return [] return [(None, None)]

5 years, 7 months

[CMK-1039] - perfreader into master

by Sergey Kipnis

Module: check_mk Branch: master Commit: a92281874c45f5657d7ab2f31f6665b66032b8b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a92281874c45f5… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Tue Nov 6 16:42:56 2018 +0100 [CMK-1039] - perfreader into master - PerfCounter.cc has optional possibility to find and run perf_reader.exe - check_mk_agent is supplied in "perfread" parameter to test functionality - service home folder is found from the service control routine - sln, vcxproj* files and test_workbench project are Windows only(ignore those files if you are not in Visual Studio 2017) - typo MSVC_BUILD fixed - ModuleControl.h added to find and run executables in windows environment - perf_reader.exe, .gitignore and readme.txt placed into doc/treasures/windows - readme.txt fixed, removed disabled test output 6862 FIX Fixed Handle Leak in Windows Agent To prevent handle leaks in Windows Agent for certain versions of Windows OS provided perf_reader.exe utility in ~/share/doc/check_mk/treasures/windows directory. Short description can be found ~/share/doc/check_mk/treasures/windows/readme.txt Change-Id: I14046e6dc9859d73a77d134f6eb20c3e8ffe9a19 --- .werks/6862 | 12 + agents/windows/Environment.h | 6 + agents/windows/ModuleControl.h | 261 ++++++++++ agents/windows/PerfCounter.cc | 102 +++- agents/windows/WinApiInterface.h | 6 +- agents/windows/check_mk_agent.cc | 75 ++- agents/windows/check_mk_agent.sln | 31 ++ agents/windows/check_mk_agent.vcxproj | 537 +++++++++++++++++++++ agents/windows/check_mk_agent.vcxproj.filters | 306 ++++++++++++ agents/windows/tools/_raii.h | 70 +++ agents/windows/utils/perf_reader/pch.cpp | Bin 0 -> 430 bytes agents/windows/utils/perf_reader/pch.h | Bin 0 -> 1582 bytes agents/windows/utils/perf_reader/perf_reader.cpp | Bin 0 -> 11940 bytes agents/windows/utils/perf_reader/perf_reader.sln | 31 ++ .../windows/utils/perf_reader/perf_reader.vcxproj | 187 +++++++ .../utils/perf_reader/perf_reader.vcxproj.filters | 33 ++ .../windows/utils/perf_reader/test_perf_reader.cmd | 14 + agents/windows/utils/readme.md | 1 + agents/windows/utils/test_workbench/pch.cpp | Bin 0 -> 430 bytes agents/windows/utils/test_workbench/pch.h | Bin 0 -> 1262 bytes agents/windows/utils/test_workbench/readme.md | 1 + .../utils/test_workbench/test_workbench.cpp | Bin 0 -> 6580 bytes .../utils/test_workbench/test_workbench.sln | 31 ++ .../utils/test_workbench/test_workbench.vcxproj | 199 ++++++++ .../test_workbench/test_workbench.vcxproj.filters | 36 ++ doc/treasures/windows/.gitignore | 1 + doc/treasures/windows/perf_reader.exe | Bin 0 -> 112128 bytes doc/treasures/windows/readme.txt | 13 + 28 files changed, 1930 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a92281874c…

5 years, 7 months

Fix typecheck idiom in cmk/gui/plugins/{sidebar, wato}

by Óscar Nájera

Module: check_mk Branch: master Commit: 22dc1584ff33051e2d0fbd2ff7f04c137cef6cc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22dc1584ff3305… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 16:38:09 2018 +0100 Fix typecheck idiom in cmk/gui/plugins/{sidebar,wato} CMK-837 Change-Id: Icb2c2ff26e290d37e468fdff56a79eaa2c819616 --- cmk/gui/plugins/sidebar/quicksearch.py | 2 +- cmk/gui/plugins/sidebar/shipped.py | 6 +++--- cmk/gui/plugins/sidebar/virtual_host_tree.py | 2 +- cmk/gui/plugins/wato/utils/__init__.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmk/gui/plugins/sidebar/quicksearch.py b/cmk/gui/plugins/sidebar/quicksearch.py index fe96091..90f4eaf 100644 --- a/cmk/gui/plugins/sidebar/quicksearch.py +++ b/cmk/gui/plugins/sidebar/quicksearch.py @@ -773,7 +773,7 @@ class GroupMatchPlugin(QuicksearchMatchPlugin): else: value = used_filters.get(self.get_filter_shortname()) - if type(value) == list: + if isinstance(value, list): value = "|".join(value) return value, [(filter_name, value)] diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index 191edc7..0955754 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -351,7 +351,7 @@ def render_nagios(): ("extinfo.cgi?type=7", "Scheduling Queue"), ("config.cgi", "Configuration"), ]: - if type(entry) == str: + if isinstance(entry, str): html.close_ul() heading(entry) html.open_ul() @@ -401,14 +401,14 @@ def render_custom_links(): for entry in links: n += 1 try: - if type(entry[1]) == type(True): + if isinstance(entry[1], type(True)): idss = ids + [str(n)] id_ = '/'.join(idss) html.begin_foldable_container( "customlinks", id_, isopen=entry[1], title=entry[0]) render_list(idss, entry[2]) html.end_foldable_container() - elif type(entry[1]) == str: + elif isinstance(entry[1], str): frame = entry[3] if len(entry) > 3 else "main" if len(entry) > 2 and entry[2]: diff --git a/cmk/gui/plugins/sidebar/virtual_host_tree.py b/cmk/gui/plugins/sidebar/virtual_host_tree.py index 5e2413a..17c122a 100644 --- a/cmk/gui/plugins/sidebar/virtual_host_tree.py +++ b/cmk/gui/plugins/sidebar/virtual_host_tree.py @@ -53,7 +53,7 @@ class VirtualHostTree(SidebarSnapin): def _load_user_settings(self): tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) - if type(tree_conf) == int: + if isinstance(tree_conf, int): tree_conf = {"tree": tree_conf, "cwd": {}} # convert from old style tree_id = tree_conf["tree"] diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index a0d77cd..cce3bd4 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -506,7 +506,7 @@ def _translation_elements(what): add_label = _("Add expression"), movable = False, ), - forth = lambda x: type(x) == tuple and [x] or x, + forth = lambda x: isinstance(x, tuple) and [x] or x, ) ), ( "mapping", @@ -591,7 +591,7 @@ class PasswordFromStore(CascadingDropdown): def IndividualOrStoredPassword(*args, **kwargs): return Transform( PasswordFromStore(*args, **kwargs), - forth=lambda v: ("password", v) if type(v) != tuple else v, + forth=lambda v: ("password", v) if not isinstance(v, tuple) else v, ) @@ -957,9 +957,9 @@ def PredictiveLevels(**args): # prediction def Levels(**kwargs): def match_levels_alternative(v): - if type(v) == dict: + if isinstance(v, dict): return 2 - elif type(v) == tuple and v != (None, None): + elif isinstance(v, tuple) and v != (None, None): return 1 return 0

5 years, 7 months

Yapf cmk/gui/plugins/sidebar/

by Óscar Nájera

Module: check_mk Branch: master Commit: 4158feba368fd7489bafcc4a349ad664debeff14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4158feba368fd7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 16:29:31 2018 +0100 Yapf cmk/gui/plugins/sidebar/ CMK-1180 Change-Id: Idd9e90867508d4e98e689574769f1e23ab7308e2 --- cmk/gui/plugins/sidebar/__init__.py | 1 - cmk/gui/plugins/sidebar/about.py | 13 +- cmk/gui/plugins/sidebar/bi.py | 36 ++-- cmk/gui/plugins/sidebar/bookmarks.py | 186 ++++++++-------- cmk/gui/plugins/sidebar/groups.py | 5 +- cmk/gui/plugins/sidebar/host_matrix.py | 44 ++-- cmk/gui/plugins/sidebar/master_control.py | 57 +++-- cmk/gui/plugins/sidebar/mkeventd.py | 46 ++-- cmk/gui/plugins/sidebar/nagvis_maps.py | 11 +- cmk/gui/plugins/sidebar/quicksearch.py | 307 ++++++++++++--------------- cmk/gui/plugins/sidebar/server_time.py | 4 +- cmk/gui/plugins/sidebar/shipped.py | 166 ++++++++------- cmk/gui/plugins/sidebar/site_status.py | 20 +- cmk/gui/plugins/sidebar/speedometer.py | 31 ++- cmk/gui/plugins/sidebar/tactical_overview.py | 269 ++++++++++------------- cmk/gui/plugins/sidebar/utils.py | 68 +++--- cmk/gui/plugins/sidebar/virtual_host_tree.py | 159 +++++++------- cmk/gui/plugins/sidebar/wato.py | 91 ++++---- 18 files changed, 713 insertions(+), 801 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4158feba36…

5 years, 7 months

Fix comparison to None idiom

by Óscar Nájera

Module: check_mk Branch: master Commit: f7624915fb70f0e1028e145c676aa62cf5d77ace URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7624915fb70f0… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Nov 9 16:24:26 2018 +0100 Fix comparison to None idiom Change-Id: I9c470a960a8403279b9afcd736c375fc39c478f9 --- cmk/gui/plugins/metrics/utils.py | 8 ++++---- cmk/gui/plugins/sidebar/bookmarks.py | 2 +- cmk/gui/plugins/sidebar/virtual_host_tree.py | 2 +- cmk/gui/plugins/userdb/ldap_connector.py | 2 +- cmk/gui/plugins/views/availability.py | 6 +++--- cmk/gui/plugins/views/bi.py | 2 +- cmk/gui/plugins/views/icons/__init__.py | 2 +- cmk/gui/plugins/views/icons/wato.py | 2 +- cmk/gui/plugins/views/layouts.py | 20 ++++++++++---------- cmk/gui/plugins/views/painters.py | 4 ++-- cmk/gui/plugins/views/perfometer.py | 2 +- cmk/gui/plugins/visuals/filters.py | 10 +++++----- cmk/gui/plugins/visuals/inventory.py | 12 ++++++------ cmk/gui/plugins/visuals/utils.py | 4 ++-- cmk/gui/plugins/wato/bi.py | 4 ++-- cmk/gui/plugins/wato/check_parameters.py | 4 ++-- cmk/gui/plugins/wato/inventory.py | 2 +- cmk/gui/plugins/wato/omd_configuration.py | 4 ++-- cmk/gui/plugins/wato/utils/__init__.py | 4 ++-- cmk/gui/plugins/webapi/utils.py | 2 +- 20 files changed, 49 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f7624915fb…

5 years, 7 months

yapf jolokia

by Moritz Kiemer

Module: check_mk Branch: master Commit: e389cc58f93ab250d5714e9af517024612b9d7cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e389cc58f93ab2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 12 08:19:46 2018 +0100 yapf jolokia Change-Id: I592b2fae7b062c0252cb387ee0133d4e6b6bba53 --- agents/plugins/mk_jolokia | 254 ++++++++++++++++++++++++++++------------------ checks/jolokia_generic | 49 +++++---- 2 files changed, 180 insertions(+), 123 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e389cc58f9…

5 years, 7 months

Introduced BI Datasource Program

by Lars Michelsen

Module: check_mk Branch: master Commit: bf2323f0109d1972aa0d44df398858f3ae4cc265 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf2323f0109d19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 09:14:51 2018 +0200 Introduced BI Datasource Program CMK-993 Change-Id: I35da5666a0a7f712ecc25f1a51ba4398051114d8 --- .werks/6679 | 53 ++++++ agents/special/agent_bi | 243 ++++++++++++++++++++++++++++ checkman/bi_aggregation | 13 ++ checkman/bi_aggregation_connection | 9 ++ checks/agent_bi | 33 ++++ checks/bi_aggregation | 64 ++++++++ checks/bi_aggregation_connection | 62 +++++++ cmk/gui/bi.py | 72 ++++++++- cmk/gui/plugins/wato/datasource_programs.py | 135 +++++++++++++++- cmk/gui/plugins/webapi/webapi.py | 22 +++ tests/unit/cmk/gui/test_webapi_unit.py | 3 +- 11 files changed, 701 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf2323f010…

5 years, 7 months

Removed test code.

by Sven Panne

Module: check_mk Branch: master Commit: fcf57f0ed3f9770c1ed47f484a55855b9db45dbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcf57f0ed3f977… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 12 09:27:34 2018 +0100 Removed test code. Change-Id: I61afa403cba71fb2f3b161e290829b068114f628 --- omd/packages/python-modules/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index f8028ad..6d9d031 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -5,7 +5,6 @@ SHELL = /bin/bash VERSION = $(OMD_VERSION) PATCHES := $(wildcard patches/*.dif) -PATCHES += patches/0018-mysqlclient-fortify-source.patch MODULES =

5 years, 7 months

← Newer
1
...
33
34
35
36
37
38
39
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018