Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

5688 FIX Windows agent: numerous fixes to only_from

by Jukka Aro

Module: check_mk Branch: master Commit: 270d2f09622ef46b543c4d2e88bb58f03ad2b156 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=270d2f09622ef4… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 17 09:59:04 2018 +0100 5688 FIX Windows agent: numerous fixes to only_from The setting only_from was handled improperly in many ways: * The IPv4 loopback address 127.0.0.1 did not always work in only_from, depending on what kind of client was used on localhost. Now if the IPv4 loopback address is given in only_from, the corresponding IPv6 loopback ::1 is added there to ensure the correct functionality with different clients on localhost. * IPv6 addresses converted from only_from IPv4 addresses were not output in section Check_MK. This was a regression from 1.2.8 introduced in the huge refactoring c5ee818358e695b01c2f2dbc05ad0713723a37f8. * IPv6 addresses were output incorrectly in section Check_MK: * the last colon-separated group was always missing. * the groups were output as decimal instead of hexadecimal digits. * the groups were output in network byte order instead of host byte order, leading to incorrect output. Change-Id: I0dad7b50d6c9e682734b68338d847c83e2a0a165 --- .werks/5688 | 25 ++++++++++++++ agents/windows/SectionManager.cc | 10 +++--- agents/windows/SectionManager.h | 11 ++++-- agents/windows/WinApi.cc | 2 ++ agents/windows/WinApi.h | 1 + agents/windows/WinApiAdaptor.h | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 57 ++++++++++++------------------- agents/windows/sections/SectionCheckMK.cc | 5 +-- agents/windows/sections/SectionCheckMK.h | 13 +++---- agents/windows/stringutil.cc | 1 + agents/windows/stringutil.h | 10 +++--- agents/windows/test/MockWinApi.h | 1 + agents/windows/test/stringutilTest.cc | 38 ++++++++++++++++----- agents/windows/types.cc | 41 ++++++++++++++++++++-- agents/windows/types.h | 4 +++ 16 files changed, 154 insertions(+), 68 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=270d2f0962…

6 years, 8 months

Windows agent: integration tests for only_from

by Jukka Aro

Module: check_mk Branch: master Commit: b89f35e4ab399dd87713024376e45c1132d974c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b89f35e4ab399d… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 12 10:33:06 2018 +0100 Windows agent: integration tests for only_from Test only_from settings both over TCP and without TCP in test/debug/file modes. Verify that both IPv4 and IPv6 addresses are output correctly in section Check_MK. Change-Id: Ib350bf5604e770c89fcf2d169b5aab49f632e7cd --- agents/windows/it/test_section_check_mk.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/agents/windows/it/test_section_check_mk.py b/agents/windows/it/test_section_check_mk.py index 689146a..6f60372 100644 --- a/agents/windows/it/test_section_check_mk.py +++ b/agents/windows/it/test_section_check_mk.py @@ -7,7 +7,14 @@ from remote import (actual_output, agent_exe, config, remotetest, remotedir, wait_agent, write_config) import sys -output_file = 'agentoutput.txt' + +class Globals(object): + output_file = 'agentoutput.txt' + only_from = None + ipv4_to_ipv6 = { + '127.0.0.1': '0:0:0:0:0:0:0:1', + '10.1.2.3': '0:0:0:0:0:ffff:a01:203' + } @pytest.fixture @@ -15,16 +22,21 @@ def testfile(): return os.path.basename(__file__) -(a)pytest.fixture -def testconfig(config): +(a)pytest.fixture( + params=[None, '127.0.0.1 10.1.2.3'], + ids=['only_from=None', 'only_from=127.0.0.1_10.1.2.3']) +def testconfig(request, config): + Globals.only_from = request.param section = 'check_mk' config.set("global", "sections", section) config.set("global", "crash_debug", "yes") + if request.param: + config.set("global", "only_from", request.param) return config @pytest.fixture( - params=[['test'], ['debug'], ['file', output_file]], + params=[['test'], ['debug'], ['file', Globals.output_file]], ids=['test', 'debug', 'file']) def actual_output_no_tcp(request, write_config): if platform.system() == 'Windows': @@ -41,13 +53,13 @@ def actual_output_no_tcp(request, write_config): sys.stderr.write(stderr) assert p.returncode == 0 if request.param[0] == 'file': - with open(output_file) as outfile: + with open(Globals.output_file) as outfile: yield outfile.readlines() else: yield stdout.splitlines() finally: try: - os.unlink(output_file) + os.unlink(Globals.output_file) except OSError: pass # File may not exist os.chdir(save_cwd) @@ -59,6 +71,7 @@ def actual_output_no_tcp(request, write_config): @pytest.fixture def expected_output(): drive_letter = r'[A-Z]:' + ipv4 = Globals.only_from.split() if Globals.only_from else None return [ # Note: The first two lines are output with crash_debug = yes in 1.2.8 # but no longer in 1.4.0: @@ -103,7 +116,9 @@ def expected_output(): # r'SuccessLog: %s%s' % # (drive_letter, # re.escape(os.path.join(remotedir, 'log', 'success.log'))), - r'OnlyFrom: 0\.0\.0\.0/0' + (r'OnlyFrom: %s/32 %s/32 %s/128 %s/128' % + tuple(ipv4 + [Globals.ipv4_to_ipv6[i4] for i4 in ipv4]) + if Globals.only_from else r'OnlyFrom: 0\.0\.0\.0/0') ]

