Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: ecc6ede26fa4c693e02c62c4b1290497af727466 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc6ede26fa4c6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 15:05:14 2019 +0200 mk_mongodb: refactor I: main() CMK-1885 Change-Id: I07d1ed2339674040d259c3070da49339f1c8df70 --- agents/plugins/mk_mongodb | 354 ++++++++++++++++++++++++---------------------- 1 file changed, 181 insertions(+), 173 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ecc6ede26f…

5 years, 3 months

7389 FIX check_http: Enable SSL/TLS hostname extension support by default

by Moritz Kiemer

Module: check_mk Branch: master Commit: b325aafa11e448547f2b1d5b29068263022b9403 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b325aafa11e448… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 11:08:24 2019 +0200 7389 FIX check_http: Enable SSL/TLS hostname extension support by default Previously users had to {enable SSL/TLS hostname extension support} (SNI) explicitly. Omiting the option could result in unexpectedly checking different content/certificates than the {host address} option would suggest. We now assume users want SNI support. Users that relied on the previous behaviour of disabled SNI can disable SNI explicitly useing the option {Advanced: Disable SSL/TLS hostname extension support (SNI)}. Change-Id: Icbc6fd063c93e510b91b119c89894acc3ebbd069 --- .werks/7389 | 15 +++++++++++ checks/check_http | 25 +++++++------------ cmk/gui/plugins/wato/active_checks.py | 17 +++++++------ tests/unit/checks/test_check_http.py | 47 ++++++++++++++++++++++++++++------- 4 files changed, 72 insertions(+), 32 deletions(-) diff --git a/.werks/7389 b/.werks/7389 new file mode 100644 index 0000000..066ae8f --- /dev/null +++ b/.werks/7389 @@ -0,0 +1,15 @@ +Title: check_http: Enable SSL/TLS hostname extension support by default +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1554282151 +Class: fix + +Previously users had to {enable SSL/TLS hostname extension support} (SNI) +explicitly. Omiting the option could result in unexpectedly checking +different content/certificates than the {host address} option would suggest. +We now assume users want SNI support. Users that relied on the previous +behaviour of disabled SNI can disable SNI explicitly useing the option +{Advanced: Disable SSL/TLS hostname extension support (SNI)}. diff --git a/checks/check_http b/checks/check_http index 7f9b75c..3d86c19 100644 --- a/checks/check_http +++ b/checks/check_http @@ -58,8 +58,7 @@ def _transform_check_http(params): if key in mode: host_settings[key] = mode.pop(key) - if "sni" in mode: - transformed["sni"] = mode.pop("sni") + mode.pop("sni", None) return transformed @@ -94,8 +93,8 @@ def _get_proxy(params): return ProxySettings(proxy.get("address"), proxy.get("port"), auth) -def _certificate_args(host, proxy, settings, sni_flag): - args = [] +def _certificate_args(host, proxy, settings): + args = ['-H', host.address] if "cert_days" in settings: # legacy behavior @@ -107,17 +106,12 @@ def _certificate_args(host, proxy, settings, sni_flag): if proxy: args += ['--ssl', '-j', 'CONNECT'] - elif sni_flag: - args += ['-H', host.address] return args -def _url_args(host, proxy, settings): - args = [] - - if "virthost" in settings: - args += ["-H", settings["virthost"]] +def _url_args(host, _proxy, settings): + args = ["-H", settings.get("virthost", host.address)] if "uri" in settings: args += ['-u', settings["uri"]] @@ -198,12 +192,12 @@ def _url_args(host, proxy, settings): return args -def _common_args(host, proxy, sni_flag): +def _common_args(host, proxy, params): args = [] if host.family == 'ipv6': args += ['-6'] - if sni_flag: + if not params.get("disable_sni"): args += ['--sni'] if proxy and proxy.auth: args += ["-b", proxy.auth] @@ -231,13 +225,12 @@ def check_http_arguments(params): host = _get_host(params) proxy = _get_proxy(params) - sni_flag = bool(params.get("sni")) if mode_name == 'cert': - args = _certificate_args(host, proxy, settings, sni_flag) + args = _certificate_args(host, proxy, settings) else: args = _url_args(host, proxy, settings) - return args + _common_args(host, proxy, sni_flag) + return args + _common_args(host, proxy, params) def check_http_description(params): diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index 6ac5d8f..db89d54 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -1021,11 +1021,6 @@ class RulespecActiveChecksHttp(HostRulespec): allow_empty=False)), ("host", self._hostspec()), ("proxy", self._proxyspec()), - ("sni", - FixedValue( - value=True, - totext="", - title=_("Enable SSL/TLS hostname extension support (SNI)"))), ("mode", CascadingDropdown( title=_("Mode of the Check"), @@ -1274,6 +1269,15 @@ class RulespecActiveChecksHttp(HostRulespec): )), ], )), + ("disable_sni", + FixedValue( + value=True, + totext="", + title=_("Advanced: Disable SSL/TLS hostname extension support (SNI)"), + help=_( + "In earlier versions of Check_MK users had to enable SNI explicitly." + " We now assume users allways want SNI support. If you don't, you" + " can disable it with this option."))), ], required_keys=["name", "host", "mode"], validate=self._validate_all, @@ -1332,8 +1336,7 @@ class RulespecActiveChecksHttp(HostRulespec): if key in mode: host_settings[key] = mode.pop(key) - if "sni" in mode: - transformed["sni"] = mode.pop("sni") + mode.pop("sni", None) return transformed diff --git a/tests/unit/checks/test_check_http.py b/tests/unit/checks/test_check_http.py index 5426dc3..f6e316b 100644 --- a/tests/unit/checks/test_check_http.py +++ b/tests/unit/checks/test_check_http.py @@ -19,6 +19,7 @@ pytestmark = pytest.mark.checks '/images', '--onredirect=follow', '-L', + '--sni', '-p', 80, 'www.test123.de', @@ -43,6 +44,7 @@ pytestmark = pytest.mark.checks '--extended-perfdata', '-j', 'CONNECT', + '--sni', '163.172.86.64', 'www.test123.de:3128', ], @@ -53,7 +55,7 @@ pytestmark = pytest.mark.checks 'cert_host': 'www.test123.com', 'port': '42', }), - ['-C', '10,20', '-p', '42', 'www.test123.com'], + ['-H', 'www.test123.com', '-C', '10,20', '--sni', '-p', '42', 'www.test123.com'], ), ( (None, { @@ -62,7 +64,10 @@ pytestmark = pytest.mark.checks 'port': '42', 'proxy': 'p.roxy', }), - ['-C', '10,20', '--ssl', '-j', 'CONNECT', 'p.roxy', 'www.test123.com:42'], + [ + '-H', 'www.test123.com', '-C', '10,20', '--ssl', '-j', 'CONNECT', '--sni', 'p.roxy', + 'www.test123.com:42' + ], ), ( (None, { @@ -71,7 +76,10 @@ pytestmark = pytest.mark.checks 'port': '42', 'proxy': 'p.roxy:23', }), - ['-C', '10,20', '--ssl', '-j', 'CONNECT', '-p', '23', 'p.roxy', 'www.test123.com:42'], + [ + '-H', 'www.test123.com', '-C', '10,20', '--ssl', '-j', 'CONNECT', '--sni', '-p', '23', + 'p.roxy', 'www.test123.com:42' + ], ), ( (None, { @@ -81,8 +89,29 @@ pytestmark = pytest.mark.checks 'proxy': '[dead:beef::face]:23', }), [ - '-C', '10,20', '--ssl', '-j', 'CONNECT', '-p', '23', '[dead:beef::face]', - 'www.test123.com:42' + '-H', 'www.test123.com', '-C', '10,20', '--ssl', '-j', 'CONNECT', '--sni', '-p', '23', + '[dead:beef::face]', 'www.test123.com:42' + ], + ), + ( + { + 'host': { + "address": 'www.test123.com', + "port": 42, + "address_family": 'ipv6' + }, + 'proxy': { + "address": '[dead:beef::face]', + "port": 23 + }, + 'mode': ('cert', { + 'cert_days': (10, 20) + }), + 'disable_sni': True + }, + [ + '-H', 'www.test123.com', '-C', '10,20', '--ssl', '-j', 'CONNECT', '-6', '-p', 23, + '[dead:beef::face]', 'www.test123.com:42' ], ), ( @@ -90,26 +119,26 @@ pytestmark = pytest.mark.checks 'virthost': ("virtual.host", True), 'proxy': "foo.bar", }), - ['-H', 'virtual.host', 'foo.bar', 'virtual.host'], + ['-H', 'virtual.host', '--sni', 'foo.bar', 'virtual.host'], ), ( (None, { 'virthost': ("virtual.host", False), 'proxy': "foo.bar", }), - ['-H', 'virtual.host', 'foo.bar', 'virtual.host'], + ['-H', 'virtual.host', '--sni', 'foo.bar', 'virtual.host'], ), ( (None, { 'virthost': ("virtual.host", True), }), - ['-H', 'virtual.host', 'virtual.host'], + ['-H', 'virtual.host', '--sni', 'virtual.host'], ), ( (None, { 'virthost': ("virtual.host", False), }), - ['-H', 'virtual.host', '$_HOSTADDRESS_4$'], + ['-H', 'virtual.host', '--sni', '$_HOSTADDRESS_4$'], ), ]) def test_check_http_argument_parsing(check_manager, params, expected_args):

