Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

GUI CSS: Moved commented out views styles from classic to facelift theme ( CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 41ed25b912a6334f0ae131a3468921435990eff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41ed25b912a633… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Apr 4 11:29:29 2019 +0200 GUI CSS: Moved commented out views styles from classic to facelift theme (CMK-1171) Change-Id: Ia37585b3be678c86ada8f7988c1ddb21b8cb71d6 --- web/htdocs/themes/facelift/scss/_views.scss | 973 ++++++++++++++++++++++++++++ web/htdocs/themes/facelift/theme.scss | 1 + 2 files changed, 974 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=41ed25b912…

5 years, 6 months

7048 mem.linux: Optional levels for corrupted memory

by Florian Kromer

Module: check_mk Branch: master Commit: d841e0e38357fdba7fe09ba0dc582ff1ff903921 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d841e0e38357fd… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Mar 12 16:11:13 2019 +0100 7048 mem.linux: Optional levels for corrupted memory Previously the check status was either OK in case no RAM was corrupted or a custom check status (default: CRIT) in case RAM was corrupted dependent on the configuration of WATO rule Memory Swap usage on Linux, value Handle Hardware Corrupted Error. Now it is possible to configure the WARN and CRIT levels for the corrupted memory with the renamed WATO value Hardware Corrupted. Existing configurations of WATO rule value Handle Hardware Corrupted Error are converted to WATO rule value Hardware Corrupted (1, 1) for consistent behaviour. CMK-1365 Change-Id: I209123dc2c436ec3d6181c27f1f6cfd3cd0f00c8 --- .werks/7048 | 16 +++ checkman/mem.linux | 12 ++- checks/mem | 14 ++- .../plugins/wato/check_parameters/memory_linux.py | 79 ++++++++------- .../unit/checks/generictests/datasets/mem_linux.py | 111 +++++++++++++++++++++ 5 files changed, 191 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d841e0e383…

5 years, 6 months

fix freeze of current time during regression test creation

by Florian Kromer

Module: check_mk Branch: master Commit: fc503afa6b3ca18e2ea4d0be800680858fda9d35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc503afa6b3ca1… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Apr 4 14:59:35 2019 +0200 fix freeze of current time during regression test creation Change-Id: Icd5ac310d251a5320665ee3a91c4a512566e827b --- tests/unit/checks/generictests/__init__.py | 5 +++-- tests/unit/checks/generictests/regression.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/unit/checks/generictests/__init__.py b/tests/unit/checks/generictests/__init__.py index 8566940..6dc0abf 100644 --- a/tests/unit/checks/generictests/__init__.py +++ b/tests/unit/checks/generictests/__init__.py @@ -38,8 +38,9 @@ check function(s)). In the following, 'sc-dict' refers to a dictionary with Some more advanced ones are * `freeze_time` : [str] Mocked time. - If present, its value are passed to - `freezegun.freeze_time` + If present its value is passed to `freezegun.freeze_time`. + If you specify the empty string it will be replaced by the + current time if processed by generictests.regression. * `extra_sections` : [sc-dict] Extra sections that are appended to the info / parsed variable. If present, its values are extra sections (the actual diff --git a/tests/unit/checks/generictests/regression.py b/tests/unit/checks/generictests/regression.py index ce1d580..5672aa0 100644 --- a/tests/unit/checks/generictests/regression.py +++ b/tests/unit/checks/generictests/regression.py @@ -39,6 +39,7 @@ Make sure the file(s name) is a valid python module: import os import sys import pprint +import time from importlib import import_module import generictests.run @@ -61,7 +62,10 @@ class WritableDataset(object): ) self.checkname = init_dict.get('checkname', None) self.info = init_dict.get('info', None) - self.freeze_time = init_dict.get('freeze_time', None) + freeze_time = init_dict.get('freeze_time', None) + if freeze_time == "": + freeze_time = time.strftime("%Y-%m-%d %H:%M:%S") + self.freeze_time = freeze_time self.parsed = init_dict.get('parsed', None) self.discovery = init_dict.get('discovery', {}) self.checks = {}

5 years, 6 months