6 years, 8 months

Reserved 10 Werk IDS

by Jukka Aro

Module: check_mk Branch: master Commit: d6b67350eb1af8ca1f8b4e6643f35376f685531a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6b67350eb1af8… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 17 09:41:46 2018 +0100 Reserved 10 Werk IDS Change-Id: If3df300116173584124d661e3a244cc12d796eb4 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 52a539b..cc3fa79 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5688 +5698

6 years, 8 months

Fixed renaming issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 88368cc25ab0bd8474d14e149acbd3179e1567fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88368cc25ab0bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 17 09:36:33 2018 +0100 Fixed renaming issue Change-Id: I7fe9b1a01b75ff0b9f87e1824398aee19e693d9b --- cmk_base/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index fdc3c14..4ecffbe 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -323,7 +323,7 @@ def locally_deliver_raw_context(raw_context, analyse=False): # flexible notifications even if they are enabled. contact = config.contacts.get(contactname) - disable_notifications_opts = transform_user_disable_notifications_opts(contact) + disable_notifications_opts = _transform_user_disable_notifications_opts(contact) if disable_notifications_opts.get("disable", False): start, end = disable_notifications_opts.get("timerange", (None, None)) if start is None or end is None:

6 years, 8 months

Reserved 20 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: c727c650f74dd2bb69da38932adb44a058fe07c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c727c650f74dd2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 17 09:34:09 2018 +0100 Reserved 20 Werk IDS Change-Id: I3629b3b7627d8a8328d77babae2bb0b0ddc1827d --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ceddb5f..52a539b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5668 +5688

6 years, 8 months

Add test to ensure some specific python modules are loaded from the site

by Lars Michelsen

Module: check_mk Branch: master Commit: 886240b846f5c7637ee304592a16945bb0b8ec1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=886240b846f5c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 17 08:14:28 2018 +0100 Add test to ensure some specific python modules are loaded from the site Change-Id: Ibaa76888b686be7af6a0a0d9dd884bc09986b853 --- tests/omd/test_python.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/omd/test_python.py b/tests/omd/test_python.py index 88ccf9d..8f7cab3 100644 --- a/tests/omd/test_python.py +++ b/tests/omd/test_python.py @@ -53,3 +53,17 @@ def test_03_pip_interpreter_version(site): stdout=subprocess.PIPE) version = p.stdout.read() assert version.startswith("pip 9.") + + +def test_python_modules(site): + test_modules = [ + "netsnmp", + "pysphere", + "ldap", + "cryptography", + ] + + import importlib + for test_module_name in test_modules: + module = importlib.import_module(test_module_name) + assert module.__file__.startswith("/omd/sites/heute/lib/python")

