Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 0daabd40b88b6ab3e4e3388ca10b4d18689c6016 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0daabd40b88b6a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 19:50:15 2019 +0100 Refactor host_cookie_path to Path() Change-Id: Ib686da84317e84ebab66d3cd3e8b313216dc106e --- agents/special/agent_vsphere | 66 +++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 18f8a17..d10883e 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -38,8 +38,11 @@ import re import socket import sys import time +import errno +from typing import Optional, Text # pylint: disable=unused-import from xml.dom import minidom # type: ignore from dateutil import tz +from pathlib2 import Path import cmk.utils.paths @@ -909,8 +912,11 @@ def get_pattern(pattern, line): def delete_server_cookie(): - if os.path.exists(host_cookie_path): - os.unlink(host_cookie_path) + try: + host_cookie_path.unlink() + except OSError as e: + if e.errno != errno.ENOENT: + raise def query_server(payload, payload_params=None): @@ -1023,27 +1029,29 @@ def retrieve_systeminfo(): def login(): - global server_cookie - - if os.path.exists(host_cookie_path): - server_cookie = file(host_cookie_path, "r").read() - else: - payload = telegram_list["login"] - _reply_code, _repy_msg, reply_headers, reply_data = \ - query_server(payload, payload_params = {"username": encode_url(user), - "password": encode_url(secret)}) - if "InvalidLogin" in reply_data: - global error - error = "Cannot login to vSphere Server. Login response is not 'OK'. Please check the credentials" - else: - server_cookie = reply_headers.get("Set-Cookie") - if server_cookie: - if not os.path.exists(os.path.dirname(host_cookie_path)): - os.makedirs(os.path.dirname(host_cookie_path)) + # type: () -> Optional[Text] + if host_cookie_path.exists(): + return host_cookie_path.open(encoding="utf-8").read() + + payload = telegram_list["login"] + _reply_code, _repy_msg, reply_headers, reply_data = \ + query_server(payload, payload_params = {"username": encode_url(user), + "password": encode_url(secret)}) + + # TODO: Refactor to exception + if "InvalidLogin" in reply_data: + global error + error = "Cannot login to vSphere Server. Login response is not 'OK'. Please check the credentials" + return None + + server_cookie = reply_headers.get("Set-Cookie", "").decode("utf-8") + + if server_cookie: + host_cookie_path.mkdir(parents=True, exist_ok=True) + with host_cookie_path.open("w", encoding="utf-8") as f: + f.write(server_cookie) - cookie_file = file(host_cookie_path, "w") - os.chmod(host_cookie_path, 0600) - cookie_file.write(server_cookie) + return server_cookie def output_aggregated_snapshots(vms, hostsystems=None): @@ -1292,7 +1300,8 @@ if tracefile: last_cookie_access_time = None server_cookie = None server_handle = None -host_cookie_path = "%s/agents/agent_vsphere/cookie.%s" % (cmk.utils.paths.tmp_dir, host_address) +host_cookie_path = Path( + "%s/agents/agent_vsphere/cookie.%s" % (cmk.utils.paths.tmp_dir, host_address)) connect_to_server() retrieve_systeminfo() @@ -1304,11 +1313,12 @@ if not systeminfo: # The cookie access time is required to determine the agents check interval # This is required later on by the performancecounters. Depending on the # interval we need more or less real-time samples -if os.path.exists(host_cookie_path): - last_cookie_access_time = os.stat(host_cookie_path).st_mtime - os.utime(host_cookie_path, None) # Touch the cookie file, whenever it is accessed +# TODO: Decouple login secret and perfcounter timer +if host_cookie_path.exists(): + last_cookie_access_time = host_cookie_path.stat().st_mtime + os.utime(str(host_cookie_path), None) # Touch the cookie file, whenever it is accessed -login() +server_cookie = login() if not error: # If the data aquisition fails, e.g. invalid cookie we try another run @@ -1804,7 +1814,7 @@ if not error: # We are delete the cookie and start a second run vsphere_output = [] # Reset current output delete_server_cookie() - login() + server_cookie = login() continue # do a second run except Exception, e: if opt_debug:

