Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Add some ruleset to the test site to find config load related issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 8660dc4b848670a98c4892e838bfb9ba8ac96e59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8660dc4b848670… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 16:38:39 2018 +0200 Add some ruleset to the test site to find config load related issues Change-Id: Ib78b944dff5fc9636a3982d52056b653269d2e7e --- tests/testlib/__init__.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 6e6a1b4..42bbd2f 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -798,6 +798,33 @@ class Site(object): "Failed to initialize WATO data structures " \ "(Still missing: %s)" % missing_files + self._add_wato_test_config(web) + + + # Add some test configuration that is not test specific. These settings are set only to have a + # bit more complex Check_MK config. + def _add_wato_test_config(self, web): + # This entry is interesting because it is a check specific setting. These + # settings are only registered during check loading. In case one tries to + # load the config without loading the checks in advance, this leads into an + # exception. + # We set this config option here trying to catch this kind of issue. + web.set_ruleset("fileinfo_groups", { + "ruleset": { + "": [ # "" -> folder + { + 'conditions': { + 'host_specs': ['@all'], + 'host_tags': [] + }, + 'options': {}, + 'path': '', + 'value': [('TESTGROUP', ('*gwia*', ''))] + }, + ], + } + }) + def _missing_but_required_wato_files(self): required_files = [

6 years, 3 months

Use direnv + pipenv in a more official way.

by Sven Panne

Module: check_mk Branch: master Commit: 2714b95756ba235baa6181b5ddaf2b49122842e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2714b95756ba23… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 24 17:16:49 2018 +0200 Use direnv + pipenv in a more official way. Change-Id: I5d2464b5de8dc36e8d98ab3f6f9c401d0f8bf608 --- .envrc | 11 ++--------- Makefile | 3 ++- tests/Makefile | 4 ++-- tests/conftest.py | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.envrc b/.envrc index 4030cf6..b16459f 100644 --- a/.envrc +++ b/.envrc @@ -1,9 +1,2 @@ -# Check_MK config for direnv (Environment switcher for the shell) -export PIPENV_VENV_IN_PROJECT=true - -VENV_DIR=$(pipenv --venv) -if [ -n "$VENV_DIR" ]; then - source $VENV_DIR/bin/activate -else - echo "Execute \"make setup\" to create the virtual environment" -fi +mkdir -p .venv +layout pipenv diff --git a/Makefile b/Makefile index 560bbf4..fe88adb 100644 --- a/Makefile +++ b/Makefile @@ -539,7 +539,8 @@ ifeq ($(ENTERPRISE),yes) endif .venv: Pipfile Pipfile.lock - source .envrc ; pipenv install --dev + mkdir -p .venv + pipenv install --dev direnv allow # This dummy rule is called from subdirectories whenever one of the diff --git a/tests/Makefile b/tests/Makefile index 2aca780..33ef6ad 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash -e -PYTEST=source ../.envrc ; py.test -s -vv -COVERAGE=source ../.envrc ; coverage +PYTEST=pipenv run py.test -s -vv +COVERAGE=pipenv run coverage .PHONY: help test-pylint test-integration test-gui-crawl \ test-bandit test-shellcheck setup format test-mypy \ diff --git a/tests/conftest.py b/tests/conftest.py index 299e61b..19a880b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -172,7 +172,7 @@ def verify_virtualenv(): def is_running_in_virtualenv(): - return os.environ.get("VIRTUAL_ENV") + return os.environ.get("PIP_PYTHON_PATH") def is_running_as_site_user():

6 years, 3 months

6155 FIX Service discovery page: Active checks were not correctly shown in specific cases

by Lars Michelsen

