Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Sven Panne

Module: check_mk Branch: master Commit: cd144919b32703df7736c7eee02765ad4447c722 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd144919b32703… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 19 08:53:32 2018 +0100 Improved ignorance. Change-Id: I3a956dae834567688b782a5424355f14b32020ae --- omd/.gitignore | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/omd/.gitignore b/omd/.gitignore index d4ef23b..9aacbb5 100644 --- a/omd/.gitignore +++ b/omd/.gitignore @@ -1,18 +1,25 @@ -omd-*.tar.gz -omd-*.deb -destdir -rpm.topdir -dpkg.topdir -omd.spec +*.log .*.swp -rpm.buildroot -omd-*-*.rpm -build-stamp -patch-stamp .config -*.log -debian/changelog .werks/.last .werks/.my_ids .werks/werks ChangeLog +Python-[0-9].[0-9].[0-9][0-9]/ +bin/ +boost_[0-9]_[0-9][0-9]_[0-9]/ +build-helper/ +build-stamp +debian/changelog +destdir +dpkg.topdir +freetds-[0-9].[0-9][0-9].[0-9][0-9]/ +omd-*-*.rpm +omd-*.deb +omd-*.tar.gz +omd.spec +patch-stamp +python-modules-1.6.0i1.cme/ +re2-20[12][0-9]-[01][0-9]-[0-3][0-9]/ +rpm.buildroot +rpm.topdir

5 years, 10 months

mk_jolokia: refactor

by Moritz Kiemer