5 years, 7 months

Cleaned up host_cookie_path handling a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: d6eb1f3eab9f1fdb461f3f127eae15428fc2fee3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6eb1f3eab9f1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 19:34:53 2019 +0100 Cleaned up host_cookie_path handling a bit Change-Id: I38cbc84093890c9af3327b9c7e45f6a966e52822 --- agents/special/agent_vsphere | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index f163f45..18f8a17 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -39,9 +39,10 @@ import socket import sys import time from xml.dom import minidom # type: ignore - from dateutil import tz +import cmk.utils.paths + class MKQueryServerException(Exception): pass @@ -333,10 +334,6 @@ telegram_list = { '<ns1:path>vm</ns1:path><ns1:skip>false</ns1:skip></ns1:selectSet>'\ '</ns1:objectSet></ns1:specSet><ns1:options></ns1:options></ns1:RetrievePropertiesEx>', - "logout": - '<ns1:Logout xsi:type="ns1:LogoutRequestType">'\ - '<ns1:_this type="SessionManager">%(sessionManager)s</ns1:_this></ns1:Logout>', - "continuetoken": '<ns1:ContinueRetrievePropertiesEx xsi:type="ns1:ContinueRetrievePropertiesExRequestType">'\ '<ns1:_this type="PropertyCollector">%(propertyCollector)s</ns1:_this><ns1:token>%(token)s</ns1:token></ns1:ContinueRetrievePropertiesEx>', @@ -912,7 +909,7 @@ def get_pattern(pattern, line): def delete_server_cookie(): - if host_cookie_path and os.path.exists(host_cookie_path): + if os.path.exists(host_cookie_path): os.unlink(host_cookie_path) @@ -1028,7 +1025,7 @@ def retrieve_systeminfo(): def login(): global server_cookie - if host_cookie_path and os.path.exists(host_cookie_path): + if os.path.exists(host_cookie_path): server_cookie = file(host_cookie_path, "r").read() else: payload = telegram_list["login"] @@ -1040,7 +1037,10 @@ def login(): error = "Cannot login to vSphere Server. Login response is not 'OK'. Please check the credentials" else: server_cookie = reply_headers.get("Set-Cookie") - if host_cookie_path and server_cookie: + if server_cookie: + if not os.path.exists(os.path.dirname(host_cookie_path)): + os.makedirs(os.path.dirname(host_cookie_path)) + cookie_file = file(host_cookie_path, "w") os.chmod(host_cookie_path, 0600) cookie_file.write(server_cookie) @@ -1289,19 +1289,10 @@ if tracefile: tracefile.write("Tracefile %s Host address: %s\n" % (datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), host_address)) -host_cookie_path = None last_cookie_access_time = None server_cookie = None server_handle = None - -# Cookie storage is only available in OMD setups -if "OMD_SITE" in os.environ: - cookie_path = os.path.expanduser("~/tmp/check_mk/agents/agent_vsphere") - - if not os.path.exists(cookie_path): - os.makedirs(cookie_path) - - host_cookie_path = "%s/cookie.%s" % (cookie_path, host_address) +host_cookie_path = "%s/agents/agent_vsphere/cookie.%s" % (cmk.utils.paths.tmp_dir, host_address) connect_to_server() retrieve_systeminfo() @@ -1313,7 +1304,7 @@ if not systeminfo: # The cookie access time is required to determine the agents check interval # This is required later on by the performancecounters. Depending on the # interval we need more or less real-time samples -if host_cookie_path and os.path.exists(host_cookie_path): +if os.path.exists(host_cookie_path): last_cookie_access_time = os.stat(host_cookie_path).st_mtime os.utime(host_cookie_path, None) # Touch the cookie file, whenever it is accessed @@ -1806,10 +1797,6 @@ if not error: section_systemtime() - # We only logout in non OMD-setups - if not host_cookie_path: - query_server(telegram_list["logout"]) - break except MKQueryServerException, e: # There was a problem during the query.

5 years, 7 months