6 years, 8 months

Minor refactoring: Separate host section gathering and data source object creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 30d7b2d7f5acf05787c8b9a83233f6df21cd73bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30d7b2d7f5acf0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 17 08:58:33 2018 +0100 Minor refactoring: Separate host section gathering and data source object creation Change-Id: I8171456075858120a653905ce3dcddaeed84f0b0 --- cmk_base/discovery.py | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 60cfddd..3709a35 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -111,7 +111,7 @@ def do_discovery(hostnames, check_plugin_names, only_new): ipaddress = ip_lookup.lookup_ip_address(hostname) - sources = data_sources.DataSources(hostname) + sources = _get_sources_for_discovery(hostname, check_plugin_names, do_snmp_scan, on_error) # Usually we disable SNMP scan if cmk -I is used without a list of # explicity hosts. But for host that have never been service-discovered @@ -119,10 +119,7 @@ def do_discovery(hostnames, check_plugin_names, only_new): do_snmp_scan = not use_caches or not _has_autochecks(hostname) multi_host_sections = _get_host_sections_for_discovery(sources, hostname, ipaddress, - check_plugin_names=check_plugin_names, - use_caches=use_caches, - do_snmp_scan=do_snmp_scan, - on_error=on_error) + use_caches=use_caches) _do_discovery_for(hostname, ipaddress, sources, multi_host_sections, check_plugin_names, only_new, on_error) console.verbose("\n") @@ -218,15 +215,16 @@ def discover_on_host(mode, hostname, do_snmp_scan, use_caches, on_error="ignore" if mode == "refresh": counts["removed"] += remove_autochecks_of(hostname) # this is cluster-aware! - sources = data_sources.DataSources(hostname) + sources = _get_sources_for_discovery(hostname, check_plugin_names=None, + do_snmp_scan=do_snmp_scan, on_error=on_error) if config.is_cluster(hostname): ipaddress = None else: ipaddress = ip_lookup.lookup_ip_address(hostname) - multi_host_sections = _get_host_sections_for_discovery(sources, hostname, ipaddress, check_plugin_names=None, - use_caches=use_caches, do_snmp_scan=do_snmp_scan, on_error=on_error) + multi_host_sections = _get_host_sections_for_discovery(sources, hostname, ipaddress, + use_caches=use_caches) # Compute current state of new and existing checks services = _get_host_services(hostname, ipaddress, sources, multi_host_sections, on_error=on_error) @@ -301,14 +299,13 @@ def check_discovery(hostname, ipaddress): else: ipaddress = ip_lookup.lookup_ip_address(hostname) - sources = data_sources.DataSources(hostname) + sources = _get_sources_for_discovery(hostname, check_plugin_names=None, + do_snmp_scan=params["inventory_check_do_scan"], + on_error="raise") try: multi_host_sections = _get_host_sections_for_discovery(sources, hostname, ipaddress, - check_plugin_names=None, - use_caches=data_sources.abstract.DataSource.get_may_use_cache_file(), - do_snmp_scan=params["inventory_check_do_scan"], - on_error="raise") + use_caches=data_sources.abstract.DataSource.get_may_use_cache_file()) except socket.gaierror, e: # TODO: Seems to be the wrong place for this execption handling if e[0] == -2 and cmk.debug.disabled(): @@ -710,7 +707,9 @@ def _discover_services(hostname, ipaddress, sources, multi_host_sections, on_err raise MKGeneralException("Interrupted by Ctrl-C.") -def _get_host_sections_for_discovery(sources, hostname, ipaddress, check_plugin_names, use_caches, do_snmp_scan, on_error): +def _get_sources_for_discovery(hostname, check_plugin_names, do_snmp_scan, on_error): + sources = data_sources.DataSources(hostname) + for source in sources.get_data_sources(): if isinstance(source, data_sources.SNMPDataSource): source.set_on_error(on_error) @@ -723,6 +722,10 @@ def _get_host_sections_for_discovery(sources, hostname, ipaddress, check_plugin_ if check_plugin_names: sources.enforce_check_plugin_names(check_plugin_names) + return sources + + +def _get_host_sections_for_discovery(sources, hostname, ipaddress, use_caches): max_cachefile_age = config.inventory_max_cachefile_age if use_caches else 0 return sources.get_host_sections(hostname, ipaddress, max_cachefile_age) @@ -1027,7 +1030,7 @@ def _execute_discovery(multi_host_sections, hostname, ipaddress, check_plugin_na # This function is cluster-aware def _get_host_services(hostname, ipaddress, sources, multi_host_sections, on_error): if config.is_cluster(hostname): - return _get_cluster_services(hostname, ipaddress, multi_host_sections, on_error) + return _get_cluster_services(hostname, ipaddress, sources, multi_host_sections, on_error) else: return _get_node_services(hostname, ipaddress, sources, multi_host_sections, on_error) @@ -1122,16 +1125,16 @@ def _merge_manual_services(services, hostname, on_error): return services # Do the work for a cluster -def _get_cluster_services(hostname, ipaddress, multi_host_sections, on_error): +def _get_cluster_services(hostname, ipaddress, sources, multi_host_sections, on_error): nodes = config.nodes_of(hostname) # Get services of the nodes. We are only interested in "old", "new" and "vanished" # From the states and parameters of these we construct the final state per service. cluster_items = {} for node in nodes: - sources = data_sources.DataSources(node) + node_sources = _get_sources_for_discovery(node, check_plugin_names, do_snmp_scan, on_error) node_ipaddress = ip_lookup.lookup_ip_address(node) - services = _get_discovered_services(node, node_ipaddress, sources, multi_host_sections, on_error) + services = _get_discovered_services(node, node_ipaddress, node_sources, multi_host_sections, on_error) for (check_plugin_name, item), (check_source, paramstring) in services.items(): descr = config.service_description(hostname, check_plugin_name, item) if hostname == config.host_of_clustered_service(node, descr): @@ -1166,16 +1169,16 @@ def resolve_paramstring(paramstring): def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): import cmk_base.checking as checking - sources = data_sources.DataSources(hostname) + sources = _get_sources_for_discovery(hostname, check_plugin_names=None, + do_snmp_scan=do_snmp_scan, on_error=on_error) if config.is_cluster(hostname): ipaddress = None else: ipaddress = ip_lookup.lookup_ip_address(hostname) - multi_host_sections = _get_host_sections_for_discovery(sources, hostname, ipaddress, - check_plugin_names=None, use_caches=use_caches, - do_snmp_scan=do_snmp_scan, on_error=on_error) + multi_host_sections = _get_host_sections_for_discovery(sources, hostname, + ipaddress, use_caches=use_caches) services = _get_host_services(hostname, ipaddress, sources, multi_host_sections, on_error)