5 years, 3 months

7391 FIX mk_mongodb: don't crash upon missing flushing info

by Moritz Kiemer

Module: check_mk Branch: master Commit: 22e0ca35b184575f85b8496915e7fb3f985a2063 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22e0ca35b18457… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 15:42:54 2019 +0200 7391 FIX mk_mongodb: don't crash upon missing flushing info The plugin no longer crashes the server does not report info on 'backgroundFlushing', as is the case for MongoDB 4.0 onwards. CMK-1885 Change-Id: Ieda32ee6d42645e1ce06fee1c20d30141abbad4f --- .werks/7391 | 11 +++++++++++ agents/plugins/mk_mongodb | 16 ++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.werks/7391 b/.werks/7391 new file mode 100644 index 0000000..135dd18 --- /dev/null +++ b/.werks/7391 @@ -0,0 +1,11 @@ +Title: mk_mongodb: don't crash upon missing flushing info +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554298869 +Class: fix + +The plugin no longer crashes the server does not report info +on 'backgroundFlushing', as is the case for MongoDB 4.0 onwards. diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index a0f1f77..fc45b9a 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -18,6 +18,17 @@ import time import pymongo # pylint: disable=import-error +def section_flushing(server_status): + # key is depricated for MongoDB 4.0 + flushing_info = server_status.get("backgroundFlushing") + if flushing_info is None: + return + sys.stdout.write("<<<mongodb_flushing>>>\n") + sys.stdout.write("average_ms %s\n" % flushing_info["average_ms"]) + sys.stdout.write("last_ms %s\n" % flushing_info["last_ms"]) + sys.stdout.write("flushed %s\n" % flushing_info["flushes"]) + + def main(): # pylint: disable=too-many-branches,too-many-locals # might be implemented in the future.. host = None @@ -110,10 +121,7 @@ def main(): # pylint: disable=too-many-branches,too-many-locals for key, value in global_lock_info[what].items(): sys.stdout.write("%s %s %s\n" % (what, key, value)) - sys.stdout.write("<<<mongodb_flushing>>>\n") - sys.stdout.write("average_ms %s\n" % server_status["backgroundFlushing"]["average_ms"]) - sys.stdout.write("last_ms %s\n" % server_status["backgroundFlushing"]["last_ms"]) - sys.stdout.write("flushed %s\n" % server_status["backgroundFlushing"]["flushes"]) + section_flushing(server_status) # Unused # server_version = tuple(con.server_info()['version'].split('.'))