Module: check_mk Branch: master Commit: c7147547e8e5729b2c0732aca43656536398dc1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7147547e8e572… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 17:13:41 2018 +0200 6155 FIX Service discovery page: Active checks were not correctly shown in specific cases It could happen that some active checks were not correctly shown in the tables "active checks" or "disabled active checks". This was caused by specific disabled services rules. For example when using this two rules: 1. Enable all services starting with "HTTP" 2. Disable all services In this situation the HTTP service was not displayed on the discovery page. Change-Id: I91f03922529d93a1ba9c702ecfb2bf31a6f9f6ea --- .werks/6155 | 18 ++++++++++++++++++ cmk_base/discovery.py | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/.werks/6155 b/.werks/6155 new file mode 100644 index 0000000..451a14f --- /dev/null +++ b/.werks/6155 @@ -0,0 +1,18 @@ +Title: Service discovery page: Active checks were not correctly shown in specific cases +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1527174418 + +It could happen that some active checks were not correctly shown in the tables +"active checks" or "disabled active checks". This was caused by specific +disabled services rules. For example when using this two rules: + +1. Enable all services starting with "HTTP" +2. Disable all services + +In this situation the HTTP service was not displayed on the discovery page. diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index ebc0e5a..aa62ca1 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -1021,6 +1021,13 @@ def _merge_manual_services(services, hostname, on_error): # Handle disabled services -> "ignored" for (check_plugin_name, item), (check_source, paramstring) in services.items(): + if check_source in [ "legacy", "active", "custom" ]: + # These are ignored later in get_check_preview + # TODO: This needs to be cleaned up. The problem here is that service_description() can not + # calculate the description of active checks and the active checks need to be put into + # "[source]_ignored" instead of ignored. + continue + try: descr = config.service_description(hostname, check_plugin_name, item) except Exception, e:

6 years, 3 months