6 years, 8 months

5650 FIX Fixed service discovery page for SNMP cluster hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: bd52fca00075284bb6616c0bee784ce26bb778cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd52fca0007528… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 17 09:10:54 2018 +0100 5650 FIX Fixed service discovery page for SNMP cluster hosts The service discovery page of WATO was showing a warning message and no discovery could be performed for this host using the GUI anymore. Change-Id: I8f696b32d8941ad3b4ea7d2d9367c591121001e6 Workaround: Use the discovery mode on the command line via <tt>cmk -II [HOSTNAME]</tt>. --- .werks/5650 | 15 +++++++++++++++ cmk_base/data_sources/__init__.py | 10 ++++++++++ cmk_base/data_sources/snmp.py | 4 ++++ cmk_base/discovery.py | 17 ++++++++++++++--- 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/.werks/5650 b/.werks/5650 new file mode 100644 index 0000000..90423fa --- /dev/null +++ b/.werks/5650 @@ -0,0 +1,15 @@ +Title: Fixed service discovery page for SNMP cluster hosts +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516176294 +Class: fix + +The service discovery page of WATO was showing a warning message +"Service discovery failed for this host: The check type filter function has not been set " +and no discovery could be performed for this host using the GUI +anymore. + +Workaround: Use the discovery mode on the command line via <tt>cmk -II [HOSTNAME]</tt>. diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index b48eeaf..0cc0b04 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -85,6 +85,10 @@ class DataSources(object): self._hostname = hostname self._initialize_data_sources() + # Has currently no effect. The value possibly set during execution on the single data + # sources is kept here in this object to return it later on + self._enforced_check_plugin_names = None + def _initialize_data_sources(self): self._sources = {} @@ -202,10 +206,16 @@ class DataSources(object): def enforce_check_plugin_names(self, check_plugin_names): + self._enforced_check_plugin_names = check_plugin_names for source in self.get_data_sources(): source.enforce_check_plugin_names(check_plugin_names) + def get_enforced_check_plugin_names(self): + """Returns either the collection of enforced check plugin names (when they have been set before) or None""" + return self._enforced_check_plugin_names + + def get_data_sources(self): # Always execute piggyback at the end return sorted(self._sources.values(), key=lambda s: (isinstance(s, PiggyBackDataSource), s.id())) diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index ae41c07..2b539e8 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -126,6 +126,10 @@ class SNMPDataSource(DataSource): self._do_snmp_scan = do_snmp_scan + def get_do_snmp_scan(self): + return self._do_snmp_scan + + def set_check_plugin_name_filter(self, filter_func): self._check_plugin_name_filter_func = filter_func diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 3709a35..4b97d41 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -111,13 +111,13 @@ def do_discovery(hostnames, check_plugin_names, only_new): ipaddress = ip_lookup.lookup_ip_address(hostname) - sources = _get_sources_for_discovery(hostname, check_plugin_names, do_snmp_scan, on_error) - # Usually we disable SNMP scan if cmk -I is used without a list of # explicity hosts. But for host that have never been service-discovered # yet (do not have autochecks), we enable SNMP scan. do_snmp_scan = not use_caches or not _has_autochecks(hostname) + sources = _get_sources_for_discovery(hostname, check_plugin_names, do_snmp_scan, on_error) + multi_host_sections = _get_host_sections_for_discovery(sources, hostname, ipaddress, use_caches=use_caches) @@ -1128,11 +1128,22 @@ def _merge_manual_services(services, hostname, on_error): def _get_cluster_services(hostname, ipaddress, sources, multi_host_sections, on_error): nodes = config.nodes_of(hostname) + # Get setting from cluster SNMP data source + do_snmp_scan = False + for source in sources.get_data_sources(): + if isinstance(source, data_sources.SNMPDataSource): + do_snmp_scan = source.get_do_snmp_scan() + # Get services of the nodes. We are only interested in "old", "new" and "vanished" # From the states and parameters of these we construct the final state per service. cluster_items = {} for node in nodes: - node_sources = _get_sources_for_discovery(node, check_plugin_names, do_snmp_scan, on_error) + node_sources = _get_sources_for_discovery(node, + check_plugin_names=sources.get_enforced_check_plugin_names(), + do_snmp_scan=do_snmp_scan, + on_error=on_error, + ) + node_ipaddress = ip_lookup.lookup_ip_address(node) services = _get_discovered_services(node, node_ipaddress, node_sources, multi_host_sections, on_error) for (check_plugin_name, item), (check_source, paramstring) in services.items():