5 years, 3 months

mk_mongodb: initially set read_preference

by Moritz Kiemer

Module: check_mk Branch: master Commit: d499ac1ca52190d05e2c2cb5c9d17deeb3f1cc9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d499ac1ca52190… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 15:30:55 2019 +0200 mk_mongodb: initially set read_preference according to CMK-1885 "read_preference" becomes a read-only attribute with version 3.0 Change-Id: Iaf5aa1a11ac7782a60245e4fc4ecf086fc3baf87 --- agents/plugins/mk_mongodb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 489ba72..a0f1f77 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -24,15 +24,13 @@ def main(): # pylint: disable=too-many-branches,too-many-locals port = None try: - con = pymongo.MongoClient(host, port) + con = pymongo.MongoClient(host, port, read_preference=pymongo.ReadPreference.SECONDARY) try: # pylint: disable=no-member con = pymongo.database_names() except Exception: # pylint: disable=broad-except con = pymongo.MongoClient(None, None, read_preference=pymongo.ReadPreference.SECONDARY) - con.admin.read_preference = pymongo.ReadPreference.SECONDARY - # if user and passwd: # db = con["admin"] # if not db.authenticate(user, passwd):

5 years, 3 months

7390 FIX ipmi_sensors: Stop flooding syslog if no IPMI devices are present