Revert "Minor cleanup"

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0ae136f1874ad0088e6f58f70b6fec03e3423881 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ae136f1874ad0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu May 24 16:43:08 2018 +0200 Revert "Minor cleanup" It was not quite equivalent, and broke the check for some devices. This reverts commit d9084a3e6ec849e7882d0e87db8a1647a7d06ed0. --- checks/cisco_temperature | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/checks/cisco_temperature b/checks/cisco_temperature index a8a0b90..7a9b3ee 100644 --- a/checks/cisco_temperature +++ b/checks/cisco_temperature @@ -246,29 +246,34 @@ check_info['cisco_temperature'] = { def inventory_cisco_temperature_dom(parsed): - for item, attrs in parsed.get('14', {}).iteritems(): + parsed_dom = parsed.get('14', {}) + for item, attrs in parsed_dom.iteritems(): if attrs.get('raw_dev_state') == '1': yield item, {} def check_cisco_temperature_dom(item, params, parsed): # TODO perf, precision, severity, etc. - if item in parsed.get('14', {}): - data = parsed['14'][item] + parsed_dom = parsed.get('14', {}) + if item in parsed_dom: + data = parsed_dom[item] reading = data['reading'] state, state_readable = data['dev_state'] yield state, 'Status: %s' % state_readable infotext = "%s dBm" % reading + perfdata = ['power_level', reading] state = 0 - warn, crit = data.get('dev_levels', (None, None)) - if crit is not None and reading >= crit: - state = 2 - elif warn is not None and reading >= warn: - state = 1 - if state: - infotext += " (warn/crit at %s/%s dBm)" % (warn, crit) - yield state, infotext, [('power_level', reading, warn, crit)] + if data.get('dev_levels'): + warn, crit = data['dev_levels'] + perfdata += [warn, crit] + if reading >= crit: + state = 2 + elif reading >= warn: + state = 1 + if state: + infotext += " (warn/crit at %s/%s dBm)" % (warn, crit) + yield state, infotext, [perfdata] check_info['cisco_temperature.dom'] = {

6 years, 3 months

'dev-packages' are additions to 'package', so no need to repeat oneself.

by Sven Panne

Module: check_mk Branch: master Commit: b539b209b0660e918ee7fef2bcb3086732b4ded6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b539b209b0660e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 24 14:39:12 2018 +0200 'dev-packages' are additions to 'package', so no need to repeat oneself. Change-Id: I4e5580312a85b91f1dfd99b0f034399fe4e16ce9 --- Pipfile | 1 - Pipfile.lock | 47 ++--------------------------------------------- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/Pipfile b/Pipfile index 9dfc8ce..fed56f1 100644 --- a/Pipfile +++ b/Pipfile @@ -7,7 +7,6 @@ name = "pypi" pytest = "*" pytest-cov = "*" pytest-mock = "*" -requests = "*" "beautifulsoup4" = "*" pytest-stepwise = "*" dill = "*" diff --git a/Pipfile.lock b/Pipfile.lock index d2ed571..41558e7 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "81f3afdbb94b71e5064a632693c344db4c9aa0aeda7e93ea08b31359cc63661c" + "sha256": "3399601ceca7a577b80b74ef73e81130fc94112083fd83fba5f82f892d572ae8" }, "pipfile-spec": 6, "requires": { @@ -703,20 +703,6 @@ "index": "pypi", "version": "==4.6.0" }, - "certifi": { - "hashes": [ - "sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7", - "sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0" - ], - "version": "==2018.4.16" - }, - "chardet": { - "hashes": [ - "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", - "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" - ], - "version": "==3.0.4" - }, "configparser": { "hashes": [ "sha256:5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a" @@ -777,7 +763,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -809,14 +795,6 @@ "index": "pypi", "version": "==1.0.1" }, - "idna": { - "hashes": [ - "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f", - "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4" - ], - "index": "pypi", - "version": "==2.6" - }, "isort": { "hashes": [ "sha256:1153601da39a25b14ddc54955dbbacbb6b2d19135386699e2ad58517953b34af", @@ -965,12 +943,6 @@ "index": "pypi", "version": "==1.6.4" }, - "pysocks": { - "hashes": [ - "sha256:3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672" - ], - "version": "==1.6.8" - }, "pytest": { "hashes": [ "sha256:39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d", @@ -1023,14 +995,6 @@ ], "version": "==3.12" }, - "requests": { - "hashes": [ - "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b", - "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e" - ], - "index": "pypi", - "version": "==2.18.4" - }, "six": { "hashes": [ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", @@ -1062,13 +1026,6 @@ "index": "pypi", "version": "==3.6.4" }, - "urllib3": { - "hashes": [ - "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b", - "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f" - ], - "version": "==1.22" - }, "webencodings": { "hashes": [ "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",

6 years, 3 months

Regenerate Pipfile.lock.

by Sven Panne

Module: check_mk Branch: master Commit: 7db503dd8dcc393e65811fdf68d4b2c6021d4427 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7db503dd8dcc39… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 24 14:36:01 2018 +0200 Regenerate Pipfile.lock. Change-Id: I7a9c6dffc2b6dfa753d05e11d3b81d6bfec1af0d --- Pipfile.lock | 90 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 3253c75..d2ed571 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -150,7 +150,6 @@ "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1" ], "index": "pypi", - "markers": "python_version < '3'", "version": "==1.1.6" }, "idna": { @@ -167,7 +166,6 @@ "sha256:b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c" ], "index": "pypi", - "markers": "python_version < '3'", "version": "==1.0.22" }, "mysql-python": { @@ -235,11 +233,11 @@ }, "pbr": { "hashes": [ - "sha256:4e8a0ed6a8705a26768f4c3da26026013b157821fe5f95881599556ea9d91c19", - "sha256:dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f" + "sha256:680bf5ba9b28dd56e08eb7c267991a37c7a5f90a92c2e07108829931a50ff80a", + "sha256:6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5" ], "index": "pypi", - "version": "==4.0.2" + "version": "==4.0.3" }, "pillow": { "hashes": [ @@ -348,20 +346,20 @@ }, "pyasn1": { "hashes": [ - "sha256:0d7f6e959fe53f3960a23d73f35e1fce61348b30915b6664309ca756de7c1f89", - "sha256:5a0db897b311d265cde49615cf783f1c78613138605cdd0f907ecfa5b2aba3ee", - "sha256:758cb50abddc03e4563fd9e7f03db56e3e87b58c0bd01247360326e5c0c7ffa5", - "sha256:7d626683e3d792cccc608da02498aff37ab4f3dafd8905d6bf755d11f9b26b43", - "sha256:a7efe807c4b83a859e2735c692b92ed7b567cfddc4163763412920041d876c2b", - "sha256:b5a9ca48055b9a20f6d1b3d68e38692e5431c86a0f99ea602e61294e891fee5b", - "sha256:c07d6e587b2f928366b1f67c09bda026a3e6fcc99e80a744dc67f8fca3895626", - "sha256:d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15", - "sha256:d5cd6ed995dba16fad0c521cfe31cd2d68400b53fcc2bce93326829be73ab6d1", - "sha256:d84c2aea3cf43780e9e6a19f4e4dddee9f6976519020e64e47c57e5c7a8c3dd2", - "sha256:e85895087905c65b5b594eb91f7522664c85545b147d5f4d4e7b1b07da8dcbdc", - "sha256:f81c96761fca60d64b1c9b79ec2e40cf9495a745cf570613079ef324aeb9672b" - ], - "version": "==0.4.2" + "sha256:2f57960dc7a2820ea5a1782b872d974b639aa3b448ac6628d1ecc5d0fe3986f2", + "sha256:3651774ca1c9726307560792877db747ba5e8a844ea1a41feb7670b319800ab3", + "sha256:602fda674355b4701acd7741b2be5ac188056594bf1eecf690816d944e52905e", + "sha256:8fb265066eac1d3bb5015c6988981b009ccefd294008ff7973ed5f64335b0f2d", + "sha256:9334cb427609d2b1e195bb1e251f99636f817d7e3e1dffa150cb3365188fb992", + "sha256:9a15cc13ff6bf5ed29ac936ca941400be050dff19630d6cd1df3fb978ef4c5ad", + "sha256:a66dcda18dbf6e4663bde70eb30af3fc4fe1acb2d14c4867a861681887a5f9a2", + "sha256:ba77f1e8d7d58abc42bfeddd217b545fdab4c1eeb50fd37c2219810ad56303bf", + "sha256:cdc8eb2eaafb56de66786afa6809cd9db2df1b3b595dcb25aa5b9dc61189d40a", + "sha256:d01fbba900c80b42af5c3fe1a999acf61e27bf0e452e0f1ef4619065e57622da", + "sha256:f281bf11fe204f05859225ec2e9da7a7c140b65deccd8a4eb0bc75d0bd6949e0", + "sha256:fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc" + ], + "version": "==0.4.3" }, "pyasn1-modules": { "hashes": [ @@ -387,12 +385,6 @@ "index": "pypi", "version": "==2.18" }, - "pycrypto": { - "hashes": [ - "sha256:f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" - ], - "version": "==2.6.1" - }, "pycryptodomex": { "hashes": [ "sha256:1869d7735f445bbf1681afa2acce10ad829857cfb7a4a7b702e484f222021892", @@ -428,18 +420,17 @@ }, "pyghmi": { "hashes": [ - "sha256:4b974f4721565ffc83cbca7858d50cdefea87a60ef487be169e4bc066f9ab391", - "sha256:b9b1c86971fbcbb9f875c64c4eabb88b8c4fb0136a180418e3eec55cd4c2aedb" + "sha256:be473f3fd61feb1a0c2090aac910a76610d55c6715ca6828ae31ea06c5e07c24", + "sha256:df17164fa69742763a1e7e7a6588a546f9b00fbda01b0613deed4a396885edbb" ], "index": "pypi", - "version": "==1.0.44" + "version": "==1.1.0" }, "pykerberos": { "hashes": [ "sha256:4f2dca8df5f84a3be039c026893850d731a8bb38395292e1610ffb0a08ba876c" ], "index": "pypi", - "markers": "sys_platform != 'win32'", "version": "==1.2.1" }, "pymssql": { @@ -495,11 +486,11 @@ }, "pyopenssl": { "hashes": [ - "sha256:07a2de1a54de07448732a81e38a55df7da109b2f47f599f8bb35b0cbec69d4bd", - "sha256:2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773" + "sha256:26ff56a6b5ecaf3a2a59f132681e2a80afcc76b4f902f612f518f92c2a1bf854", + "sha256:6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580" ], "index": "pypi", - "version": "==17.5.0" + "version": "==18.0.0" }, "pypdf2": { "hashes": [ @@ -673,6 +664,13 @@ ], "version": "==1.4.9" }, + "atomicwrites": { + "hashes": [ + "sha256:240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585", + "sha256:a24da68318b08ac9c9c45029f4a10371ab5b20e4226738e150e6e7c571630ae6" + ], + "version": "==1.1.5" + }, "attrs": { "hashes": [ "sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265", @@ -779,7 +777,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { @@ -798,10 +796,10 @@ }, "gitpython": { "hashes": [ - "sha256:05069e26177c650b3cb945dd543a7ef7ca449f8db5b73038b465105673c1ef61", - "sha256:c47cc31af6e88979c57a33962cbc30a7c25508d74a1b3a19ec5aa7ed64b03129" + "sha256:1ec4c44846cf76a1e55769560673a97731849c9d05401e035e607495f10db959", + "sha256:b60b045cf64a321e5b620debb49890099fa6c7be6dfb7fb249027e5d34227301" ], - "version": "==2.1.9" + "version": "==2.1.10" }, "html5lib": { "hashes": [ @@ -920,19 +918,19 @@ }, "more-itertools": { "hashes": [ - "sha256:0dd8f72eeab0d2c3bd489025bb2f6a1b8342f9b198f6fc37b52d15cfa4531fea", - "sha256:11a625025954c20145b37ff6309cd54e39ca94f72f6bb9576d1195db6fa2442e", - "sha256:c9ce7eccdcb901a2c75d326ea134e0886abfbea5f93e91cc95de9507c0816c44" + "sha256:2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8", + "sha256:6703844a52d3588f951883005efcf555e49566a48afd4db4e965d69b883980d3", + "sha256:a18d870ef2ffca2b8463c0070ad17b5978056f403fb64e3f15fe62a52db21cc0" ], - "version": "==4.1.0" + "version": "==4.2.0" }, "pbr": { "hashes": [ - "sha256:4e8a0ed6a8705a26768f4c3da26026013b157821fe5f95881599556ea9d91c19", - "sha256:dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f" + "sha256:680bf5ba9b28dd56e08eb7c267991a37c7a5f90a92c2e07108829931a50ff80a", + "sha256:6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5" ], "index": "pypi", - "version": "==4.0.2" + "version": "==4.0.3" }, "pluggy": { "hashes": [ @@ -975,11 +973,11 @@ }, "pytest": { "hashes": [ - "sha256:54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8", - "sha256:829230122facf05a5f81a6d4dfe6454a04978ea3746853b2b84567ecf8e5c526" + "sha256:39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d", + "sha256:c76e93f3145a44812955e8d46cdd302d8a45fbfc7bf22be24fe231f9d8d8853a" ], "index": "pypi", - "version": "==3.5.1" + "version": "==3.6.0" }, "pytest-cov": { "hashes": [

6 years, 3 months

Remove 'socks' extra from 'requests' package.

by Sven Panne

Module: check_mk Branch: master Commit: 9d60c17e1c3466535b9c4a2e1fecd06242675e58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d60c17e1c3466… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 24 14:50:08 2018 +0200 Remove 'socks' extra from 'requests' package. The 'extra' in the top-level Pipfile was wrong: Only the agent updater needs this, not Check_MK itself. To test in a correct way, the agent updater needs a separate Pipfile (and consequently a separate virtual environment), anyway. Change-Id: Ia0ba1378b90b3a2ec0918a709604049deec220e4 --- Pipfile | 2 +- Pipfile.lock | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Pipfile b/Pipfile index fed56f1..ab817d1 100644 --- a/Pipfile +++ b/Pipfile @@ -47,7 +47,7 @@ netifaces = "*" dnspython = "*" idna = "*" cryptography = "*" -requests = {extras = ["socks"]} +requests = "*" pyOpenSSL = "*" pykerberos = "*" requests-kerberos = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 41558e7..7829269 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "3399601ceca7a577b80b74ef73e81130fc94112083fd83fba5f82f892d572ae8" + "sha256": "a0ad67c402261dfc9c6516043f83a310c5dab160d45f30c6c58694ea822011e9" }, "pipfile-spec": 6, "requires": { @@ -535,12 +535,6 @@ "index": "pypi", "version": "==4.4.4" }, - "pysocks": { - "hashes": [ - "sha256:3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672" - ], - "version": "==1.6.8" - }, "pysphere": { "hashes": [ "sha256:2d0a4c6c39cf9564b1b1099a6207e7af5811023fd2e4a5467c82f31eaf7f360f", @@ -763,7 +757,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": {

6 years, 3 months

Synched Pipfile with our shipped Python module versions.

by Sven Panne

Module: check_mk Branch: master Commit: 9b9c94a267847c20f02cbae80ecadf5612e5f984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b9c94a267847c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 24 15:21:50 2018 +0200 Synched Pipfile with our shipped Python module versions. Change-Id: I44efe07bb0a11d5b41afcff7cc765fdcddfd739d --- Pipfile | 88 ++++++----- Pipfile.lock | 499 +++++++++++++++++++++++++---------------------------------- 2 files changed, 259 insertions(+), 328 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9b9c94a267…

6 years, 3 months

Fixed building vanilla agent debs on bionic

by Lars Michelsen

Module: check_mk Branch: master Commit: de1142ffbc8311aec36ca237062e5823ac5869a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1142ffbc8311… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 23 19:54:33 2018 +0200 Fixed building vanilla agent debs on bionic Change-Id: I5fad83c14b08013f17e42075c766c272795f7869 --- agents/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 6079d69..608ac7c 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -113,12 +113,12 @@ deb $(DEB_PACKAGE): $(RPM_PACKAGE) cd deb-unpack && \ ar x ../$$DEB_PKG && \ mkdir ctrl && \ - tar xzf control.tar.gz -C ctrl && \ + tar xJf control.tar.xz -C ctrl && \ sed -i -e '/^Depends:/d' \ -e 's/^Version:.*/Version: $(VERSION)-1/' \ -e 's/^Maintainer:.*/Maintainer: feedback(a)check-mk.org/' ctrl/control && \ - tar czf control.tar.gz $(TAROPTS) -C ctrl . && \ - ar r ../$(DEB_PACKAGE) debian-binary control.tar.gz data.tar.* + tar cJf control.tar.xz $(TAROPTS) -C ctrl . && \ + ar r ../$(DEB_PACKAGE) debian-binary control.tar.* data.tar.* rm -rf deb-unpack clean:

6 years, 3 months

Vanilla Agent RPM: Dont terminate build because of binaries in package

by Lars Michelsen

Module: check_mk Branch: master Commit: e6494fb8240bb2c39d6c1ee7e647a92ac8a5860b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6494fb8240bb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 23 19:30:02 2018 +0200 Vanilla Agent RPM: Dont terminate build because of binaries in package Change-Id: I747dc327981f04e4adecd099cf69ae63297eddcc --- agents/check-mk-agent.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index ca0378f..2f33493 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -42,6 +42,8 @@ Provides: check_mk-agent check_mk_agent The Check_MK Agent uses xinetd to provide information about the system on TCP port 6556. This can be used to monitor the host via Check_MK. +%define _binaries_in_noarch_packages_terminate_build 0 + %prep %setup -n check-mk-agent-%{_version}

6 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
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