Module: check_mk Branch: master Commit: e5c4090cc2d09974339dd657f723a7598840f561 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c4090cc2d099… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 16 11:15:25 2018 +0100 mk_jolokia: refactor extract funny make_item_list function Change-Id: Ie9f40fff6126964598d003551c5a0380d72f1139 --- agents/plugins/mk_jolokia | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 4e05bc0..ab61da4 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -191,7 +191,6 @@ def fetch_var(protocol, port, path, suburi, - itemspec, service_url, service_user, service_password, @@ -220,12 +219,12 @@ def fetch_var(protocol, # Only take the value of the object. If the value is an object # take the first items first value. # {'Catalina:host=localhost,path=\\/test,type=Manager': {'activeSessions': 0}} - if 'value' not in obj: + try: + return obj['value'] + except KeyError: if VERBOSE: sys.stderr.write("ERROR: not found: %s\n" % path) return [] - val = obj.get('value', None) - return make_item_list((), val, itemspec) # convert single values into lists of items in @@ -281,11 +280,11 @@ def extract_item(key, itemspec): def fetch_metric(inst, path, title, itemspec, inst_add=None): - values = fetch_var(inst["protocol"], inst["server"], inst["port"], path, inst["suburi"], - itemspec, inst["service_url"], inst["service_user"], - inst["service_password"]) + value = fetch_var(inst["protocol"], inst["server"], inst["port"], path, inst["suburi"], + inst["service_url"], inst["service_user"], inst["service_password"]) + item_list = make_item_list((), value, itemspec) - for subinstance, value in values: + for subinstance, value in item_list: if not subinstance and not title: sys.stderr.write("INTERNAL ERROR: %s\n" % value) continue @@ -315,18 +314,18 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean): if not do_search: return [(mbean + "/" + path, title, itemspec)] + value = fetch_var( + inst["protocol"], + inst["server"], + inst["port"], + mbean, + inst["suburi"], + None, + None, + None, + function="search") try: - paths = fetch_var( - inst["protocol"], - inst["server"], - inst["port"], - mbean, - inst["suburi"], - "", - None, - None, - None, - function="search")[0][1] + paths = make_item_list((), value, "")[0][1] except IndexError: return [] @@ -388,8 +387,9 @@ def prepare_http_opener(inst): def generate_jolokia_info(inst): # Determine type of server - server_info = fetch_var(inst["protocol"], inst["server"], inst["port"], "", inst["suburi"], "", - None, None, None) + value = fetch_var(inst["protocol"], inst["server"], inst["port"], "", inst["suburi"], None, + None, None) + server_info = make_item_list((), value, "") if not server_info: sys.stderr.write("%s ERROR: Empty server info\n" % (inst["instance"],))

5 years, 10 months

Extend docs and validation for regex groups in ps check config

by Óscar Nájera

Module: check_mk Branch: master Commit: cd4d89d2c68adb7c69293143c62f9175c103697b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd4d89d2c68adb… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Nov 16 18:10:30 2018 +0100 Extend docs and validation for regex groups in ps check config Group matches are instantiated during discovery, to recognize different services. But at checktime, because the way regex is intended to work matches are substrings. In the case the user has processes with common substrings, this would lead to repeated counts of process for the process rule with the shortest string. This could be the intended behavior. In case the user wants to have each service considered as separate case at checktime, he should be informed about using delimiters around groups. CMK-1276 Change-Id: Ic85218fe70d3696dacc5e84226eac1a8aab9e4e9 --- cmk/gui/plugins/wato/check_parameters.py | 10 ++++- cmk/regex.py | 15 +++++++ tests/unit/checks/test_ps.py | 69 +++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 27afbdd..99ba669 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import cmk.defines as defines +import cmk.regex as regex from cmk.gui.plugins.wato.active_checks import check_icmp_params @@ -1425,11 +1426,18 @@ register_rule( RegExp( size=50, mode=RegExp.prefix, + validate=regex.forbid_re_delimiters_inside_groups, ), title=_("Regular expression matching command line"), label=_("Command line:"), help=_("This regex must match the <i>beginning</i> of the complete " - "command line of the process including arguments"), + "command line of the process including arguments.<br>" + "When using groups, matches will be instantiated " + "during process discovery. e.g. (py.*) will match python, python_dev " + "and python_test and discover 3 services. At check time, because " + "python is a substring of python_test and python_dev it will aggregate" + "all process that start with python. If that is not the intended behavior " + "please use a delimiter like '$' or '\\b' around the group, e.g. (py.*)$"), forth=lambda x: x[1:], # remove ~ back=lambda x: "~" + x, # prefix ~ ), diff --git a/cmk/regex.py b/cmk/regex.py index 0540a23..b24526a 100644 --- a/cmk/regex.py +++ b/cmk/regex.py @@ -29,6 +29,7 @@ import re from typing import Dict, Pattern # pylint:disable=unused-import from cmk.exceptions import MKGeneralException +from cmk.gui.exceptions import MKUserError from cmk.i18n import _ g_compiled_regexes = {} # type: Dict[str, Pattern] @@ -67,3 +68,17 @@ def escape_regex_chars(match): r += "\\" r += c return r + + +def forbid_re_delimiters_inside_groups(pattern, varprefix): + # Used as input validation in PS check wato config + group_re = r'$.*?$' + for match in re.findall(group_re, pattern): + for char in ['\\b', '$', '^']: + if char in match: + raise MKUserError( + varprefix, + _('"%s" is not allowed inside the regular expression group %s. ' + 'Bounding characters inside groups will vanish after discovery, ' + 'because processes are instanced for every matching group. ' + 'Thus enforce delimiters outside the group.') % (char, match)) diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index 4921539..1916640 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -1,6 +1,8 @@ from collections import namedtuple import pytest from cmk_base.check_api import MKGeneralException +from cmk.gui.exceptions import MKUserError +from cmk.regex import forbid_re_delimiters_inside_groups from checktestlib import CheckResult, assertCheckResultsEqual pytestmark = pytest.mark.checks @@ -165,7 +167,6 @@ input_ids = [ @pytest.mark.parametrize("capture, result", zip(generate_inputs(), result_parse), ids=input_ids) def test_parse_ps(check_manager, capture, result): check = check_manager.get_check("ps") - #assert check.context["ps_merge_wmic_info"](capture) == result parsed = check.run_parse(capture) assert parsed[0] == result[0] # cpu_cores @@ -589,3 +590,69 @@ def test_check_ps_common_count(check_manager, levels, reference): output = CheckResult(check.context["check_ps_common"]('empty', params, parsed, cpu_cores=1)) assertCheckResultsEqual(output, reference) + + +(a)pytest.mark.parametrize('pattern', ["(test)$", 'foo\\b', '^bar', '\\bfoo\\b', '(a)\\b']) +def test_validate_ps_allowed_regex(pattern): + assert forbid_re_delimiters_inside_groups(pattern, '') is None + + +(a)pytest.mark.parametrize('pattern', ["(test$)", '(foo\\b)', '(^bar)', '(\\bfoo\\b)']) +def test_validate_ps_forbidden_regex(pattern): + with pytest.raises(MKUserError): + forbid_re_delimiters_inside_groups(pattern, '') + + +def test_subset_patterns(check_manager): + + check = check_manager.get_check("ps") + + parsed = check.run_parse( + splitter("""(user,0,0,0.5) main +(user,0,0,0.4) main_dev +(user,0,0,0.1) main_dev +(user,0,0,0.5) main_test"""))[1] + + # Boundary in match is necessary otherwise main instance accumulates all + wato_rule = [({ + 'cpu_rescale_max': True, + 'default_params': { + 'levels': (1, 1, 99999, 99999) + }, + 'match': '~(main.*)\\b', + 'descr': '%s' + }, [], ["@all"], {})] + + discovered = [ + ('main', { + 'cpu_rescale_max': True, + 'levels': (1, 1, 99999, 99999), + 'process': '~main\\b', + 'user': None, + }), + ('main_dev', { + 'cpu_rescale_max': True, + 'levels': (1, 1, 99999, 99999), + 'process': '~main_dev\\b', + 'user': None, + }), + ('main_test', { + 'cpu_rescale_max': True, + 'levels': (1, 1, 99999, 99999), + 'process': '~main_test\\b', + 'user': None, + }), + ] + + assert check.context["inventory_ps_common"]([], wato_rule, parsed) == discovered + + def counted_reference(count): + return CheckResult([ + (0, "%s process%s" % (count, '' if count == 1 else 'es'), [("count", count, 100000, + 100000, 0, None)]), + (0, "0.5% CPU", [("pcpu", 0.5, None, None, None, None)]), + ]) + + for (item, params), count in zip(discovered, [1, 2, 1]): + output = CheckResult(check.context["check_ps_common"](item, params, parsed, cpu_cores=1)) + assertCheckResultsEqual(output, counted_reference(count))

5 years, 10 months

Bug fix type validation: Not integral raises the error

by Óscar Nájera

Module: check_mk Branch: master Commit: 73f67622108d1d4bdf343fc1cdcaea32ba86df19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73f67622108d1d… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Nov 16 14:51:58 2018 +0100 Bug fix type validation: Not integral raises the error Change-Id: I50e9b5c5874d9bf43176ccde7e014c2690bc5787 --- cmk/gui/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 133a73f..bdee4a4 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -363,7 +363,7 @@ class Integer(ValueSpec): return text def validate_datatype(self, value, varprefix): - if isinstance(value, numbers.Integral): + if not isinstance(value, numbers.Integral): raise MKUserError( varprefix, _("The value %r has the wrong type %s, but must be of type int") %

5 years, 10 months

6905 jolokia_generic: Don't discover wrong types

by Moritz Kiemer

Module: check_mk Branch: master Commit: 327930c101ac92e66b87f79ff15c3be607f3f1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=327930c101ac92… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 16 14:38:49 2018 +0100 6905 jolokia_generic: Don't discover wrong types The jolokia generic check no longer discovers services that would -- due to the wrong value type -- go to UNKNOWN anyway. Change-Id: I04aac60c6a007cd9f813b95574ff10e1f4e3fcbc --- .werks/6905 | 12 ++++++++++++ checks/jolokia_generic | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/6905 b/.werks/6905 new file mode 100644 index 0000000..909ba99 --- /dev/null +++ b/.werks/6905 @@ -0,0 +1,12 @@ +Title: jolokia_generic: Don't discover wrong types +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542375396 +Class: feature + +The jolokia generic check no longer discovers services that would + -- due to the wrong value type -- go to UNKNOWN anyway. + diff --git a/checks/jolokia_generic b/checks/jolokia_generic index e223ca2..800b7c4 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -88,8 +88,12 @@ check_info["jolokia_generic.string"] = { def inventory_jolokia_generic_rate(parsed): - for item in parsed: - if parsed[item]["type"] == "rate": + for item, data in parsed.iteritems(): + if data.get("type") == "rate": + try: + float(data["value"]) + except (KeyError, ValueError): + continue yield item, {} @@ -163,8 +167,12 @@ check_info["jolokia_generic.rate"] = { def inventory_jolokia_generic(parsed): - for item in parsed: - if parsed[item]["type"] == "number": + for item, data in parsed.iteritems(): + if data.get("type") == "number": + try: + float(data["value"]) + except (KeyError, ValueError): + continue yield item, {}

5 years, 10 months

CMK-1134: rework OMD Makefiles

by Lars Michelsen

Module: check_mk Branch: master Commit: 82632174979bd68f564da4b1c32476e6734d23e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82632174979bd6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 13:18:05 2018 +0100 CMK-1134: rework OMD Makefiles omd/Makefile - includes omd/packages/packages.mk - definitions of common recepies and Variables - Tools defined by Variable - includes omd/packages/*/*.mk - Package Makefiles include speciffic recepies for each Package - Define Package Dependencies - Are incremental buildable - helper files in build-helper/ - build-helper files used as reference for dependencies Genereal naming scheme: Package-name = folder-name Makefile-name = folder-name.make Archive-name = folder-name-version.extension Build-helper-files = folder-name-version-{build,install,patching...} # patching instad of patch to avoid confusion (tool patch) Change-Id: I2b476dcca50f0d317fe95eb6968e912b5c5a9f86 --- Makefile | 2 +- agents/windows/test/build-googletest | 2 +- omd/Makefile | 64 +++-- omd/packages/{python => Python}/.f12 | 0 omd/packages/{python => Python}/.gitignore | 0 omd/packages/{python => Python}/Python-2.7.15.tgz | Bin omd/packages/Python/Python.make | 125 +++++++++ .../patches/pycompile_compile_atomic.dif | 0 omd/packages/{python => Python}/sitecustomize.py | 0 .../{check_webinject => Webinject}/.gitignore | 0 .../Webinject-1.88.tar.gz | Bin omd/packages/Webinject/Webinject.make | 30 ++ .../patches/0001-no_auto_install.dif} | 0 .../apache-omd/{Makefile => apache-omd.make} | 62 +++-- omd/packages/boost/{Makefile => boost.make} | 44 +-- omd/packages/check_mk/{Makefile => check_mk.make} | 80 +++--- .../check_multi/{Makefile => check_multi.make} | 70 ++--- omd/packages/check_mysql_health/Makefile | 29 -- .../check_mysql_health/check_mysql_health.make | 39 +++ omd/packages/check_oracle_health/Makefile | 29 -- .../check_oracle_health/check_oracle_health.make | 37 +++ omd/packages/check_webinject/Makefile | 26 -- omd/packages/dokuwiki/Makefile | 70 ----- omd/packages/dokuwiki/dokuwiki.make | 80 ++++++ ...01-style-arctic.patch => 0001-style-arctic.dif} | 0 .../{0002-pdflink.patch => 0002-pdflink.dif} | 0 ...tyle-dokuwiki.patch => 0003-style-dokuwiki.dif} | 0 omd/packages/freetds/Makefile | 47 ---- omd/packages/freetds/freetds.make | 39 +++ .../googletest/{Makefile => googletest.make} | 0 omd/packages/{nail => heirloom-mailx}/.gitignore | 0 .../heirloom-mailx-12.5.tar.gz | Bin omd/packages/heirloom-mailx/heirloom-mailx.make | 29 ++ .../patches/0001-disable-ssl-and-kerberos.dif | 0 .../{nail => heirloom-mailx}/skel/etc/mail.rc | 0 omd/packages/heirloom-pkgtools/Makefile | 32 --- .../heirloom-pkgtools/heirloom-pkgtools.make | 32 +++ omd/packages/icinga/Makefile | 68 ----- omd/packages/icinga/icinga.make | 68 +++++ omd/packages/jmx4perl/Makefile | 46 --- omd/packages/jmx4perl/jmx4perl.make | 47 ++++ omd/packages/libgsf/Makefile | 24 -- omd/packages/libgsf/libgsf.make | 30 ++ omd/packages/maintenance/Makefile | 20 -- omd/packages/maintenance/maintenance.make | 24 ++ omd/packages/mk-livestatus/Makefile | 33 --- omd/packages/mk-livestatus/mk-livestatus.make | 41 +++ omd/packages/mod_fcgid/Makefile | 37 --- omd/packages/mod_fcgid/mod_fcgid.make | 45 +++ ...roc_unix.c.patch => 0001-fcgid_proc_unix.c.dif} | 0 ...id_pm_unix.c.patch => 0002-fcgid_pm_unix.c.dif} | 0 omd/packages/mod_wsgi/Makefile | 57 ---- omd/packages/mod_wsgi/mod_wsgi.make | 62 +++++ omd/packages/monitoring-plugins/Makefile | 46 --- .../monitoring-plugins/monitoring-plugins.make | 46 +++ omd/packages/msitools/Makefile | 55 ---- omd/packages/msitools/msitools.make | 51 ++++ omd/packages/nagios/Makefile | 101 ------- omd/packages/nagios/nagios.make | 91 ++++++ omd/packages/nagvis/Makefile | 55 ---- omd/packages/nagvis/nagvis.make | 57 ++++ .../{0001-global.php.patch => 0001-global.php.dif} | 0 .../{0002-cmkadmin.patch => 0002-cmkadmin.dif} | 0 omd/packages/nail/Makefile | 28 -- omd/packages/navicli/{Makefile => navicli.make} | 33 ++- omd/packages/net-snmp/{Makefile => net-snmp.make} | 59 ++-- omd/packages/nrpe/Makefile | 33 --- omd/packages/nrpe/nrpe.make | 36 +++ omd/packages/nsca/Makefile | 35 --- omd/packages/nsca/nsca.make | 38 +++ ...lation.diff => 0001-fix-broken-compilation.dif} | 0 omd/packages/omd/Makefile | 40 --- omd/packages/omd/omd.make | 44 +++ omd/packages/openhardwaremonitor/Makefile | 54 ---- .../openhardwaremonitor/openhardwaremonitor.make | 59 ++++ omd/packages/packages.make | 105 +++++++ omd/packages/patch/Makefile | 20 -- omd/packages/patch/patch.make | 27 ++ .../perl-modules/{Makefile => perl-modules.make} | 58 ++-- .../pnp4nagios/{Makefile => pnp4nagios.make} | 54 ++-- omd/packages/python-modules/Makefile | 293 -------------------- omd/packages/python-modules/python-modules.make | 308 +++++++++++++++++++++ omd/packages/python/Makefile | 107 ------- omd/packages/re2/{Makefile => re2.make} | 39 +-- ...iff => 0001-xff_field_missing_from_rrdinfo.dif} | 0 omd/packages/rrdtool/{Makefile => rrdtool.make} | 62 +++-- omd/packages/snap7/Makefile | 36 --- omd/packages/snap7/snap7.make | 42 +++ 88 files changed, 1973 insertions(+), 1709 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8263217497…

5 years, 10 months

CMK-1215: update cryptography to 2.4.1 for most distros

by Alex Zurhake

Module: check_mk Branch: master Commit: f0dfeda51e9952cb2b66557a9cdf846c4f4b661e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0dfeda51e9952… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Nov 16 09:58:43 2018 +0100 CMK-1215: update cryptography to 2.4.1 for most distros Change-Id: I490528e726510b6d6aea9c4bdfb3fc4394ca3b7b --- Pipfile | 2 +- Pipfile.lock | 48 ++++++++++----------- omd/packages/python-modules/Makefile | 2 +- .../python-modules/src/cryptography-2.3.1.tar.gz | Bin 449577 -> 0 bytes .../python-modules/src/cryptography-2.4.1.tar.gz | Bin 0 -> 468551 bytes 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Pipfile b/Pipfile index 6c544e9..20d4d9d 100644 --- a/Pipfile +++ b/Pipfile @@ -54,7 +54,7 @@ dnspython = "==1.15.0" # python-ad = "==0.9" This seems to be dead and is not on PyPi! idna = "==2.7" asn1crypto = "==0.24.0" -cryptography = "==2.3.1" +cryptography = "==2.4.1" certifi = "==2018.10.15" chardet = "==3.0.4" urllib3 = "==1.24.1" diff --git a/Pipfile.lock b/Pipfile.lock index 51221a2..d0e6b0c 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "04237eb9d55daafcfd8f6d666bd340df5c8fe31997b5bd5e97bca0c15135c553" + "sha256": "c7802d9f51c06a506595ddd18499de428deeda868fa26a70e4119507b449624d" }, "pipfile-spec": 6, "requires": { @@ -209,28 +209,28 @@ }, "cryptography": { "hashes": [ - "sha256:02602e1672b62e803e08617ec286041cc453e8d43f093a5f4162095506bc0beb", - "sha256:10b48e848e1edb93c1d3b797c83c72b4c387ab0eb4330aaa26da8049a6cbede0", - "sha256:17db09db9d7c5de130023657be42689d1a5f60502a14f6f745f6f65a6b8195c0", - "sha256:227da3a896df1106b1a69b1e319dce218fa04395e8cc78be7e31ca94c21254bc", - "sha256:2cbaa03ac677db6c821dac3f4cdfd1461a32d0615847eedbb0df54bb7802e1f7", - "sha256:31db8febfc768e4b4bd826750a70c79c99ea423f4697d1dab764eb9f9f849519", - "sha256:4a510d268e55e2e067715d728e4ca6cd26a8e9f1f3d174faf88e6f2cb6b6c395", - "sha256:6a88d9004310a198c474d8a822ee96a6dd6c01efe66facdf17cb692512ae5bc0", - "sha256:76936ec70a9b72eb8c58314c38c55a0336a2b36de0c7ee8fb874a4547cadbd39", - "sha256:7e3b4aecc4040928efa8a7cdaf074e868af32c58ffc9bb77e7bf2c1a16783286", - "sha256:8168bcb08403ef144ff1fb880d416f49e2728101d02aaadfe9645883222c0aa5", - "sha256:8229ceb79a1792823d87779959184a1bf95768e9248c93ae9f97c7a2f60376a1", - "sha256:8a19e9f2fe69f6a44a5c156968d9fc8df56d09798d0c6a34ccc373bb186cee86", - "sha256:8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6", - "sha256:be495b8ec5a939a7605274b6e59fbc35e76f5ad814ae010eb679529671c9e119", - "sha256:dc2d3f3b1548f4d11786616cf0f4415e25b0fbecb8a1d2cd8c07568f13fdde38", - "sha256:e4aecdd9d5a3d06c337894c9a6e2961898d3f64fe54ca920a72234a3de0f9cb3", - "sha256:e79ab4485b99eacb2166f3212218dd858258f374855e1568f728462b0e6ee0d9", - "sha256:f995d3667301e1754c57b04e0bae6f0fa9d710697a9f8d6712e8cca02550910f" - ], - "index": "pypi", - "version": "==2.3.1" + "sha256:02915ee546b42ce513e8167140e9937fc4c81a06a82216e086ccce51f347948a", + "sha256:03cc8bc5a69ae3d44acf1a03facdb7c10a94c67907862c563e10efe72b737977", + "sha256:07f76bde6815c55195f3b3812d35769cc7c765144c0bb71ae45e02535d078591", + "sha256:13eac1c477b9af7e9a9024369468d08aead6ad78ed599d163ad046684474364b", + "sha256:179bfb585c5efc87ae0e665770e4896727b92dbc1f810c761b1ebf8363e2fec8", + "sha256:414af0ba308e74c1f8bc5b11befc86cb66b10be8959547786f64258830d2096f", + "sha256:41a1ca14f255df8c44dd22c6006441d631d1589104045ec7263cc47e9772f41a", + "sha256:54947eb98bc4eef99ddf49f45d2694ea5a3929ab3edc9806ad01967368594d82", + "sha256:5bac7a2abda07d0c3c8429210349bb54149ad8940dc7bcffedcd56519b410a3c", + "sha256:7f41af8c586bed9f59cfe8832d818b3b75c860d7025da9cd2db76875a72ff785", + "sha256:8004fae1b3cb2dbd90a011ad972e49a7e78a871b89c70cc7213cf4ebd2532bcb", + "sha256:8e0eccadc3b465e12c50a5b8fb4d39cf401b44d7bb9936c70fddb5e5aaf740d5", + "sha256:95b4741722269cfdc134fec23b7ae6503ee2aea83d0924cfee6d6ec54cd42d8e", + "sha256:a06f5aa6d7a94531dfe82eb2972e669258c452fe9cf88f76116610de4c789785", + "sha256:b0833d27c7eb536bc27323a1e8e22cb39ebac78c4ef3be0167ba40f447344808", + "sha256:b72dec675bc59a01edc96616cd48ec465b714481caa0938c8bbca5d18f17d5df", + "sha256:c800ddc23b5206ce025f23225fdde89cdc0e64016ad914d5be32d1f602ce9495", + "sha256:c980c8c313a5e014ae12e2245e89e7b30427e5a98cbb88afe478ecae85f3abaa", + "sha256:e85b410885addaeb31a867eabcefc9ef4a7e904ad45eac9e60a763a54b244626" + ], + "index": "pypi", + "version": "==2.4.1" }, "dicttoxml": { "hashes": [ @@ -1091,7 +1091,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index da5448c..f60301f 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -112,7 +112,7 @@ else ifneq ($(filter $(DISTRO_CODE),el6),) PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch else MODULES += asn1crypto-0.24.0.tar.gz - MODULES += cryptography-2.3.1.tar.gz + MODULES += cryptography-2.4.1.tar.gz endif MODULES += certifi-2018.10.15.tar.gz diff --git a/omd/packages/python-modules/src/cryptography-2.3.1.tar.gz b/omd/packages/python-modules/src/cryptography-2.3.1.tar.gz deleted file mode 100644 index 8510af4..0000000 Binary files a/omd/packages/python-modules/src/cryptography-2.3.1.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/cryptography-2.4.1.tar.gz b/omd/packages/python-modules/src/cryptography-2.4.1.tar.gz new file mode 100644 index 0000000..cbbc1a6 Binary files /dev/null and b/omd/packages/python-modules/src/cryptography-2.4.1.tar.gz differ

5 years, 10 months

Cleaned up index.py from .f12 file

by Lars Michelsen

Module: check_mk Branch: master Commit: 48fe470220f8c9caff5a566650fb32179318fbbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48fe470220f8c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 16 11:35:21 2018 +0100 Cleaned up index.py from .f12 file Change-Id: I12dc70227576db7d8ef4d4b6a158863547361ae1 --- omd/packages/omd/.f12 | 1 - 1 file changed, 1 deletion(-) diff --git a/omd/packages/omd/.f12 b/omd/packages/omd/.f12 index 4c7ba1c..771d63f 100755 --- a/omd/packages/omd/.f12 +++ b/omd/packages/omd/.f12 @@ -7,7 +7,6 @@ ROOT=/omd/sites/$SITE # Little install helper used during development and test sudo cp -v bash_completion $ROOT/lib/omd/bash_completion -sudo cp -v index.py $ROOT/share/omd/htdocs/index.py sudo cp -v logout.php $ROOT/share/omd/htdocs/logout.php sudo rm -vf $ROOT/share/man/man8/omd.8.gz sudo cp -v omd.8 $ROOT/share/man/man8/omd.8

5 years, 10 months

jolokia_generic/jolokia_metric: refactor and add testcase

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7838bdc1b63157a207ddf1934a5fa05359d5a3d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7838bdc1b63157… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Nov 15 15:06:15 2018 +0100 jolokia_generic/jolokia_metric: refactor and add testcase Change-Id: Icb962af677c2c5d309d462a29261bff876ceaa13 --- checks/jolokia.include | 72 ++++++++++++++++++++++ checks/jolokia_generic | 14 ++--- checks/jolokia_metrics | 44 ++++++------- .../generictests/datasets/jolokia_generic.py | 14 +++++ tests/unit/checks/test_jolokia_include.py | 33 ++++++++++ 5 files changed, 147 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7838bdc1b6…

5 years, 10 months

Fixed quoting issue in omd f.12

by Lars Michelsen

Module: check_mk Branch: master Commit: ed87aa42690212e8dce0d5a250612c23c9e610cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed87aa42690212… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 16 11:01:43 2018 +0100 Fixed quoting issue in omd f.12 Change-Id: I5f895ab4465107e9c453e18e73d16cc3f8032048 --- omd/packages/omd/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/omd/.f12 b/omd/packages/omd/.f12 index eb45111..4c7ba1c 100755 --- a/omd/packages/omd/.f12 +++ b/omd/packages/omd/.f12 @@ -27,4 +27,4 @@ echo $OLD_VERSION echo "Keeping version number in 'omd' at $OLD_VERSION" sudo sed -i "s|###OMD_VERSION###|$OLD_VERSION|g" $ROOT/lib/python/omdlib/__init__.py -sudo sed -i 's|#!/omd/versions/.*/bin/python|#!/omd/versions/$OLD_VERSION/bin/python|g' $ROOT/bin/omd +sudo sed -i 's|#!/omd/versions/.*/bin/python|#!/omd/versions/'$OLD_VERSION'/bin/python|g' $ROOT/bin/omd

5 years, 10 months

← Newer
1
...
17
18
19
20
21
22
23
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018