6 years, 8 months

hp_fan: Make scan function more restrictive

by Konstantin Büttner

Module: check_mk Branch: master Commit: c0c085306287f1bbb8d17365fe37ee096a34c4ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0c085306287f1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jan 16 16:31:53 2018 +0100 hp_fan: Make scan function more restrictive Change-Id: I8aa241d5c3f120376e9e8a73b4b1458bc25f6b9c --- checks/hp_fan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hp_fan b/checks/hp_fan index 2d62072..7c51f2c 100644 --- a/checks/hp_fan +++ b/checks/hp_fan @@ -57,5 +57,5 @@ check_info['hp_fan'] = { "2", # hpicfFanTray "4", # hpicfFanState ]), - 'snmp_scan_function' : lambda oid: "hp" in oid(".1.3.6.1.2.1.1.1.0").lower() and "switch" in oid(".1.3.6.1.2.1.1.1.0").lower(), + 'snmp_scan_function' : lambda oid: "hp" in oid(".1.3.6.1.2.1.1.1.0").lower() and "5406rzl2" in oid(".1.3.6.1.2.1.1.1.0").lower(), }

6 years, 8 months

We already retrieve distro info in Makefile.omd.

by Sven Panne

Module: check_mk Branch: master Commit: cfe2ebe507be1aaf2e9ea09bac24e13fc9c42bab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfe2ebe507be1a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 15:58:49 2018 +0100 We already retrieve distro info in Makefile.omd. Change-Id: I59bc334be14ff82ffe01a5398ef4052bcb3dd9cb --- omd/packages/cma/Makefile | 1 - omd/packages/perl-modules/Makefile | 5 ++--- omd/packages/python-modules/Makefile | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/omd/packages/cma/Makefile b/omd/packages/cma/Makefile index 43f34c9..3262c9d 100644 --- a/omd/packages/cma/Makefile +++ b/omd/packages/cma/Makefile @@ -2,7 +2,6 @@ include ../../Makefile.omd NAME = cma VERSION = $(OMD_VERSION) -DISTRO = $(shell ../../distro) build: diff --git a/omd/packages/perl-modules/Makefile b/omd/packages/perl-modules/Makefile index 5cd07f2..c19f432 100644 --- a/omd/packages/perl-modules/Makefile +++ b/omd/packages/perl-modules/Makefile @@ -2,7 +2,6 @@ include ../../Makefile.omd NAME = perl-modules VERSION = $(OMD_VERSION) -DISTRO = $(shell ../../distro) MODULES = \ Capture-Tiny-0.27.tar.gz \ @@ -99,7 +98,7 @@ build: export MODULEBUILDRC=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/.modulebuildrc; \ export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB):$(PACKAGE_PERL_MODULES_DESTDIR)/src/lib:$(PACKAGE_PERL_MODULES_DESTDIR)/src/Crypt-SSLeay-0.72; \ cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \ - FORCE=1 ./build_module.pl -d "$(DISTRO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest \ + FORCE=1 ./build_module.pl -d "$(DISTRO_INFO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest \ ExtUtils-MakeMaker-*.tar.gz \ parent-*.tar.gz \ version-*.tar.gz \ @@ -109,7 +108,7 @@ build: JSON-*.tar.gz; \ export PERL_JSON_BACKEND='JSON::XS'; \ cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \ - ./build_module.pl -d "$(DISTRO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest $(MODULES) + ./build_module.pl -d "$(DISTRO_INFO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest $(MODULES) cd $(PACKAGE_PERL_MODULES_PERL5LIB)/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . mkdir -p $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN cp MyConfig.pm $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN/MyConfig.skel diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index d1e74f7..bb69393 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -3,7 +3,6 @@ include ../../Makefile.omd NAME = python-modules SHELL = /bin/bash VERSION = $(OMD_VERSION) -DISTRO = $(shell ../../distro) PATCHES := $(wildcard patches/*.dif)

6 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018