Refactored global error variable to exception handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 80ea76313cce4b2e08ab8d839a110b98fd555ff6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80ea76313cce4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 20:07:50 2019 +0100 Refactored global error variable to exception handling Change-Id: I511a0a139aa2273b4fb2c6907c5621d160d3d827 --- agents/special/agent_vsphere | 66 +++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index d10883e..d2be352 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -45,6 +45,7 @@ from dateutil import tz from pathlib2 import Path import cmk.utils.paths +from cmk.utils.exceptions import MKGeneralException class MKQueryServerException(Exception): @@ -992,7 +993,6 @@ def encode_url(text): def connect_to_server(): # Initialize server connection try: - global server_handle netloc = host_address + ":" + str(opt_port) if opt_no_cert: @@ -1010,12 +1010,12 @@ def connect_to_server(): sys.stderr.flush() server_handle.connect() + return server_handle except Exception, e: if opt_debug: raise - global error - error = "Cannot connect to vSphere Server. Please check the IP and SSL certificate (if applicable) "\ - "and try again. This error is not related to the login credentials. Error message: %r" % e + raise MKGeneralException("Cannot connect to vSphere Server. Please check the IP and SSL certificate (if applicable) "\ + "and try again. This error is not related to the login credentials. Error message: %r" % e) def retrieve_systeminfo(): @@ -1038,11 +1038,10 @@ def login(): query_server(payload, payload_params = {"username": encode_url(user), "password": encode_url(secret)}) - # TODO: Refactor to exception if "InvalidLogin" in reply_data: - global error - error = "Cannot login to vSphere Server. Login response is not 'OK'. Please check the credentials" - return None + raise MKGeneralException( + "Cannot login to vSphere Server. Login response is not 'OK'. Please check the credentials" + ) server_cookie = reply_headers.get("Set-Cookie", "").decode("utf-8") @@ -1183,9 +1182,6 @@ opt_vm_piggyname = "alias" opt_spaces = "underscore" opt_no_cert = False -error = None -error_exit = 1 - host_address = None user = None secret = None @@ -1242,6 +1238,8 @@ for o, a in opts: usage() sys.exit(0) +error_exit = 0 if opt_agent else 1 + # If the --pysphere option is set we use the legacy pysphere agent, though 50 times slower... if opt_pysphere: path_vsphere_pysphere = os.path.dirname(os.path.abspath(__file__)) @@ -1299,28 +1297,27 @@ if tracefile: last_cookie_access_time = None server_cookie = None -server_handle = None host_cookie_path = Path( "%s/agents/agent_vsphere/cookie.%s" % (cmk.utils.paths.tmp_dir, host_address)) -connect_to_server() -retrieve_systeminfo() +try: + server_handle = connect_to_server() + retrieve_systeminfo() -if not systeminfo: - sys.stderr.write("Unable to get data from Web API" + "\n") - sys.exit(1) + if not systeminfo: + sys.stderr.write("Unable to get data from Web API" + "\n") + sys.exit(1) -# The cookie access time is required to determine the agents check interval -# This is required later on by the performancecounters. Depending on the -# interval we need more or less real-time samples -# TODO: Decouple login secret and perfcounter timer -if host_cookie_path.exists(): - last_cookie_access_time = host_cookie_path.stat().st_mtime - os.utime(str(host_cookie_path), None) # Touch the cookie file, whenever it is accessed + # The cookie access time is required to determine the agents check interval + # This is required later on by the performancecounters. Depending on the + # interval we need more or less real-time samples + # TODO: Decouple login secret and perfcounter timer + if host_cookie_path.exists(): + last_cookie_access_time = host_cookie_path.stat().st_mtime + os.utime(str(host_cookie_path), None) # Touch the cookie file, whenever it is accessed -server_cookie = login() + server_cookie = login() -if not error: # If the data aquisition fails, e.g. invalid cookie we try another run run_count = 0 while run_count < 2: @@ -1819,16 +1816,11 @@ if not error: except Exception, e: if opt_debug: raise - error = "Error while processing received data" - -write_output(vsphere_output, opt_agent, host_address) - -if opt_agent: - error_exit = 0 - -if tracefile: - tracefile.close() + raise MKGeneralException("Error while processing received data") -if error: - sys.stderr.write(error + "\n") +except MKGeneralException as e: + sys.stderr.write("%s\n" % e) sys.exit(error_exit) + +write_output(vsphere_output, opt_agent, host_address) +sys.exit(0)