by Moritz Kiemer

Module: check_mk Branch: master Commit: 6213efd0b5afd3beebe12fdb074d49b3cbfacce8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6213efd0b5afd3… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 12:01:50 2019 +0200 7390 FIX ipmi_sensors: Stop flooding syslog if no IPMI devices are present In case no IPMI device was present on a system, the system log was flooded with error messages. We no longer call ipmi-sensors if no IPMI devices are found. Considered IPMI devices are all that match "/dev/ipmi*" (in particular /dev/ipmi0, /dev/ipmi/0 and /dev/ipmidev/0). CMK-1884 Change-Id: I3a49a4e0ca3c609bff513a60442bb38e1c76cf2a --- .werks/7390 | 14 ++++++++++++++ agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.openwrt | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/7390 b/.werks/7390 new file mode 100644 index 0000000..4d15b3b --- /dev/null +++ b/.werks/7390 @@ -0,0 +1,14 @@ +Title: ipmi_sensors: Stop flooding syslog if no IPMI devices are present +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554283471 +Class: fix + +In case no IPMI device was present on a system, the system log was flooded +with error messages. +We no longer call ipmi-sensors if no IPMI devices are found. Considered IPMI +devices are all that match "/dev/ipmi*" (in particular /dev/ipmi0, /dev/ipmi/0 +and /dev/ipmidev/0). diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index b93d76d..b787fd1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -571,7 +571,7 @@ fi # IPMI data via ipmi-sensors (of freeipmi). Please make sure, that if you # have installed freeipmi that IPMI is really support by your hardware. -if type ipmi-sensors >/dev/null +if (type ipmi-sensors && ls /dev/ipmi*) &>/dev/null then echo '<<<ipmi_sensors>>>' # Newer ipmi-sensors version have new output format; Legacy format can be used diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 6661bf5..8deb826 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -410,7 +410,7 @@ fi # IPMI data via ipmi-sensors (of freeipmi). Please make sure, that if you # have installed freeipmi that IPMI is really support by your hardware. -if type ipmi-sensors >/dev/null +if (type ipmi-sensors && ls /dev/ipmi*) &>/dev/null then echo '<<<ipmi_sensors>>>' # Newer ipmi-sensors version have new output format; Legacy format can be used

5 years, 3 months

