Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

ignore [file].py.[hash].py temporary files of vim coc

by Lars Michelsen

Module: check_mk Branch: master Commit: fff71f712678b06f7a2440da628da0e8b9bd5288 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fff71f712678b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 07:52:59 2019 +0200 ignore [file].py.[hash].py temporary files of vim coc Change-Id: I818105240e150b64708939c11331858ec4f6b677 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 702d2cf..3fbdbbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.gcno *.pyc +*.py.*.py *kate-swp *~ .*.swo @@ -41,7 +42,7 @@ install-sh missing mk-livestatus-*.tar.gz mkeventd-*.tar.gz -mkeventd/ +mkeventd/ stamp-h1 tags tests/web/data/*

5 years, 2 months

Tags of hosts are now available in core and livestatus context

by Lars Michelsen

Module: check_mk Branch: master Commit: 96e37d8a45c256c3ab08e60a26704600c2989c2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e37d8a45c256… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 15 12:32:14 2019 +0100 Tags of hosts are now available in core and livestatus context * The previously existing host custom variable TAGS did contain a list of configured host tags of a host. The problem here is that it is not clear which tag groups the tags are assigned with. Each consumer of the tags (e.g. the GUI) had to reverese lookup the tags in the groups. This only worked because the tags had to be unique accross all tag groups. * This commit is introducsing a new host / service attribute "tags". The attribute contains a dictionary of all configured tags of that object. Each entry in this dictionary is built out of the tag group ID which is used as key and the choosen tag ID, which is used as value. * This new attribute is handled in a different way than the TAGS custom variable. It allows the tag groups and tags to be defined in a less restrictive way. It is, for example, possible to use non ASCII characters in the tag groups or tags from the livestatus perspective. This enables us to adapt a wider range of tags from external systems like AWS, Azure, Kubernetes and so on. More on this in later commits. * The new column also allows a lot easier and more flexible filtering on livestatus protocol layer. * The quicksearch host tag filter is now using the tag keys and values. To search all productive hosts use: "tg:criticality:prod" instead of "tg:prod". It' still compatible to the old syntax, but that may be dropped as of version 1.7. * All GUI parts working with tags have been updated to work with the new "tags" column. CMK-1814 Change-Id: Ifce1376a9eb31dbd84c57542720f328921625281 --- cmk/gui/plugins/sidebar/quicksearch.py | 27 ++++-- cmk/gui/plugins/views/__init__.py | 3 +- cmk/gui/plugins/views/painters.py | 44 ++++----- cmk/gui/plugins/views/sorters.py | 12 ++- cmk/gui/plugins/views/utils.py | 19 +--- cmk/gui/plugins/visuals/filters.py | 59 +++++------- cmk/gui/plugins/wato/builtin_attributes.py | 12 ++- cmk/gui/tags.py | 12 +++ cmk/gui/view_utils.py | 7 ++ cmk/gui/views.py | 45 ++++----- cmk/gui/wato/pages/folders.py | 12 +-- cmk/gui/wato/pages/hosts.py | 2 +- cmk/gui/watolib/host_attributes.py | 46 +++++---- cmk/gui/watolib/hosts_and_folders.py | 103 +++++++++------------ cmk_base/automations/check_mk.py | 3 +- cmk_base/config.py | 7 ++ cmk_base/core_config.py | 13 ++- cmk_base/core_nagios.py | 13 ++- cmk_base/data_sources/programs.py | 3 +- cmk_base/default_config/base.py | 1 + cmk_base/dump_host.py | 4 +- cmk_base/modes/__init__.py | 3 +- tests/integration/livestatus/test_livestatus.py | 28 +++++- .../unit/cmk/gui/watolib/test_hosts_and_folders.py | 72 ++++++++++++++ tests/unit/cmk_base/test_config.py | 23 +++++ tests/unit/cmk_base/test_core_config.py | 51 +++++++++- web/htdocs/themes/classic/scss/_pages.scss | 15 ++- web/htdocs/themes/classic/scss/_wato.scss | 4 - web/htdocs/themes/facelift/scss/_pages.scss | 46 +++++++++ web/htdocs/themes/facelift/theme.scss | 1 + 30 files changed, 456 insertions(+), 234 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=96e37d8a45…

5 years, 2 months

apache_status: refactor III

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2ddbccb3e9d49b124f3da169583620567bddef70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ddbccb3e9d49b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 1 14:31:01 2019 +0200 apache_status: refactor III Change-Id: Icde1c8653de6335a1f2ee97a5a6b5877ffb37a3a --- agents/plugins/apache_status | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 191e368..671d30a 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -133,6 +133,28 @@ def no_cert_verification(): return context +def get_response(proto, address, portspec, page): + is_local = address in ("127.0.0.1", "[::1]", "localhost") + url = '%s://%s%s/%s?auto' % (proto, address, portspec, page) + # Try to fetch the status page for each server + try: + request = urllib2.Request(url, headers={"Accept": "text/plain"}) + return urllib2.urlopen(request) + except urllib2.URLError, e: + if 'unknown protocol' in str(e): + # HACK: workaround misconfigurations where port 443 is used for + # serving non ssl secured http + url = 'http://%s%s/server-status?auto' % (address, portspec) + return urllib2.urlopen(url) + raise + except Exception, e: + if 'doesn\'t match' in str(e) and is_local: + # HACK: workaround if SSL port is found and localhost is using + # SSL connections but certificate does not match + return urllib2.urlopen(url, context=no_cert_verification()) + raise + + def main(): config = get_config() servers = config["servers"] @@ -148,31 +170,10 @@ def main(): for server in servers: proto, address, port, page = _unpack_server(server) portspec = ':%d' % port if port else '' - is_local = address in ("127.0.0.1", "[::1]", "localhost") try: - url = '%s://%s%s/%s?auto' % (proto, address, portspec, page) - # Try to fetch the status page for each server - try: - request = urllib2.Request(url, headers={"Accept": "text/plain"}) - fd = urllib2.urlopen(request) - except urllib2.URLError, e: - if 'unknown protocol' in str(e): - # HACK: workaround misconfigurations where port 443 is used for - # serving non ssl secured http - url = 'http://%s%s/server-status?auto' % (address, portspec) - fd = urllib2.urlopen(url) - else: - raise - except Exception, e: - if 'doesn\'t match' in str(e) and is_local: - # HACK: workaround if SSL port is found and localhost is using - # SSL connections but certificate does not match - fd = urllib2.urlopen(url, context=no_cert_verification()) - else: - raise - - for line in fd.read().split('\n'): + response = get_response(proto, address, portspec, page) + for line in response.read().split('\n'): if not line.strip(): continue if line.lstrip()[0] == '<':

5 years, 2 months

apache_status: refactor

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4896b7c3834ea68fbfac8936e76b013325701edb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4896b7c3834ea6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 1 13:51:29 2019 +0200 apache_status: refactor Change-Id: I5d8098d6623717cc186e16990d499986a4b4f69d --- agents/plugins/apache_status | 143 ++++++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 64 deletions(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 7b4c739..2f390c8 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -48,28 +48,32 @@ import sys import urllib2 import ssl -config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") -config_file = config_dir + "/apache_status.conf" - -if not os.path.exists(config_file): - config_file = config_dir + "/apache_status.cfg" - # We have to deal with socket timeouts. Python > 2.6 # supports timeout parameter for the urllib2.urlopen method # but we are on a python 2.5 system here which seem to use the # default socket timeout. We are local here so set it to 1 second. socket.setdefaulttimeout(5.0) -# None or list of (proto, ipaddress, port) tuples. -# proto is 'http' or 'https' -servers = None -ssl_ports = [443] -if os.path.exists(config_file): - execfile(config_file) +def get_config(): + config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") + config_file = config_dir + "/apache_status.conf" + + if not os.path.exists(config_file): + config_file = config_dir + "/apache_status.cfg" + # None or list of (proto, ipaddress, port) tuples. + # proto is 'http' or 'https' + config = { + "servers": None, + "ssl_ports": [443], + } + if os.path.exists(config_file): + execfile(config_file, config) + return config -def try_detect_servers(): + +def try_detect_servers(ssl_ports): results = [] for netstat_line in os.popen('netstat -tlnp 2>/dev/null').readlines(): @@ -115,60 +119,71 @@ def try_detect_servers(): return results -if servers is None: - servers = try_detect_servers() +def main(): + config = get_config() + servers = config["servers"] + ssl_ports = config["ssl_ports"] + + if servers is None: + servers = try_detect_servers(ssl_ports) -if not servers: - sys.exit(0) + if not servers: + return 0 -sys.stdout.write('<<<apache_status>>>\n') -for server in servers: - if isinstance(server, tuple): - proto, address, port = server - page = 'server-status' - else: - proto = server['protocol'] - address = server['address'] - port = server['port'] - page = server.get('page', 'server-status') + sys.stdout.write('<<<apache_status>>>\n') + for server in servers: + if isinstance(server, tuple): + proto, address, port = server + page = 'server-status' + else: + proto = server['protocol'] + address = server['address'] + port = server['port'] + page = server.get('page', 'server-status') - portspec = ':%d' % port if port else '' + portspec = ':%d' % port if port else '' - try: - url = '%s://%s%s/%s?auto' % (proto, address, portspec, page) - # Try to fetch the status page for each server try: - request = urllib2.Request(url, headers={"Accept": "text/plain"}) - fd = urllib2.urlopen(request) - except urllib2.URLError, e: - if 'unknown protocol' in str(e): - # HACK: workaround misconfigurations where port 443 is used for - # serving non ssl secured http - url = 'http://%s%s/server-status?auto' % (address, portspec) - fd = urllib2.urlopen(url) - else: - raise + url = '%s://%s%s/%s?auto' % (proto, address, portspec, page) + # Try to fetch the status page for each server + try: + request = urllib2.Request(url, headers={"Accept": "text/plain"}) + fd = urllib2.urlopen(request) + except urllib2.URLError, e: + if 'unknown protocol' in str(e): + # HACK: workaround misconfigurations where port 443 is used for + # serving non ssl secured http + url = 'http://%s%s/server-status?auto' % (address, portspec) + fd = urllib2.urlopen(url) + else: + raise + except Exception, e: + if 'doesn\'t match' in str(e) and address in ("127.0.0.1", "[::1]", "localhost"): + # HACK: workaround if SSL port is found and localhost is using + # SSL connections but certificate does not match + no_cert_context = ssl.create_default_context() + no_cert_context.check_hostname = False + no_cert_context.verify_mode = ssl.CERT_NONE + fd = urllib2.urlopen(url, context=no_cert_context) + else: + raise + + for line in fd.read().split('\n'): + if not line.strip(): + continue + if line.lstrip()[0] == '<': + # Seems to be html output. Skip this server. + break + + sys.stdout.write("%s %s %s\n" % (address, port, line)) + except urllib2.HTTPError, e: + sys.stderr.write('HTTP-Error (%s%s): %s %s\n' % (address, portspec, e.code, e)) + except Exception, e: - if 'doesn\'t match' in str(e) and address in ("127.0.0.1", "[::1]", "localhost"): - # HACK: workaround if SSL port is found and localhost is using - # SSL connections but certificate does not match - no_cert_context = ssl.create_default_context() - no_cert_context.check_hostname = False - no_cert_context.verify_mode = ssl.CERT_NONE - fd = urllib2.urlopen(url, context=no_cert_context) - else: - raise - - for line in fd.read().split('\n'): - if not line.strip(): - continue - if line.lstrip()[0] == '<': - # Seems to be html output. Skip this server. - break - - sys.stdout.write("%s %s %s\n" % (address, port, line)) - except urllib2.HTTPError, e: - sys.stderr.write('HTTP-Error (%s%s): %s %s\n' % (address, portspec, e.code, e)) - - except Exception, e: - sys.stderr.write('Exception (%s%s): %s\n' % (address, portspec, e)) + sys.stderr.write('Exception (%s%s): %s\n' % (address, portspec, e)) + + return 0 + + +if __name__ == "__main__": + sys.exit(main())

5 years, 2 months

apache_status: refactor II

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5e61c635cf71f9f05df9ffdeff1f18df4a8d20bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e61c635cf71f9… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 1 14:25:02 2019 +0200 apache_status: refactor II Change-Id: I0701139f3729e2d88fa10853bbaa437d7a132adb --- agents/plugins/apache_status | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 2f390c8..191e368 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -119,6 +119,20 @@ def try_detect_servers(ssl_ports): return results +def _unpack_server(server): + if isinstance(server, tuple): + return server + ('server-status',) + return (server['protocol'], server['address'], server['port'], + server.get('page', 'server-status')) + + +def no_cert_verification(): + context = ssl.create_default_context() + context.check_hostname = False + context.verify_mode = ssl.CERT_NONE + return context + + def main(): config = get_config() servers = config["servers"] @@ -132,16 +146,9 @@ def main(): sys.stdout.write('<<<apache_status>>>\n') for server in servers: - if isinstance(server, tuple): - proto, address, port = server - page = 'server-status' - else: - proto = server['protocol'] - address = server['address'] - port = server['port'] - page = server.get('page', 'server-status') - + proto, address, port, page = _unpack_server(server) portspec = ':%d' % port if port else '' + is_local = address in ("127.0.0.1", "[::1]", "localhost") try: url = '%s://%s%s/%s?auto' % (proto, address, portspec, page) @@ -158,13 +165,10 @@ def main(): else: raise except Exception, e: - if 'doesn\'t match' in str(e) and address in ("127.0.0.1", "[::1]", "localhost"): + if 'doesn\'t match' in str(e) and is_local: # HACK: workaround if SSL port is found and localhost is using # SSL connections but certificate does not match - no_cert_context = ssl.create_default_context() - no_cert_context.check_hostname = False - no_cert_context.verify_mode = ssl.CERT_NONE - fd = urllib2.urlopen(url, context=no_cert_context) + fd = urllib2.urlopen(url, context=no_cert_verification()) else: raise

5 years, 2 months

[CMK-1912] - integration test is adopted to new output from WMI

by Sergey Kipnis

Module: check_mk Branch: master Commit: bcd6a090c3e6b30ac29e2639f4fb6bcd4de33fc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcd6a090c3e6b3… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon Apr 1 15:45:00 2019 +0200 [CMK-1912] - integration test is adopted to new output from WMI Change-Id: Icb9d87d60265918a817f1b320acd715aa926fe29 --- agents/windows/it/test_section_wmi_cpuload.py | 8 ++++---- agents/windows/it/test_section_wmi_webservices.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/windows/it/test_section_wmi_cpuload.py b/agents/windows/it/test_section_wmi_cpuload.py index d97f9c9..93a56bd 100644 --- a/agents/windows/it/test_section_wmi_cpuload.py +++ b/agents/windows/it/test_section_wmi_cpuload.py @@ -40,9 +40,9 @@ def expected_output(): r'Frequency_PerfTime,Frequency_Sys100NS,Name,' r'PercentRegistryQuotaInUse,PercentRegistryQuotaInUse_Base,Processes,' r'ProcessorQueueLength,SystemCallsPersec,SystemUpTime,Threads,' - r'Timestamp_Object,Timestamp_PerfTime,Timestamp_Sys100NS'), + r'Timestamp_Object,Timestamp_PerfTime,Timestamp_Sys100NS,WMIStatus'), (r'\d+,,\d+,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,,\d+,' - r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+'), + r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\b(?:OK|Timeout)\b'), re.escape(r'[computer_system]'), (r'AdminPasswordStatus,AutomaticManagedPagefile,' r'AutomaticResetBootOption,AutomaticResetCapability,BootOptionOnLimit,' @@ -61,11 +61,11 @@ def expected_output(): r'ResetLimit,Roles,Status,SupportContactDescription,SystemFamily,' r'SystemSKUNumber,SystemStartupDelay,SystemStartupOptions,' r'SystemStartupSetting,SystemType,ThermalState,TotalPhysicalMemory,' - r'UserName,WakeUpType,Workgroup'), + r'UserName,WakeUpType,Workgroup,WMIStatus'), (r'\d+,\d+,\d+,\d+,\d*,\d*,\d+,[^,]*,[^,]+,[\w-]+,\d+,,\w+,\d+,\d+,' r'[^,]+,[\w-]+,[^,]+,\d+,\d+,\d+,\d+,\d+,,,\d+,,[^,]+(, [^,]+)?,[^,]+,' r'[\w-]+,,\d+,\d+,\d+,,[^,]+,\d+,\-?\d+,\d+,\d+,,,\d+,\d+,\d+,,[\w-]+,' - r'\d+,\d+,\d+,[^,]+,\w+,,[^,]*,,,,,[^,]+,\d+,\d+,[^,]*,\d+,\w*') + r'\d+,\d+,\d+,[^,]+,\w+,,[^,]*,,,,,[^,]+,\d+,\d+,[^,]*,\d+,\w*,\b(?:OK|Timeout)\b') ] if not Globals.alone: expected += [re.escape(r'<<<systemtime>>>'), r'\d+'] diff --git a/agents/windows/it/test_section_wmi_webservices.py b/agents/windows/it/test_section_wmi_webservices.py index 1baee4d..09dfb78 100644 --- a/agents/windows/it/test_section_wmi_webservices.py +++ b/agents/windows/it/test_section_wmi_webservices.py @@ -40,7 +40,7 @@ def expected_output(): r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,[^,]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' - r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+') + r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\b(?:OK|Timeout)\b') if not Globals.alone: re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' re_str += r'$' @@ -87,7 +87,7 @@ def expected_output(): r'TotalPropfindRequests,TotalProppatchRequests,TotalPutRequests,' r'TotalRejectedAsyncIORequests,TotalSearchRequests,' r'TotalTraceRequests,TotalUnlockRequests,TraceRequestsPersec,' - r'UnlockRequestsPersec') + r'UnlockRequestsPersec,WMIStatus') ], repeat(re_str))

5 years, 3 months

Fixed "Clustered services for overlapping clusters" rule while checking

by Simon Betz

Module: check_mk Branch: master Commit: 489f534b4269a0963e3f9bca38b675873ab233df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=489f534b4269a0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 22 12:37:05 2019 +0100 Fixed "Clustered services for overlapping clusters" rule while checking Change-Id: I8098139a285d2e458d05918a5dcbdf0fcc68fdfa --- .werks/7130 | 24 +++++++++ cmk_base/checking.py | 6 ++- cmk_base/data_sources/host_sections.py | 67 +++++++++++++++++++------ tests/unit/cmk_base/test_host_sections.py | 82 +++++++++++++++++++++++++++++++ 4 files changed, 164 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=489f534b42…

5 years, 3 months

test_checking: Added comment to assert statement

by Simon Betz

Module: check_mk Branch: master Commit: 243150475285f562365afc5c3aa64b49b8df7aaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=243150475285f5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 22 17:26:42 2019 +0100 test_checking: Added comment to assert statement Change-Id: Iac3b78a8965d899e2a763e6b896b5fbfdefb0fc9 --- tests/unit/cmk_base/test_checking.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unit/cmk_base/test_checking.py b/tests/unit/cmk_base/test_checking.py index b101bc6..a4782fb 100644 --- a/tests/unit/cmk_base/test_checking.py +++ b/tests/unit/cmk_base/test_checking.py @@ -145,7 +145,9 @@ def test_determine_check_parameters(monkeypatch, rules, active_timeperiods, expe monkeypatch.setattr(cmk_base.core, "timeperiod_active", lambda tp: _check_timeperiod(tp, active_timeperiods)) - assert (cmk_base.checking.determine_check_params(rules) == expected_result) + determined_check_params = cmk_base.checking.determine_check_params(rules) + assert expected_result == determined_check_params,\ + "Determine params: Expected '%s' but got '%s'" % (expected_result, determined_check_params) def _check_timeperiod(timeperiod, active_timeperiods):

5 years, 3 months

First dead simple NEB unit test.

by Sven Panne

Module: check_mk Branch: master Commit: ae3d8f860170796105b24bd6882a6699883f8fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae3d8f86017079… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 1 15:32:11 2019 +0200 First dead simple NEB unit test. Change-Id: Ia88b6895f8dfbec5e9847e87d1503ef1ce6d8c9d --- livestatus/src/test/Makefile.am | 1 + .../src/test/test_OffsetStringMacroColumn.cc | 35 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/livestatus/src/test/Makefile.am b/livestatus/src/test/Makefile.am index c299d40..c6d8a9f 100644 --- a/livestatus/src/test/Makefile.am +++ b/livestatus/src/test/Makefile.am @@ -44,6 +44,7 @@ test_neb_SOURCES = \ test_OffsetStringMacroColumn.cc test_neb_CPPFLAGS = \ -I.. \ + -I../.. \ -I$(GOOGLETEST)/destdir/include \ @BOOST_CPPFLAGS@ @RE2_CPPFLAGS@ test_neb_LDFLAGS = \ diff --git a/livestatus/src/test/test_OffsetStringMacroColumn.cc b/livestatus/src/test/test_OffsetStringMacroColumn.cc index 71c0e7c..36ea292 100644 --- a/livestatus/src/test/test_OffsetStringMacroColumn.cc +++ b/livestatus/src/test/test_OffsetStringMacroColumn.cc @@ -1,8 +1,35 @@ #include <memory> -#include "StringUtils.h" +#include "Column.h" +#include "OffsetStringHostMacroColumn.h" +#include "Row.h" #include "gtest/gtest.h" +#include "nagios.h" -TEST(OffsetStringMacroColumn, dummy) { - EXPECT_EQ("foobar", mk::unsafe_tolower("fOObAr")); - EXPECT_EQ("blah ", mk::lstrip(" blah ")); +TEST(OffsetStringHostMacroColumn, simple) { + // Backwards you must build the list, my young padawan... + customvariablesmember cvm1{const_cast<char *>("HARRY"), + const_cast<char *>("HIRSCH"), 0, nullptr}; + customvariablesmember cvm2{const_cast<char *>("ERNIE"), + const_cast<char *>("BERT"), 0, &cvm1}; + customvariablesmember *custom_variables = &cvm2; + Row row{&custom_variables}; + + OffsetStringHostMacroColumn oshmc("funny_column_name", "Cool description!", + -1, -1, -1, nullptr, 0); + + EXPECT_EQ("funny_column_name", oshmc.name()); + EXPECT_EQ("Cool description!", oshmc.description()); + EXPECT_EQ(&custom_variables, oshmc.columnData<void>(row)); + EXPECT_EQ(ColumnType::string, oshmc.type()); + + auto cvm = *oshmc.columnData<const customvariablesmember *const>(row); + EXPECT_STREQ("ERNIE", cvm->variable_name); + EXPECT_STREQ("BERT", cvm->variable_value); + + cvm = cvm->next; + EXPECT_STREQ("HARRY", cvm->variable_name); + EXPECT_STREQ("HIRSCH", cvm->variable_value); + + cvm = cvm->next; + EXPECT_EQ(nullptr, cvm); }

5 years, 3 months

Added machinery for unit testing of NEB.

by Sven Panne

Module: check_mk Branch: master Commit: 771863d32e4d69a7d3b67e90f6c512e9a5197f24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=771863d32e4d69… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 1 15:06:30 2019 +0200 Added machinery for unit testing of NEB. Change-Id: I0e2998dacc39e146985da67c9e3e04371dfd3d25 --- livestatus/config_files.m4 | 3 +- livestatus/src/cppcheck-suppressions.txt | 3 +- livestatus/src/test/.clang_complete | 11 +++ livestatus/src/test/.f12 | 6 ++ livestatus/src/test/.gitignore | 2 + livestatus/src/test/DummyNagios.cc | 104 +++++++++++++++++++++ livestatus/src/test/Makefile.am | 94 +++++++++++++++++++ .../src/test/test_OffsetStringMacroColumn.cc | 8 ++ 8 files changed, 229 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=771863d32e…

5 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019