5 years, 7 months

views/inventory.py: unify two paint functions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 94c3d0dbd6bdfe3eb9508081254f5268b2329f29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94c3d0dbd6bdfe… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 20 10:53:49 2019 +0100 views/inventory.py: unify two paint functions Change-Id: I7e282e647614a76d5a1dfa78e3797d267ee386d7 --- cmk/gui/plugins/views/inventory.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 958aa45..f838ac8 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -515,13 +515,8 @@ def inv_paint_timestamp_as_age_days(timestamp): @decorate_inv_paint -def inv_paint_docker_labels(labels): - return "labels", html.render_br().join(sorted(labels.split(", "))) - - -@decorate_inv_paint -def inv_paint_lines_csv(lines): - return "", lines.replace(",", "<br>") +def inv_paint_csv_labels(csv_list): + return "labels", html.render_br().join(csv_list.split(",")) #. @@ -1026,10 +1021,10 @@ inventory_displayhints.update({ "view": "invdockerimages_of_host", }, ".software.applications.docker.images:*.id": {"title": _("ID")}, - ".software.applications.docker.images:*.labels": {"paint": "docker_labels"}, + ".software.applications.docker.images:*.labels": {"paint": "csv_labels"}, ".software.applications.docker.images:*.amount_containers": {"title": _("# Containers")}, - ".software.applications.docker.images:*.repotags": {"title": _("Repository/Tag"), "paint": "lines_csv"}, - ".software.applications.docker.images:*.repodigests": {"title": _("Digests"), "paint": "lines_csv"}, + ".software.applications.docker.images:*.repotags": {"title": _("Repository/Tag"), "paint": "csv_labels"}, + ".software.applications.docker.images:*.repodigests": {"title": _("Digests"), "paint": "csv_labels"}, # Node containers ".software.applications.docker.containers:": { @@ -1038,7 +1033,7 @@ inventory_displayhints.update({ "view": "invdockercontainers_of_host", }, ".software.applications.docker.containers:*.id": {"title": _("ID")}, - ".software.applications.docker.containers:*.labels": {"paint": "docker_labels"}, + ".software.applications.docker.containers:*.labels": {"paint": "csv_labels"}, ".software.applications.docker.networks.*.": {"title": "Network %s"}, ".software.applications.docker.networks.*.network_id": {"title": "Network ID"}, ".software.applications.docker.container.": {"title": _("Container")},

5 years, 7 months

Exclude docker.pyc from agent permission test

by Lars Michelsen

Module: check_mk Branch: master Commit: fc2b9bc6708f6e0493f466b6d0fbd9ab207d64ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc2b9bc6708f6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 23:13:52 2019 +0100 Exclude docker.pyc from agent permission test Change-Id: I4dd0de888313d6117f675f29a609eb6edd61909e --- tests/git/test_permissions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index 895e39c..d0c8b61 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -20,7 +20,8 @@ permissions = [ ('agents/special/agent_*', is_executable, []), ('agents/special/lib/*', is_not_executable, []), ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), - ('agents/plugins/*', is_executable, ['README', 'mk_filestats.pyc', 'mk_jolokia.pyc']), + ('agents/plugins/*', is_executable, + ['README', 'mk_filestats.pyc', 'mk_jolokia.pyc', 'mk_docker.pyc']), ('checks/*', is_not_executable, []), ('checkman/*', is_not_executable, []), ('inventory/*', is_not_executable, []),

5 years, 7 months

Improve linter script.

by Sven Panne

