Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Automatically clear config caches in config tests

by Lars Michelsen

Module: check_mk Branch: master Commit: e9708946d3a5b2ee3c02bda8732bafd93f5fa841 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9708946d3a5b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 18:02:40 2018 +0200 Automatically clear config caches in config tests Change-Id: Icf3c807b1e00f101a8d8c2d9d5b617e6c50fd826 --- tests/unit/cmk_base/test_config.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 36f106d..db056c7 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -3,6 +3,13 @@ import pytest import cmk_base.config as config import cmk_base.rulesets as rulesets +(a)pytest.fixture(autouse=True, scope="function") +def clear_config_caches(monkeypatch): + import cmk_base + import cmk_base.caching + monkeypatch.setattr(cmk_base, "config_cache", cmk_base.caching.CacheManager()) + monkeypatch.setattr(cmk_base, "runtime_cache", cmk_base.caching.CacheManager()) + @pytest.mark.parametrize("hostname,tags,result", [ ("testhost", [], True), ("testhost", ["ip-v4"], True),

6 years, 3 months

6173 FIX Fixed possible crash in Check_MK and Check_MK HW/SW Inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c9e82ba1702dfd60facc6b00f381b2ab23ac25d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c9e82ba1702df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 16:27:31 2018 +0200 6173 FIX Fixed possible crash in Check_MK and Check_MK HW/SW Inventory When using pretty outdated "Do hardware/software Inventory" rules which have been saved before 1.4, this could lead to crashing Check_MK and Check_MK HW/SW inventory services with errors like this: 'NoneType' object has no attribute 'get' Workaround: Open this ruleset and save the rules in the relevant folders. The configs will then be transformed and rewritten in the current format which prevents this crash. Change-Id: I74bac63ac280caddf95b19e141519e7be32b20ae --- .werks/6173 | 19 +++++++++++++++++++ cmk_base/checks.py | 14 ++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.werks/6173 b/.werks/6173 new file mode 100644 index 0000000..a611c59 --- /dev/null +++ b/.werks/6173 @@ -0,0 +1,19 @@ +Title: Fixed possible crash in Check_MK and Check_MK HW/SW Inventory +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1527258292 + +When using pretty outdated "Do hardware/software Inventory" rules which +have been saved before 1.4, this could lead to crashing Check_MK and +Check_MK HW/SW inventory services with errors like this: + +'NoneType' object has no attribute 'get' + +Workaround: Open this ruleset and save the rules in the relevant folders. +The configs will then be transformed and rewritten in the current format +which prevents this crash. diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 288483a..08d7b3e 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -797,12 +797,18 @@ def do_status_data_inventory_for(hostname): rules = config.active_checks.get('cmk_inv') if rules is None: return False + # 'host_extra_conf' is already cached thus we can # use it after every check cycle. - params = rulesets.host_extra_conf(hostname, rules) - if params: - return params[0].get('status_data_inventory', False) - return False + entries = rulesets.host_extra_conf(hostname, rules) + + if not entries: + return False # No matching rule -> disable + + # Convert legacy rules to current dict format (just like the valuespec) + params = {} if entries[0] is None else entries[0] + + return params.get('status_data_inventory', False) def filter_by_management_board(hostname, found_check_plugin_names,

6 years, 3 months

6171 FIX Fixed vertical lines overlapping graph legend in some cases

by Lars Michelsen

Module: check_mk Branch: master Commit: 6bf28998320041f127fcf4c4a24b0aff31730857 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bf28998320041… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 13:36:52 2018 +0200 6171 FIX Fixed vertical lines overlapping graph legend in some cases In some situations graphs in PDF reports could be rendered with vertical lines that overlap the graph legend. This happened mostly when rendering graphs that have a fine raster. Change-Id: I6ce4d760ccefbfe2011554cdcbcb7e42d2e58120 --- .werks/6171 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6171 b/.werks/6171 new file mode 100644 index 0000000..089b754 --- /dev/null +++ b/.werks/6171 @@ -0,0 +1,13 @@ +Title: Fixed vertical lines overlapping graph legend in some cases +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1527247989 + +In some situations graphs in PDF reports could be rendered with vertical +lines that overlap the graph legend. This happened mostly when rendering +graphs that have a fine raster.

6 years, 3 months

Add unit test for checks.do_status_data_inventory_for

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a176bdedf1217c62af1a0345ce3bf3bc1f438ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a176bdedf1217… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 16:58:55 2018 +0200 Add unit test for checks.do_status_data_inventory_for Change-Id: I38b2d4a51ded165ff4882843cba2cee0a327ed33 --- cmk_base/checks.py | 1 + tests/unit/cmk_base/test_checks.py | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 08d7b3e..11f9075 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -793,6 +793,7 @@ def get_management_board_precedence(check_plugin_name): return mgmt_board +# TODO: Better move this function to config.py def do_status_data_inventory_for(hostname): rules = config.active_checks.get('cmk_inv') if rules is None: diff --git a/tests/unit/cmk_base/test_checks.py b/tests/unit/cmk_base/test_checks.py index bb73fb2..6836472 100644 --- a/tests/unit/cmk_base/test_checks.py +++ b/tests/unit/cmk_base/test_checks.py @@ -1,5 +1,9 @@ +import pytest + import cmk_base.checks as checks import cmk_base.discovery as discovery +import cmk_base.config as config +import cmk_base.rulesets as rulesets def test_load_checks(): checks._initialize_data_structures() @@ -43,3 +47,20 @@ def test_discoverable_tcp_checks(): assert "logwatch" in checks.discoverable_tcp_checks() +(a)pytest.mark.parametrize("result,ruleset", [ + (False, None), + (False, []), + (False, [( None, [], rulesets.ALL_HOSTS, {} )]), + (False, [( {}, [], rulesets.ALL_HOSTS, {} )]), + (True, [( {"status_data_inventory": True}, [], rulesets.ALL_HOSTS, {} )]), + (False, [( {"status_data_inventory": False}, [], rulesets.ALL_HOSTS, {} )]), +]) +def test_do_status_data_inventory_for(monkeypatch, result, ruleset): + config.load_default_config() + + monkeypatch.setattr(config, "all_hosts", ["abc"]) + monkeypatch.setattr(config, "active_checks", { + "cmk_inv": ruleset, + }) + + assert checks.do_status_data_inventory_for("abc") == result

6 years, 3 months

6174 FIX Fixed discovery for host with management board without IP addresses configured

by Lars Michelsen

Module: check_mk Branch: master Commit: ec1b31ab4f2877fd05eb65b4a3da4b460b402157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec1b31ab4f2877… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 17:46:42 2018 +0200 6174 FIX Fixed discovery for host with management board without IP addresses configured The discovery was not working correctly for hosts that have the management board protocol enabled but no explicit IP address set and no management board IP configured. Change-Id: I993adc25839541715532c7b0c6034fbcfaa10f35 --- .werks/6174 | 12 ++++++++++ cmk_base/data_sources/abstract.py | 9 ++++++- tests/unit/cmk_base/test_config.py | 15 ++++++++++++ tests/unit/cmk_base/test_data_sources_unit.py | 34 +++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) diff --git a/.werks/6174 b/.werks/6174 new file mode 100644 index 0000000..8692e9f --- /dev/null +++ b/.werks/6174 @@ -0,0 +1,12 @@ +Title: Fixed discovery for host with management board without IP addresses configured +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1527261139 + +The discovery was not working correctly for hosts that have the management board +protocol enabled but no explicit IP address set and no management board IP configured. diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 9959eb0..61db24b 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -813,6 +813,9 @@ class ManagementBoardDataSource(DataSource): def _management_board_ipaddress(self, hostname): mgmt_ipaddress = config.management_address_of(hostname) + if mgmt_ipaddress is None: + return None + if not self._is_ipaddress(mgmt_ipaddress): return ip_lookup.lookup_ip_address(mgmt_ipaddress) else: @@ -820,7 +823,11 @@ class ManagementBoardDataSource(DataSource): # TODO: Why is it used only here? - def _is_ipaddress(self, address): + @staticmethod + def _is_ipaddress(address): + if address is None: + return False + try: socket.inet_pton(socket.AF_INET, address) return True diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 6727434..36f106d 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -46,3 +46,18 @@ def test_is_ipv6_primary_host(monkeypatch, hostname, tags, result, ruleset): monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) monkeypatch.setattr(config, "primary_address_family", ruleset) assert config.is_ipv6_primary(hostname) == result + + +(a)pytest.mark.parametrize("result,attrs", [ + ("127.0.1.1", {}), + ("127.0.1.1", {"management_address": ""}), + ("127.0.0.1", {"management_address": "127.0.0.1"}), + ("lolo", {"management_address": "lolo"}), +]) +def test_management_address_of(monkeypatch, attrs, result): + # Host IP address is 127.0.1.1 + monkeypatch.setitem(config.ipaddresses, "hostname", "127.0.1.1") + + monkeypatch.setitem(config.host_attributes, "hostname", attrs) + + assert config.management_address_of("hostname") == result diff --git a/tests/unit/cmk_base/test_data_sources_unit.py b/tests/unit/cmk_base/test_data_sources_unit.py index 65503ef..cd63008 100644 --- a/tests/unit/cmk_base/test_data_sources_unit.py +++ b/tests/unit/cmk_base/test_data_sources_unit.py @@ -1,6 +1,10 @@ import pytest +import cmk_base.data_sources.abstract import cmk_base.data_sources.snmp +import cmk_base.ip_lookup as ip_lookup +import cmk_base.config as config +import cmk_base.exceptions def test_data_source_cache_default(): source = cmk_base.data_sources.snmp.SNMPDataSource("hostname", "ipaddress") @@ -34,3 +38,33 @@ def test_disable_data_source_cache_no_write(mocker): disabled_checker = mocker.patch.object(source, "is_agent_cache_disabled") assert source._write_cache_file("X") is None disabled_checker.assert_called_once() + + +def test_mgmt_board_data_source_is_ip_address(): + _is_ipaddress = cmk_base.data_sources.abstract.ManagementBoardDataSource._is_ipaddress + assert _is_ipaddress(None) == False + assert _is_ipaddress("localhost") == False + assert _is_ipaddress("abc 123") == False + assert _is_ipaddress("127.0.0.1") == True + assert _is_ipaddress("::1") == True + assert _is_ipaddress("fe80::807c:f8ff:fea9:9f12") == True + + +(a)pytest.mark.parametrize("result,address,resolvable", [ + (None, None, True), + ("127.0.0.1", "127.0.0.1", True), + ("127.0.1.1", "lolo", True), + (None, "lolo", False), +]) +def test_mgmt_board_data_source_management_board_ipaddress(monkeypatch, result, address, resolvable): + source = cmk_base.data_sources.snmp.SNMPManagementBoardDataSource("hostname", "ipaddress") + + if resolvable: + monkeypatch.setattr(ip_lookup, "lookup_ip_address", lambda h: "127.0.1.1") + else: + def raise_exc(h): + raise cmk_base.exceptions.MKIPAddressLookupError("Failed to...") + monkeypatch.setattr(ip_lookup, "lookup_ip_address", raise_exc) + + monkeypatch.setattr(config, "management_address_of", lambda h: address) + assert source._management_board_ipaddress("hostname") == result

6 years, 3 months

Synched setup target with CLANG_VERSION.

by Sven Panne

Module: check_mk Branch: master Commit: 53503a8b98343593ce6b81e5c196dd1b9bf1a4a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53503a8b983435… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 25 14:54:23 2018 +0200 Synched setup target with CLANG_VERSION. Change-Id: Ib0368cc797543a256aa0a4f9c893725500161160 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3746ffb..8fcd917 100644 --- a/Makefile +++ b/Makefile @@ -398,18 +398,18 @@ setup: autoconf \ bear \ build-essential \ - clang-5.0 \ - clang-format-5.0 \ - clang-tidy-5.0 \ + clang-6.0 \ + clang-format-6.0 \ + clang-tidy-6.0 \ doxygen \ figlet \ g++ \ libboost-dev \ libboost-system-dev \ - libclang-5.0-dev \ + libclang-6.0-dev \ libpcap-dev \ librrd-dev \ - llvm-5.0-dev \ + llvm-6.0-dev \ libsasl2-dev \ pngcrush \ slimit \

6 years, 3 months

Updated snap7 from 1.3.0 to 1.4.2.

by Sven Panne

Module: check_mk Branch: master Commit: 035a5ac08ab749f2fc59698fdf10b2419f95baff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=035a5ac08ab749… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 25 14:53:02 2018 +0200 Updated snap7 from 1.3.0 to 1.4.2. Change-Id: Ia530c951e28e73d6fae3fd3b27983cae9245a94c --- Makefile | 3 ++- omd/packages/snap7/.gitignore | 2 +- omd/packages/snap7/Makefile | 6 +++--- omd/packages/snap7/snap7-full-1.3.0.tar.gz | Bin 39622121 -> 0 bytes omd/packages/snap7/snap7-full-1.4.2.7z | Bin 0 -> 20591252 bytes 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b5adbba..3746ffb 100644 --- a/Makefile +++ b/Makefile @@ -417,7 +417,8 @@ setup: direnv \ python-pip \ chrpath \ - enchant + enchant \ + p7zip-full sudo pip install -U pipenv $(MAKE) -C omd setup ifeq ($(ENTERPRISE),yes) diff --git a/omd/packages/snap7/.gitignore b/omd/packages/snap7/.gitignore index e5683f0..b13cce2 100644 --- a/omd/packages/snap7/.gitignore +++ b/omd/packages/snap7/.gitignore @@ -1 +1 @@ -snap7-full-1.3.0/ +snap7-full-[0-9].[0-9].[0-9]/ diff --git a/omd/packages/snap7/Makefile b/omd/packages/snap7/Makefile index afb3679..854caaa 100644 --- a/omd/packages/snap7/Makefile +++ b/omd/packages/snap7/Makefile @@ -2,8 +2,8 @@ include ../../Makefile.omd # This package contains the SNAP 7 library (http://snap7.sourceforge.net/) NAME = snap7 -VERSION = 1.3.0 -DIR = snap7-full-$(VERSION) +VERSION = 1.4.2 +DIR = $(NAME)-full-$(VERSION) ARCH = $(shell uname -m) ifeq ($(ARCH),i686) @@ -13,7 +13,7 @@ endif .PHONY: build install skel clean build: check-python - tar xzf $(DIR).tar.gz + 7z x $(DIR).7z cd $(DIR)/build/unix && $(MAKE) -f $(ARCH)_linux.mk install: diff --git a/omd/packages/snap7/snap7-full-1.3.0.tar.gz b/omd/packages/snap7/snap7-full-1.3.0.tar.gz deleted file mode 100644 index f5fd48a..0000000 Binary files a/omd/packages/snap7/snap7-full-1.3.0.tar.gz and /dev/null differ diff --git a/omd/packages/snap7/snap7-full-1.4.2.7z b/omd/packages/snap7/snap7-full-1.4.2.7z new file mode 100644 index 0000000..96d4565 Binary files /dev/null and b/omd/packages/snap7/snap7-full-1.4.2.7z differ

6 years, 3 months

Updated a few Python packages.

by Sven Panne

Module: check_mk Branch: master Commit: 7d93bd9369d3388a0c696446f54472b30d5cdc18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d93bd9369d338… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 25 15:22:41 2018 +0200 Updated a few Python packages. Pillow-5.0.0 => Pillow-5.1.0 pbr-4.0.0 => pbr-4.0.3 psutil-5.4.3 => psutil-5.4.5 pyasn1-0.4.2 => pyasn1-0.4.3 python-dateutil-2.6.1 => python-dateutil-2.7.3 Change-Id: I53868f73f5bb1de9ca7b77d6ca3883fce992d34b --- Pipfile | 10 +- Pipfile.lock | 156 +++++++++++---------- omd/packages/python-modules/Makefile | 10 +- .../{Pillow-5.0.0.tar.gz => Pillow-5.1.0.tar.gz} | Bin 14220993 -> 14286366 bytes omd/packages/python-modules/src/pbr-4.0.0.tar.gz | Bin 106169 -> 0 bytes omd/packages/python-modules/src/pbr-4.0.3.tar.gz | Bin 0 -> 108684 bytes .../python-modules/src/psutil-5.4.3.tar.gz | Bin 412550 -> 0 bytes .../python-modules/src/psutil-5.4.5.tar.gz | Bin 0 -> 418003 bytes .../python-modules/src/pyasn1-0.4.2.tar.gz | Bin 118404 -> 0 bytes .../python-modules/src/pyasn1-0.4.3.tar.gz | Bin 0 -> 118494 bytes .../src/python-dateutil-2.6.1.tar.gz | Bin 241428 -> 0 bytes .../src/python-dateutil-2.7.3.tar.gz | Bin 0 -> 302871 bytes 12 files changed, 89 insertions(+), 87 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7d93bd9369…

6 years, 3 months

Updated python-snap7 from some 0.4...0.5-ish master snapshot to 0.9.

by Sven Panne

Module: check_mk Branch: master Commit: 1a8e3adbd6081528c34ea56ae6ac00bbc54355f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8e3adbd60815… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 25 14:20:10 2018 +0200 Updated python-snap7 from some 0.4...0.5-ish master snapshot to 0.9. Change-Id: Ie222771c829dd6edd417199be49df27bad44572b --- Pipfile | 2 +- Pipfile.lock | 6 +++--- omd/packages/snap7/.gitignore | 5 ++--- omd/packages/snap7/Makefile | 7 +++---- omd/packages/snap7/python-snap7-0.9.tar.gz | Bin 0 -> 30789 bytes omd/packages/snap7/python-snap7-master.zip | Bin 55311 -> 0 bytes omd/packages/snap7/python-snap7-master.zip.LIESMICH | 1 - 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Pipfile b/Pipfile index 10cb37e..52f1df6 100644 --- a/Pipfile +++ b/Pipfile @@ -63,7 +63,7 @@ typing = "==3.6.4" scandir = "==1.7" pathlib2 = "==2.3.2" python-dateutil = "==2.6.1" -python-snap7 = "==0.5" # actually some unknown version between 0.4 and 0.5... >:-( +python-snap7 = "==0.9" [requires] python_version = "2.7" diff --git a/Pipfile.lock b/Pipfile.lock index bc20ddb..981025b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "4c9a78a171b6cbf75f960981ccc627ebe04cb758b10689332d7d641e3be6a187" + "sha256": "ee03534b1fb68ed11d8099781224d70118fd47e966da7181e3e5b1488a3914c4" }, "pipfile-spec": 6, "requires": { @@ -459,10 +459,10 @@ }, "python-snap7": { "hashes": [ - "sha256:46c0306a0f399c7ec43a028d8d81935fc02d09bf1476bf6bfb710752ba50779c" + "sha256:2df6806a2f28f9012497283c253980fb89090ab316c427b3b67f4fb4834643e7" ], "index": "pypi", - "version": "==0.5" + "version": "==0.9" }, "reportlab": { "hashes": [ diff --git a/omd/packages/snap7/.gitignore b/omd/packages/snap7/.gitignore index bb60b97..dd08a21 100644 --- a/omd/packages/snap7/.gitignore +++ b/omd/packages/snap7/.gitignore @@ -1,3 +1,2 @@ -python-snap7-0.4 -python-snap7-master -snap7-full-1.3.0 +python-snap7-[0-9].[0-9]/ +snap7-full-1.3.0/ diff --git a/omd/packages/snap7/Makefile b/omd/packages/snap7/Makefile index 9875ede..a79670f 100644 --- a/omd/packages/snap7/Makefile +++ b/omd/packages/snap7/Makefile @@ -7,22 +7,21 @@ NAME = snap7 VERSION = 1.3.0 DIR = snap7-full-$(VERSION) -PY_VERSION = master -PY_DIR = python-snap7-$(PY_VERSION) +PY_DIR = python-snap7-0.9 ARCH = $(shell uname -m) ifeq ($(ARCH),i686) ARCH=i386 endif -.PHONY: skel +.PHONY: build install skel clean build: check-python tar xzf $(DIR).tar.gz cd $(DIR)/build/unix && $(MAKE) -f $(ARCH)_linux.mk # Now handle the python module - unzip -o $(PY_DIR).zip + tar xvzf $(PY_DIR).tar.gz set -e ; for p in python-patches/*.dif ; do \ echo "applying $$p..." ; \ diff --git a/omd/packages/snap7/python-snap7-0.9.tar.gz b/omd/packages/snap7/python-snap7-0.9.tar.gz new file mode 100644 index 0000000..300b5a4 Binary files /dev/null and b/omd/packages/snap7/python-snap7-0.9.tar.gz differ diff --git a/omd/packages/snap7/python-snap7-master.zip b/omd/packages/snap7/python-snap7-master.zip deleted file mode 100644 index 9e297e4..0000000 Binary files a/omd/packages/snap7/python-snap7-master.zip and /dev/null differ diff --git a/omd/packages/snap7/python-snap7-master.zip.LIESMICH b/omd/packages/snap7/python-snap7-master.zip.LIESMICH deleted file mode 100644 index a78c9f8..0000000 --- a/omd/packages/snap7/python-snap7-master.zip.LIESMICH +++ /dev/null @@ -1 +0,0 @@ -wget -O python-snap7-git.tar.gz https://github.com/gijzelaerr/python-snap7/archive/master.zip

6 years, 3 months

Moved python-snap7 to python-modules.

by Sven Panne

Module: check_mk Branch: master Commit: 8e262fb0f99dea6fc13ea0cf222f2bfe3dc21582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e262fb0f99dea… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 25 14:43:06 2018 +0200 Moved python-snap7 to python-modules. Change-Id: Id732a4f304014f8cca2e1e96c347821500931808 --- omd/packages/python-modules/Makefile | 1 + .../patches/0017-find-omd-snap7-library.dif} | 6 +++--- .../src}/python-snap7-0.9.tar.gz | Bin omd/packages/snap7/.gitignore | 1 - omd/packages/snap7/Makefile | 22 --------------------- 5 files changed, 4 insertions(+), 26 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index ef56b1d..734ef2d 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -125,6 +125,7 @@ MODULES += scandir-1.7.tar.gz MODULES += pathlib2-2.3.2.tar.gz # Added for scheduling (cmk/schedule.py) MODULES += python-dateutil-2.6.1.tar.gz +MODULES += python-snap7-0.9.tar.gz .PHONY: build check-freetds install skel clean diff --git a/omd/packages/snap7/python-patches/0001-find-omd-snap7-library.dif b/omd/packages/python-modules/patches/0017-find-omd-snap7-library.dif similarity index 62% rename from omd/packages/snap7/python-patches/0001-find-omd-snap7-library.dif rename to omd/packages/python-modules/patches/0017-find-omd-snap7-library.dif index 7b02b1b..57d67d9 100644 --- a/omd/packages/snap7/python-patches/0001-find-omd-snap7-library.dif +++ b/omd/packages/python-modules/patches/0017-find-omd-snap7-library.dif @@ -1,6 +1,6 @@ -diff -Nur python-snap7-0.4.orig/snap7/common.py python-snap7-0.4/snap7/common.py ---- python-snap7-0.4.orig/snap7/common.py 2014-07-27 20:33:00.000000000 +0200 -+++ python-snap7-0.4/snap7/common.py 2015-02-18 10:31:15.711334756 +0100 +diff -Nur dest.orig/python-snap7-0.9/snap7/common.py dest/python-snap7-0.9/snap7/common.py +--- dest.orig/python-snap7-0.9/snap7/common.py 2014-07-27 20:33:00.000000000 +0200 ++++ dest/python-snap7-0.9/snap7/common.py 2015-02-18 10:31:15.711334756 +0100 @@ -40,7 +40,7 @@ def __init__(self, lib_location=None): if self.cdll: diff --git a/omd/packages/snap7/python-snap7-0.9.tar.gz b/omd/packages/python-modules/src/python-snap7-0.9.tar.gz similarity index 100% rename from omd/packages/snap7/python-snap7-0.9.tar.gz rename to omd/packages/python-modules/src/python-snap7-0.9.tar.gz diff --git a/omd/packages/snap7/.gitignore b/omd/packages/snap7/.gitignore index dd08a21..e5683f0 100644 --- a/omd/packages/snap7/.gitignore +++ b/omd/packages/snap7/.gitignore @@ -1,2 +1 @@ -python-snap7-[0-9].[0-9]/ snap7-full-1.3.0/ diff --git a/omd/packages/snap7/Makefile b/omd/packages/snap7/Makefile index a79670f..afb3679 100644 --- a/omd/packages/snap7/Makefile +++ b/omd/packages/snap7/Makefile @@ -1,14 +1,10 @@ include ../../Makefile.omd # This package contains the SNAP 7 library (http://snap7.sourceforge.net/) -# and also the related python bindings (https://pypi.python.org/pypi/python-snap7/). - NAME = snap7 VERSION = 1.3.0 DIR = snap7-full-$(VERSION) -PY_DIR = python-snap7-0.9 - ARCH = $(shell uname -m) ifeq ($(ARCH),i686) ARCH=i386 @@ -20,28 +16,10 @@ build: check-python tar xzf $(DIR).tar.gz cd $(DIR)/build/unix && $(MAKE) -f $(ARCH)_linux.mk -# Now handle the python module - tar xvzf $(PY_DIR).tar.gz - - set -e ; for p in python-patches/*.dif ; do \ - echo "applying $$p..." ; \ - patch -d $(PY_DIR) -p1 < $$p ; \ - done - install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib install -m 644 $(DIR)/build/bin/$(ARCH)-linux/libsnap7.so $(DESTDIR)$(OMD_ROOT)/lib - mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python && \ - export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \ - export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ - export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ - cd $(PY_DIR) && \ - $(PACKAGE_PYTHON_EXECUTABLE) setup.py install --home=$(DESTDIR)$(OMD_ROOT) \ - --prefix='' \ - --install-platlib=$(DESTDIR)$(OMD_ROOT)/lib/python \ - --install-purelib=$(DESTDIR)$(OMD_ROOT)/lib/python - skel: clean:

6 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018