GUI CSS: Deployed remaining dashboard styles and moved according ones away from _main.scss (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: aacfcd3afc1cb5cee4947ed6d04060d336dd3802 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aacfcd3afc1cb5… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Apr 4 09:57:29 2019 +0200 GUI CSS: Deployed remaining dashboard styles and moved according ones away from _main.scss (CMK-1171) Change-Id: Ibee64e18fd53a010e9153bdb007649b5706ec5e0 --- web/htdocs/themes/facelift/scss/_dashboard.scss | 886 ++++++++++++------------ web/htdocs/themes/facelift/scss/_main.scss | 16 - web/htdocs/themes/facelift/theme.scss | 1 - 3 files changed, 438 insertions(+), 465 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=aacfcd3afc…

5 years, 6 months

GUI CSS: Refactored dashboard styles to nested structure meeting sasslint requirements (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 48eaa03e4aa014eaaaacd3fd0cfbe4d6f88641da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48eaa03e4aa014… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Apr 4 10:27:50 2019 +0200 GUI CSS: Refactored dashboard styles to nested structure meeting sasslint requirements (CMK-1171) Change-Id: Id4c820a1e9a44f4ec56b8b02e5b5971411f7419f --- web/htdocs/themes/facelift/scss/_dashboard.scss | 423 ++++++++++++------------ 1 file changed, 209 insertions(+), 214 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=48eaa03e4a…

5 years, 6 months

7362 FIX AWS/RDS services: Use DB identifier instead of DB name as item; DB name may be missing or not set

by Simon Betz

Module: check_mk Branch: master Commit: 4669f0b44c2cd857fa5aaf2f69bf5f6e77649f9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4669f0b44c2cd8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 4 10:07:14 2019 +0200 7362 FIX AWS/RDS services: Use DB identifier instead of DB name as item; DB name may be missing or not set You have to perform a re-discovery in order to create new items and remove old items. Configured rules for these services must also be adapted. Change-Id: Ib2aba8a4e5181f76465a3b4bdb5d34f1258caf77 --- .werks/7362 | 13 +++++++++++++ checks/aws_rds | 6 +++--- checks/aws_rds_summary | 8 ++++---- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.werks/7362 b/.werks/7362 new file mode 100644 index 0000000..6a37b29 --- /dev/null +++ b/.werks/7362 @@ -0,0 +1,13 @@ +Title: AWS/RDS services: Use DB identifier instead of DB name as item; DB name may be missing or not set +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1554365041 + +You have to perform a re-discovery in order to create new items +and remove old items. Configured rules for these services must +also be adapted. diff --git a/checks/aws_rds b/checks/aws_rds index 66194ce..3644373 100644 --- a/checks/aws_rds +++ b/checks/aws_rds @@ -57,7 +57,7 @@ def parse_aws_rds(info): "AllocatedStorage", ], parse_aws(info), - extra_keys=['DBName']).itervalues(): + extra_keys=['DBInstanceIdentifier']).itervalues(): for key, factor in [ ('AllocatedStorage', 1.074e+9), @@ -69,7 +69,7 @@ def parse_aws_rds(info): metrics[key] *= factor except KeyError: pass - parsed.setdefault(metrics['DBName'], metrics) + parsed.setdefault(metrics['DBInstanceIdentifier'], metrics) return parsed @@ -194,7 +194,7 @@ def check_aws_rds_network_io(item, params, metrics): "", "", "", - metrics.get('DBName', item), + metrics.get('DBInstanceIdentifier', item), "", ]] return check_if_common_single(item, params, interfaces) diff --git a/checks/aws_rds_summary b/checks/aws_rds_summary index a93b66c..2e3aec8 100644 --- a/checks/aws_rds_summary +++ b/checks/aws_rds_summary @@ -27,7 +27,7 @@ def parse_aws_rds_summary(info): try: - return {instance['DBName']: instance for instance in parse_aws(info)} + return {instance['DBInstanceIdentifier']: instance for instance in parse_aws(info)} except IndexError: return {} @@ -75,10 +75,10 @@ check_info['aws_rds_summary'] = { @get_parsed_item_data def check_aws_rds_summary_db(item, params, data): - db_id = data['DBInstanceIdentifier'] + db_name = data.get('DBName') pre_info = "" - if db_id is not None: - pre_info = "[%s] " % db_id + if db_name is not None: + pre_info = "[%s] " % db_name yield 0, '%sStatus: %s' % (pre_info, data['DBInstanceStatus']) multi_az = data.get('MultiAZ')

5 years, 6 months

Add new tests for HostConfig.is_usewalk_host

by Lars Michelsen

Module: check_mk Branch: master Commit: 96e7b75bdad969cd2322ba635ade2153c253fa60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e7b75bdad969… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 15:08:05 2019 +0200 Add new tests for HostConfig.is_usewalk_host Change-Id: I06f6919dfa2fc7a6061395d0c116f63f1276c5b0 --- tests/unit/cmk_base/test_config.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 229cf03..570ed0c 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -176,6 +176,23 @@ def test_is_snmp_host(monkeypatch, hostname, tags, result): assert config_cache.get_host_config(hostname).is_snmp_host == result +def test_is_not_usewalk_host(monkeypatch): + config_cache = _setup_host(monkeypatch, "xyz", ["abc"]) + host_config = config_cache.get_host_config("xyz") + + assert host_config.is_usewalk_host is False + + +def test_is_usewalk_host(monkeypatch): + monkeypatch.setattr(config, "usewalk_hosts", [ + (["xyz"], config.ALL_HOSTS, {}), + ]) + + config_cache = _setup_host(monkeypatch, "xyz", ["abc"]) + host_config = config_cache.get_host_config("xyz") + assert host_config.is_usewalk_host is False + + @pytest.mark.parametrize("hostname,tags,result", [ ("testhost", [], False), ("testhost", ["tcp"], False),

5 years, 6 months

Cleaned up config module agent type related global functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 7574c607c5a57cb7225708c536a97207a03855ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7574c607c5a57c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 15:18:19 2019 +0200 Cleaned up config module agent type related global functions Change-Id: I6f589800c1a924ba90ad2b908968e5a9ed15e1bb --- cmk_base/config.py | 35 ----------------------------------- cmk_base/core_nagios.py | 6 ++++-- cmk_base/dump_host.py | 4 ++-- tests/unit/cmk_base/test_config.py | 5 ----- 4 files changed, 6 insertions(+), 44 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 3322fb7..f2e092f 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -820,41 +820,6 @@ def clusters_of(hostname): # -# Agent type -# - - -# TODO: Replace call sites with HostConfig access and remove this -def is_tcp_host(hostname): - return get_config_cache().get_host_config(hostname).is_tcp_host - - -# TODO: Replace call sites with HostConfig access and remove this -def is_ping_host(hostname): - return get_config_cache().get_host_config(hostname).is_ping_host - - -# TODO: Replace call sites with HostConfig access and remove this -def is_agent_host(hostname): - return get_config_cache().get_host_config(hostname).is_agent_host - - -# TODO: Replace call sites with HostConfig access and remove this -def is_dual_host(hostname): - return get_config_cache().get_host_config(hostname).is_dual_host - - -# TODO: Replace call sites with HostConfig access and remove this -def is_all_agents_host(hostname): - return get_config_cache().get_host_config(hostname).is_all_agents_host - - -# TODO: Replace call sites with HostConfig access and remove this -def is_all_special_agents_host(hostname): - return get_config_cache().get_host_config(hostname).is_all_special_agents_host - - -# # IPv4/IPv6 # diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 0abe81d..600b381 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -256,6 +256,8 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): outfile = cfg.outfile import cmk_base.check_table as check_table + host_config = config_cache.get_host_config(hostname) + # _____ # |___ / # |_ \ @@ -411,7 +413,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): if entries: # Skip Check_MK HW/SW Inventory for all ping hosts, even when the user has enabled # the inventory for ping only hosts - if acttype == "cmk_inv" and config.is_ping_host(hostname): + if acttype == "cmk_inv" and host_config.is_ping_host: continue cfg.active_checks_to_define.add(acttype) @@ -563,7 +565,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname, host_attrs): # Inventory checks - if user has configured them. if params["check_interval"] \ and not config.service_ignored(hostname, None, service_discovery_name) \ - and not config.is_ping_host(hostname): + and not host_config.is_ping_host: service_spec = { "use": config.inventory_check_template, "host_name": hostname, diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index aa8bb10..7e4067a 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -40,8 +40,8 @@ import cmk_base.checking as checking def dump_host(hostname): - config_cache = config.get_config_cache() + host_config = config_cache.get_host_config(hostname) console.output("\n") if config.is_cluster(hostname): @@ -99,7 +99,7 @@ def dump_host(hostname): for source in sources.get_data_sources(): agenttypes.append(source.describe()) - if config.is_ping_host(hostname): + if host_config.is_ping_host: agenttypes.append('PING only') console.output(tty.yellow + "Agent mode: " + tty.normal) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 570ed0c..3a65b18 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -145,7 +145,6 @@ def test_management_address_of(monkeypatch, attrs, result): ]) def test_is_tcp_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_tcp_host(hostname) == result assert config_cache.get_host_config(hostname).is_tcp_host == result @@ -161,7 +160,6 @@ def test_is_tcp_host(monkeypatch, hostname, tags, result): ]) def test_is_ping_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_ping_host(hostname) == result assert config_cache.get_host_config(hostname).is_ping_host == result @@ -203,7 +201,6 @@ def test_is_usewalk_host(monkeypatch): ]) def test_is_dual_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_dual_host(hostname) == result assert config_cache.get_host_config(hostname).is_dual_host == result @@ -216,7 +213,6 @@ def test_is_dual_host(monkeypatch, hostname, tags, result): ]) def test_is_all_agents_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_all_agents_host(hostname) == result assert config_cache.get_host_config(hostname).is_all_agents_host == result @@ -229,7 +225,6 @@ def test_is_all_agents_host(monkeypatch, hostname, tags, result): ]) def test_is_all_special_agents_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_all_special_agents_host(hostname) == result assert config_cache.get_host_config(hostname).is_all_special_agents_host == result

5 years, 6 months

Remove module level config.is_snmp_host

by Lars Michelsen

Module: check_mk Branch: master Commit: 072bac2b4da5f6f88b59276a93c875760c62dbfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=072bac2b4da5f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 15:02:54 2019 +0200 Remove module level config.is_snmp_host Change-Id: Id8347b0d6036cf1cc7507a56bc2e05117c3721a7 --- cmk_base/config.py | 9 +++------ cmk_base/data_sources/__init__.py | 16 ++++++++-------- cmk_base/ip_lookup.py | 6 ++++-- cmk_base/snmp.py | 5 ++++- tests/unit/cmk_base/test_config.py | 1 - 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 70c995e..3322fb7 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -830,11 +830,6 @@ def is_tcp_host(hostname): # TODO: Replace call sites with HostConfig access and remove this -def is_snmp_host(hostname): - return get_config_cache().get_host_config(hostname).is_snmp_host - - -# TODO: Replace call sites with HostConfig access and remove this def is_ping_host(hostname): return get_config_cache().get_host_config(hostname).is_ping_host @@ -1057,8 +1052,9 @@ def is_snmpv2or3_without_bulkwalk_host(hostname): return in_binary_hostlist(hostname, snmpv2c_hosts) +# TODO: Replace call sites with HostConfig access and remove this def is_usewalk_host(hostname): - return in_binary_hostlist(hostname, usewalk_hosts) + return get_config_cache().get_host_config(hostname).is_usewalk_host def is_inline_snmp_host(hostname): @@ -2756,6 +2752,7 @@ class HostConfig(object): # Basic types self.is_tcp_host = self._config_cache.in_binary_hostlist(hostname, tcp_hosts) self.is_snmp_host = self._config_cache.in_binary_hostlist(hostname, snmp_hosts) + self.is_usewalk_host = self._config_cache.in_binary_hostlist(hostname, usewalk_hosts) if "piggyback" in self.tags: self.is_piggyback_host = True diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 60f7d5c..4602f4d 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -109,7 +109,7 @@ class DataSources(object): def _initialize_data_sources(self): self._sources = {} - if config.is_cluster(self._hostname): + if self._host_config.is_cluster: # Cluster hosts do not have any actual data sources # Instead all data is provided by the nodes return @@ -119,17 +119,17 @@ class DataSources(object): self._initialize_management_board_data_sources() def _initialize_agent_based_data_sources(self): - if config.is_all_agents_host(self._hostname): + if self._host_config.is_all_agents_host: source = self._get_agent_data_source(ignore_special_agents=True) source.set_main_agent_data_source() self._add_source(source) self._add_sources(self._get_special_agent_data_sources()) - elif config.is_all_special_agents_host(self._hostname): + elif self._host_config.is_all_special_agents_host: self._add_sources(self._get_special_agent_data_sources()) - elif config.is_tcp_host(self._hostname): + elif self._host_config.is_tcp_host: source = self._get_agent_data_source() source.set_main_agent_data_source() self._add_source(source) @@ -138,7 +138,7 @@ class DataSources(object): self._add_source(PiggyBackDataSource(self._hostname, self._ipaddress)) def _initialize_snmp_data_sources(self): - if config.is_snmp_host(self._hostname): + if self._host_config.is_snmp_host: self._add_source(SNMPDataSource(self._hostname, self._ipaddress)) def _initialize_management_board_data_sources(self): @@ -162,13 +162,13 @@ class DataSources(object): self._sources[source.id()] = source def describe_data_sources(self): - if config.is_all_agents_host(self._hostname): + if self._host_config.is_all_agents_host: return "Contact Check_MK Agent and use all enabled special agents" - elif config.is_all_special_agents_host(self._hostname): + elif self._host_config.is_all_special_agents_host: return "Use all enabled special agents" - elif config.is_tcp_host(self._hostname): + elif self._host_config.is_tcp_host: return "Contact either Check_MK Agent or use a single special agent" return "No agent" diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index 6c3f998..36621e4 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -75,9 +75,11 @@ def lookup_ip_address(hostname, family=None): if config.fake_dns: return config.fake_dns + host_config = config.get_config_cache().get_host_config(hostname) + # Honor simulation mode und usewalk hosts. Never contact the network. - elif config.simulation_mode or _enforce_localhost or \ - (config.is_usewalk_host(hostname) and config.is_snmp_host(hostname)): + if config.simulation_mode or _enforce_localhost or \ + (host_config.is_usewalk_host and host_config.is_snmp_host): if family == 4: return "127.0.0.1" diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index 9a69677..8fda89c 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -826,11 +826,14 @@ def do_snmpget(*args): raise MKBailOut("You need to specify an OID.") oid = args[0][0] + config_cache = config.get_config_cache() + hostnames = args[0][1:] if not hostnames: hostnames = [] for host in config.all_active_realhosts(): - if config.is_snmp_host(host): + host_config = config_cache.get_host_config(host) + if host_config.is_snmp_host: hostnames.append(host) for hostname in hostnames: diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 5046d52..229cf03 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -173,7 +173,6 @@ def test_is_ping_host(monkeypatch, hostname, tags, result): ]) def test_is_snmp_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_snmp_host(hostname) == result assert config_cache.get_host_config(hostname).is_snmp_host == result

5 years, 6 months

[CMK-1850] - build agent for windows fix

by Sergey Kipnis

Module: check_mk Branch: master Commit: cc964f1a43519f6bf2d44f31383cbc031f031744 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc964f1a43519f… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu Apr 4 14:10:30 2019 +0200 [CMK-1850] - build agent for windows fix - msi-update legacy is executable - msi-update-legacy is used to build legacy windows agent - msi-update-legacy is added to the tar Change-Id: Iad9c66a360891ad4fb5ef63c6e5324070549c3d5 --- Makefile | 1 + agents/windows/msibuild/Makefile | 10 +++++++--- agents/windows/msibuild/msi-update-legacy | 0 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 78e1695..d8c9296 100644 --- a/Makefile +++ b/Makefile @@ -188,6 +188,7 @@ $(DISTNAME).tar.gz: .venv omd/packages/mk-livestatus/mk-livestatus-$(VERSION).ta $(MAKE) -C agents build tar cf $(DISTNAME)/bin.tar $(TAROPTS) -C bin $$(cd bin ; ls) tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update + tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update-legacy gzip $(DISTNAME)/bin.tar $(PIPENV) run python -m compileall cmk ; \ tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) \ diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index e336a5a..6f53313 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -32,6 +32,7 @@ all: exchange_msi_files clean: rm -rf $(MSITOOLS) + rm -f check_mk_agent.msi rm -rf work sources rm -f .gsf-save-* @@ -47,7 +48,10 @@ msibuild: rm msibuild msiinfo ln -s $(MSITOOLS)/msibuild $(MSITOOLS)/msiinfo . -# with new agent we do not need to update vanilla container -# nothing to do, but target left for the future changes and -# for updating msibuild +# we have to use legacy msi-update exchange_msi_files: msibuild + mkdir -p work sources + cp ../check_mk_agent.exe ../check_mk_agent-64.exe ../check_mk.example.ini sources + LD_LIBRARY_PATH=$$(pwd)/msitools-0.94/libmsi/.libs \ + ./msi-update-legacy -v vanilla_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) + rm -rf work sources diff --git a/agents/windows/msibuild/msi-update-legacy b/agents/windows/msibuild/msi-update-legacy old mode 100644 new mode 100755

5 years, 6 months

← Newer
1
...
42
43
44
45
46
47
48
...
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