Module: check_mk Branch: master Commit: 831152369a7548432dacd80f7d219534b65c1454 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=831152369a7548… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 21 08:12:56 2019 +0100 Improve linter script. Change-Id: Ia8c26293171ccb1ec4538c93cb41895aebf0d002 --- scripts/run-cxx-linter | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/run-cxx-linter b/scripts/run-cxx-linter index ef5ff68..4c76662 100755 --- a/scripts/run-cxx-linter +++ b/scripts/run-cxx-linter @@ -3,6 +3,13 @@ set -e TARGET=$1 PATCHSET_REVISION=$2 +# To really compute *only* the files which need checking, we better make sure +# that our project is up-to-date without any further changes first (i.e. target +# "all-am"). Having an up-to-date project file before running a linter is a good +# idea, too (i.e. target "compile_commands.json"). The latter target implies the +# former, so we just do that. +make compile_commands.json + # ATTENTION! Extremely cunning hack ahead! Find out which files have been # changed in the current directory for the given commit. Transform those file # names into --what-if=... options for make and do a dry run with them. This

5 years, 7 months

views/inventory.py: make use of deecorator

by Moritz Kiemer

Module: check_mk Branch: master Commit: 768f6ca8601bbd390a733f505fd127df9646fd5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=768f6ca8601bbd… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Feb 20 10:51:58 2019 +0100 views/inventory.py: make use of deecorator side effect: properly handle '0' cases. Change-Id: Iad8cfcbd039fa41b68ca107c9a709ede5c0465e4 --- cmk/gui/plugins/views/inventory.py | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 8f9372d..958aa45 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -305,8 +305,6 @@ def inv_paint_generic(v): @decorate_inv_paint def inv_paint_hz(hz): - if hz is None: - return "", "" if hz < 10: return "number", "%.2f" % hz elif hz < 100: @@ -386,9 +384,7 @@ def _nic_speed_human_readable(bits_per_second): @decorate_inv_paint def inv_paint_nic_speed(bits_per_second): - if bits_per_second: - return "number", _nic_speed_human_readable(int(bits_per_second)) - return "", "" + return "number", _nic_speed_human_readable(int(bits_per_second)) @decorate_inv_paint @@ -458,38 +454,28 @@ def inv_paint_route_type(rt): @decorate_inv_paint def inv_paint_volt(volt): - if volt: - return "number", "%.1f V" % volt - return "", "" + return "number", "%.1f V" % volt @decorate_inv_paint def inv_paint_date(timestamp): - if timestamp: - date_painted = time.strftime("%Y-%m-%d", time.localtime(timestamp)) - return "number", "%s" % date_painted - return "", "" + date_painted = time.strftime("%Y-%m-%d", time.localtime(timestamp)) + return "number", "%s" % date_painted @decorate_inv_paint def inv_paint_date_and_time(timestamp): - if timestamp: - date_painted = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) - return "number", "%s" % date_painted - return "", "" + date_painted = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) + return "number", "%s" % date_painted @decorate_inv_paint def inv_paint_age(age): - if age: - return "number", cmk.utils.render.approx_age(age) - return "", "" + return "number", cmk.utils.render.approx_age(age) @decorate_inv_paint def inv_paint_bool(value): - if value is None: - return "", "" return "", (_("Yes") if value else _("No")) @@ -530,9 +516,6 @@ def inv_paint_timestamp_as_age_days(timestamp): @decorate_inv_paint def inv_paint_docker_labels(labels): - if labels is None: - return "", "" - return "labels", html.render_br().join(sorted(labels.split(", ")))

5 years, 7 months

Fixed i18n test after recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: de9c00d06797bc4b3e641c8cdbe4a8ff1930f79b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de9c00d06797bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 16:06:28 2019 +0100 Fixed i18n test after recent change Change-Id: I2f89a168b57e3631a0b8d4ea54687e6a717e4939 --- tests/unit/cmk/gui/test_i18n.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/cmk/gui/test_i18n.py b/tests/unit/cmk/gui/test_i18n.py index ce5c9e6..98d2894 100644 --- a/tests/unit/cmk/gui/test_i18n.py +++ b/tests/unit/cmk/gui/test_i18n.py @@ -12,7 +12,7 @@ import cmk.gui.i18n as i18n @pytest.fixture(autouse=True) def locale_paths(tmp_path, monkeypatch): - monkeypatch.setattr(cmk.utils.paths, "locale_dir", "%s/enterprise/locale" % cmk_path()) + monkeypatch.setattr(cmk.utils.paths, "locale_dir", "%s/locale" % cmk_path()) monkeypatch.setattr(cmk.utils.paths, "local_locale_dir", str(tmp_path / "locale"))