Temporarily disable custom variable test for nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: 5bedef43c1f8a27b5a99306945c779f0e02a4327 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bedef43c1f8a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 20:55:55 2019 +0200 Temporarily disable custom variable test for nagios core Change-Id: Ie103378833964f632dc273a2f2d1045ebf85fdd6 --- tests/integration/livestatus/test_livestatus.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/livestatus/test_livestatus.py b/tests/integration/livestatus/test_livestatus.py index 4435e5a..0241f31 100644 --- a/tests/integration/livestatus/test_livestatus.py +++ b/tests/integration/livestatus/test_livestatus.py @@ -140,6 +140,9 @@ def configure_service_tags(site, web): def test_service_custom_variables(configure_service_tags, default_cfg, site): + if default_cfg.core == "nagios": + pytest.skip("Disabled until tags column is supported by play nagios") + rows = site.live.query("GET services\n" "Columns: custom_variables tags\n" "Filter: host_name = livestatus-test-host\n"

5 years, 3 months

Access HostConfig() only through ConfigCache.get_host_config()

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e3fbe000ddedfaa9ecb974034687b8165f40546 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e3fbe000ddedf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 10:02:26 2019 +0200 Access HostConfig() only through ConfigCache.get_host_config() Cleaned up tests on the way Change-Id: Id5390a56000245a64a26ed28606f1cb4db6dcfff --- cmk_base/check_table.py | 2 +- tests/unit/cmk_base/test_config.py | 109 ++++++++++++++----------------------- 2 files changed, 41 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e3fbe000d…

5 years, 3 months

ConfigCache: Manage HostConfig instances during lifetime

by Lars Michelsen

Module: check_mk Branch: master Commit: eca0e13a18ed01200647cd4074f8fa4628d74866 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca0e13a18ed01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 09:50:41 2019 +0200 ConfigCache: Manage HostConfig instances during lifetime The base code may use config_cache.get_host_config(hostname) to get a host configuration instance of the given host name. The ConfigCache object ensures that only a single object is created per host. Change-Id: I9b6f285ff5db064318c20eee005206f1ec8ea14f --- cmk_base/config.py | 15 +++++++++++++++ tests/unit/cmk_base/test_config.py | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index a306b9f..f43a361 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2927,6 +2927,21 @@ class ConfigCache(object): # It is used to determine the best rule evualation method self._all_processed_hosts_similarity = 1 + # Keep HostConfig instances created with the current configuration cache + self._host_configs = {} + + def get_host_config(self, hostname): + """Returns a HostConfig instance for the given host + + It lazy initializes the host config object and caches the objects during the livetime + of the ConfigCache.""" + host_config = self._host_configs.get(hostname) + if host_config: + return host_config + + host_config = self._host_configs[hostname] = HostConfig(hostname) + return host_config + def _collect_hosttags(self): for tagged_host in all_hosts + clusters.keys(): parts = tagged_host.split("|") diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index f18895b..4994423 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -386,3 +386,12 @@ def test_tags_of_service(monkeypatch): assert config.get_config_cache().tags_of_service("test-host", "CPU load") == { "tag_group1": "val1" } + + +def test_config_cache_get_host_config(): + cache = config.ConfigCache() + assert cache._host_configs == {} + + host_config = cache.get_host_config("xyz") + assert isinstance(host_config, config.HostConfig) + assert host_config is cache.get_host_config("xyz")

5 years, 3 months

Remove wayward print statement from check

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9498b884153483fec525e2fb10efbe39c8b7a236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9498b884153483… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Apr 3 15:56:10 2019 +0200 Remove wayward print statement from check Change-Id: Ia28b6cad534e8aeae9b6b27462cbab533d786596 --- checks/checkpoint_tunnels | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/checkpoint_tunnels b/checks/checkpoint_tunnels index cb3df28..90fac6f 100644 --- a/checks/checkpoint_tunnels +++ b/checks/checkpoint_tunnels @@ -49,7 +49,6 @@ def inventory_checkpoint_tunnels(info): def check_checkpoint_tunnels(item, params, info): - print params for peer, status in info: if peer == item: state = params[tunnel_states[status]]

5 years, 3 months

[CMK-1890] - minor fixes in build process

by Sergey Kipnis

Module: check_mk Branch: master Commit: 473bf1f11f51c02113f302e4ebc830905ce307e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473bf1f11f51c0… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Wed Apr 3 12:05:04 2019 +0200 [CMK-1890] - minor fixes in build process - removed annoying warning(should be ignored) - correctly touched update file Change-Id: Id4cbc39a2f9806041837a0767f02099bdf2d02e5 --- agents/wnx/build_release.cmd | 13 ++++++++----- agents/wnx/install/install.wixproj | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/agents/wnx/build_release.cmd b/agents/wnx/build_release.cmd index 9dcda5c..7351b85 100644 --- a/agents/wnx/build_release.cmd +++ b/agents/wnx/build_release.cmd @@ -69,7 +69,7 @@ set el=%errorlevel% @del save.tmp > nul git update-index --no-assume-unchanged install/resources/check_mk.dat > nul if not %el% == 0 powershell Write-Host "Failed Install build" -Foreground Red && exit 88 -copy %REMOTE_MACHINE%\check_mk_service.msi %REMOTE_MACHINE%\check_mk_agent_update.msi +move %REMOTE_MACHINE%\check_mk_service.msi %REMOTE_MACHINE%\check_mk_agent_update.msi %msbuild% wamain.sln /t:install /p:Configuration=Release,Platform=x64 @@ -93,11 +93,14 @@ powershell Write-Host "Killing msi in artefacts" -Foreground Red call %cur_dir%\clean_artefacts.cmd exit 100 :end -copy %REMOTE_MACHINE%\check_mk_service.msi %REMOTE_MACHINE%\check_mk_agent.msi -copy %REMOTE_MACHINE%\check_mk_service32.exe %REMOTE_MACHINE%\check_mk_agent.exe -copy %REMOTE_MACHINE%\check_mk_service64.exe %REMOTE_MACHINE%\check_mk_agent-64.exe +pushd %REMOTE_MACHINE% + +copy check_mk_service.msi check_mk_agent.msi +copy check_mk_service32.exe check_mk_agent.exe +copy check_mk_service64.exe check_mk_agent-64.exe rem touching update msi -copy %REMOTE_MACHINE%\check_mk_agent_update.msi /B+ ,,/Y > nul +copy check_mk_agent_update.msi /B+ ,,/Y > nul +popd diff --git a/agents/wnx/install/install.wixproj b/agents/wnx/install/install.wixproj index 23f9c58..df91439 100644 --- a/agents/wnx/install/install.wixproj +++ b/agents/wnx/install/install.wixproj @@ -15,6 +15,9 @@ <DefineConstants>$(Configuration)=1</DefineConstants> <WixVariables>$(Configuration)=1</WixVariables> <SuppressSpecificWarnings>1076</SuppressSpecificWarnings> + <LinkerAdditionalOptions> + </LinkerAdditionalOptions> + <CompilerAdditionalOptions>-sw1091</CompilerAdditionalOptions> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>..\build\install\$(Configuration)\</OutputPath> @@ -23,6 +26,9 @@ <WixVariables>$(Configuration)=1</WixVariables> <SuppressPdbOutput>True</SuppressPdbOutput> <SuppressSpecificWarnings>1076</SuppressSpecificWarnings> + <LinkerAdditionalOptions> + </LinkerAdditionalOptions> + <CompilerAdditionalOptions>-sw1091</CompilerAdditionalOptions> </PropertyGroup> <ItemGroup> <Compile Include="InstallFolderDialog.wxs" />

5 years, 3 months

← Newer
1
...
48
49
50
51
52
53
54
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019