5 years, 7 months

Add script to run C/C++ linters in an incremental fashion.

by Sven Panne

Module: check_mk Branch: master Commit: 09dc8dbf563e45f06e8cbc6d8a1618941b577d57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09dc8dbf563e45… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 20 15:14:38 2019 +0100 Add script to run C/C++ linters in an incremental fashion. Change-Id: Ifa3e13ae049ac5c6b24cdb3bc49e08926c2e2cd9 --- livestatus/src/Makefile.am | 5 +++-- scripts/run-cxx-linter | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 6f7cc24..920378d 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -178,11 +178,12 @@ compile_commands.json: Makefile $(wildcard *.cc *.h) $(BEAR) $(MAKE) -j4 tidy: compile_commands.json - $(RUN_CLANG_TIDY) -quiet -j6 + $(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK) iwyu: compile_commands.json - $(IWYU_TOOL) --output-format=clang -p . -- --mapping_file=$(abs_top_srcdir)/livestatus/iwyu-mappings/check_mk.imp + $(IWYU_TOOL) --output-format=clang -p . $(FILES_TO_CHECK) -- --mapping_file=$(abs_top_srcdir)/livestatus/iwyu-mappings/check_mk.imp +# NOTE: cppcheck seems to ignore files on the command line when --project=... is given. :-P cppcheck: compile_commands.json $(CPPCHECK) -UCMC --enable=all --suppressions-list=cppcheck-suppressions.txt --inline-suppr --project=compile_commands.json --quiet --template=gcc diff --git a/scripts/run-cxx-linter b/scripts/run-cxx-linter new file mode 100755 index 0000000..ef5ff68 --- /dev/null +++ b/scripts/run-cxx-linter @@ -0,0 +1,27 @@ +#! /bin/sh +set -e +TARGET=$1 +PATCHSET_REVISION=$2 + +# ATTENTION! Extremely cunning hack ahead! Find out which files have been +# changed in the current directory for the given commit. Transform those file +# names into --what-if=... options for make and do a dry run with them. This +# outputs the compilation commands needed, which we massage a bit with grep and +# sed to finally find out which C/C++ we need to check. Brilliant! :-D ;-) +FILES_TO_CHECK=$(make --dry-run \ + $(git diff-tree --no-commit-id --name-only -r --relative "${PATCHSET_REVISION}" | \ + sed 's/$.*$/--what-if=\1/') \ + all-am | \ + grep " || echo './'\`" | \ + sed "s,.* || echo '\\./'\`,,") + +if test -z "${FILES_TO_CHECK}"; then + echo "==================== nothing to do" + exit 0 +fi + +echo "==================== files to check:" +echo "${FILES_TO_CHECK}" + +echo "==================== ${TARGET}" +make ${TARGET} FILES_TO_CHECK="$(echo ${FILES_TO_CHECK})"

5 years, 7 months

7178 German translation is now available in all Check_MK Editions

by Lars Michelsen

Module: check_mk Branch: master Commit: 910f4bceca9df2317fcbd6d6d0724400e6b9bd35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=910f4bceca9df2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 14:33:18 2019 +0100 7178 German translation is now available in all Check_MK Editions The German translation of the the Check_MK user interface is now available to the users of all Check_MK editions. Change-Id: Id96cc3d00033424f9a0520baebd9ad7396ef7b3e --- .werks/7178 | 11 + Makefile | 4 +- locale/.f12 | 19 + locale/.gitignore | 2 + locale/LIESMICH-BEGRIFFE | 113 + locale/Makefile | 61 + locale/add-authors | 118 + locale/blame | 173 + locale/de/LC_MESSAGES/multisite.po | 55417 ++++++++++++++++++++++++++++++++++ locale/de/alias | 1 + locale/header | 36 + locale/ro/LC_MESSAGES/multisite.po | 27756 +++++++++++++++++ locale/ro/alias | 1 + omd/packages/check_mk/check_mk.make | 10 +- 14 files changed, 83718 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=910f4bceca…

5 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019