Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d6ecaee34ec9800e2f70931d105de0a8e11ed7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d6ecaee34ec98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 14:29:04 2019 +0100 Fix for last commit Change-Id: I596517833e772f84992258d15f60492f75d7fe67 --- tests/testlib/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2320773..ba0196a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -98,6 +98,7 @@ class APIError(Exception): # inter process locking involving different users (different sites) @contextmanager def InterProcessLock(filename): + fd = None try: fd = os.open(filename, os.O_RDONLY | os.O_CREAT, 0660) fcntl.flock(fd, fcntl.LOCK_EX)

5 years, 4 months

unify quotes for easier grepping

by Moritz Kiemer

Module: check_mk Branch: master Commit: 13f1b7043845a1327b6158a615640a967b0d4c36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13f1b7043845a1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 7 11:55:57 2019 +0100 unify quotes for easier grepping Change-Id: Ic40a47b10572966421d281f16f4f705d1e01673c --- checks/adva_fsp_if | 2 +- checks/emc_vplex_if | 2 +- checks/vms_if | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/adva_fsp_if b/checks/adva_fsp_if index 1c3b9b9..206e887 100644 --- a/checks/adva_fsp_if +++ b/checks/adva_fsp_if @@ -118,7 +118,7 @@ def check_adva_fsp_if(item, params, info): check_info['adva_fsp_if'] = { "inventory_function": inventory_adva_fsp_if, "check_function": check_adva_fsp_if, - "service_description": "Interface %s", + "service_description": 'Interface %s', "has_perfdata": True, "group": "adva_ifs", "snmp_info": ( diff --git a/checks/emc_vplex_if b/checks/emc_vplex_if index fa1a81e..f4736a9 100644 --- a/checks/emc_vplex_if +++ b/checks/emc_vplex_if @@ -74,7 +74,7 @@ check_info["emc_vplex_if"] = { "parse_function" : parse_emc_vplex_if, "check_function" : check_emc_vplex_if, "inventory_function" : inventory_emc_vplex_if, - "service_description" : "Interface %s", + "service_description" : 'Interface %s', "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and\ oid(".1.3.6.1.4.1.1139.21.2.2.8.1.*"), "snmp_info" : [ diff --git a/checks/vms_if b/checks/vms_if index 2ba79a0..62d78b7 100644 --- a/checks/vms_if +++ b/checks/vms_if @@ -79,7 +79,7 @@ def check_vms_if(item, params, info): check_info['vms_if'] = { "check_function": check_vms_if, "inventory_function": inventory_vms_if, - "service_description": "Interface %s", + "service_description": 'Interface %s', "has_perfdata": True, "includes": ["if.include"], "group": "if",

5 years, 4 months

Add jira python module for upcoming notification script

by Lars Michelsen

Module: check_mk Branch: master Commit: 73473ec7bd5800af4d19579c9de312df7b0fefe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73473ec7bd5800… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 11:11:58 2019 +0100 Add jira python module for upcoming notification script Change-Id: Ic0dd14ec3be673a859be2c0650dad0e0b3d7b991 --- Pipfile | 4 + Pipfile.lock | 139 ++++++++++++--------- omd/packages/python-modules/python-modules.make | 5 + .../python-modules/src/defusedxml-0.5.0.tar.gz | Bin 0 -> 60405 bytes omd/packages/python-modules/src/jira-2.0.0.tar.gz | Bin 0 -> 95561 bytes .../src/requests-toolbelt-0.9.1.tar.gz | Bin 0 -> 207286 bytes 6 files changed, 92 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=73473ec7bd…

5 years, 4 months

Replace "fasteners" locking in test with small own inter process lock

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cc3b878f858733a05644c7ba0e6ab7b9205638f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cc3b878f85873… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 14:25:25 2019 +0100 Replace "fasteners" locking in test with small own inter process lock Change-Id: Ied8c2fb533f1f185ae3ac74cb7033d85c1f7608f --- Pipfile | 1 - Pipfile.lock | 19 ++----------------- tests/integration/bin/test_mkbackup.py | 5 ++--- tests/testlib/__init__.py | 23 +++++++++++++++++++---- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/Pipfile b/Pipfile index e500e43..42899f7 100644 --- a/Pipfile +++ b/Pipfile @@ -13,7 +13,6 @@ pytest-mock = "*" pytest-stepwise = "*" dill = "*" bandit = "*" -fasteners = "*" lxml = "*" pylint = "*" pyenchant = "*" diff --git a/Pipfile.lock b/Pipfile.lock index fa19cbf..73fc0b2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "05a52b60adff22655b0b32c0877104d8a918ddbf2f6987492916eb0444490315" + "sha256": "e4e451366caf430af6048ea42109837b9bc49a9da374e1aa1686914ef220edd8" }, "pipfile-spec": 6, "requires": { @@ -1121,14 +1121,6 @@ ], "version": "==0.8" }, - "fasteners": { - "hashes": [ - "sha256:427c76773fe036ddfa41e57d89086ea03111bbac57c55fc55f3006d027107e18", - "sha256:564a115ff9698767df401efca29620cbb1a1c2146b7095ebd304b79cc5807a7c" - ], - "index": "pypi", - "version": "==0.14.1" - }, "funcparserlib": { "hashes": [ "sha256:b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d" @@ -1140,7 +1132,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1278,13 +1270,6 @@ "index": "pypi", "version": "==0.3.0" }, - "monotonic": { - "hashes": [ - "sha256:23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0", - "sha256:552a91f381532e33cbd07c6a2655a21908088962bb8fa7239ecbcc6ad1140cc7" - ], - "version": "==1.5" - }, "more-itertools": { "hashes": [ "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4", diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index a3f0dfa..1cfcbc7 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -5,10 +5,9 @@ import re import os import tarfile import fnmatch -import fasteners import pytest # type: ignore -from testlib import web # pylint: disable=unused-import +from testlib import web, InterProcessLock # pylint: disable=unused-import @pytest.fixture() @@ -90,7 +89,7 @@ def test_cfg(web, site, backup_path): def BackupLock(): - return fasteners.InterProcessLock("/tmp/cmk-test-execute-backup") + return InterProcessLock("/tmp/cmk-test-execute-backup") def _execute_backup(site, job_id="testjob"): diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2290980..2320773 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -16,12 +16,13 @@ import shutil import ast import abc import json +import fcntl +from contextlib import contextmanager from urlparse import urlparse import pathlib2 as pathlib import pytest # type: ignore import requests # type: ignore -import fasteners # type: ignore import urllib3 # type: ignore from bs4 import BeautifulSoup # type: ignore @@ -93,6 +94,20 @@ class APIError(Exception): pass +# Used fasteners before, but that was using a file mode that made it impossible to do +# inter process locking involving different users (different sites) +@contextmanager +def InterProcessLock(filename): + try: + fd = os.open(filename, os.O_RDONLY | os.O_CREAT, 0660) + fcntl.flock(fd, fcntl.LOCK_EX) + yield + fcntl.flock(fd, fcntl.LOCK_UN) + finally: + if fd: + os.close(fd) + + # It's ok to make it currently only work on debian based distros class CMKVersion(object): DEFAULT = "default" @@ -244,7 +259,7 @@ class CMKVersion(object): # Improve the protection against other test runs installing packages print "Getting install file lock (/tmp/cmk-test-install-version.lock)..." - with fasteners.InterProcessLock("/tmp/cmk-test-install-version"): + with InterProcessLock("/tmp/cmk-test-install-version"): print "Have install file lock" cmd = "sudo /usr/bin/gdebi --non-interactive %s" % package_path print cmd @@ -553,7 +568,7 @@ class Site(object): if not self.exists(): print "Getting site create lock (/tmp/cmk-test-create-site.lock)..." - with fasteners.InterProcessLock("/tmp/cmk-test-create-site"): + with InterProcessLock("/tmp/cmk-test-create-site"): print "Have site create lock" print "[%0.2f] Creating site '%s'" % (time.time(), self.id) @@ -923,7 +938,7 @@ class Site(object): self.stop() sys.stdout.write("Getting livestatus port lock (/tmp/cmk-test-open-livestatus-port)...\n") - with fasteners.InterProcessLock("/tmp/cmk-test-livestatus-port"): + with InterProcessLock("/tmp/cmk-test-livestatus-port"): sys.stdout.write("Have livestatus port lock\n") self.set_config("LIVESTATUS_TCP", "on") self._gather_livestatus_port()

5 years, 4 months

if64.inclde: join both if-include files

by Moritz Kiemer

Module: check_mk Branch: master Commit: 065f73360e908f43d4d655f55b2d9394a99e50d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=065f73360e908f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Mar 7 10:10:02 2019 +0100 if64.inclde: join both if-include files Change-Id: I042703ff42948af28ce8d291ac16d384e2d81125 --- checks/fsc_if64 | 2 +- checks/if.include | 346 ++++++++++++++++++++++++++++++++++++++++++++++++ checks/if64 | 2 +- checks/if64.include | 374 ---------------------------------------------------- checks/if64adm | 2 +- checks/if_fortigate | 2 +- 6 files changed, 350 insertions(+), 378 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=065f73360e…

5 years, 4 months

Fixed missing argument since recent refactorings

by Lars Michelsen

Module: check_mk Branch: master Commit: c52c03f9d5690276e36d66bb49c34ed4e24880d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c52c03f9d56902… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 13:00:58 2019 +0100 Fixed missing argument since recent refactorings Change-Id: I3507853ea39fd6eb5c75e8b89c347bbd881cd536 --- cmk/gui/plugins/views/mkeventd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/mkeventd.py b/cmk/gui/plugins/views/mkeventd.py index de3b112..34c8e8e 100644 --- a/cmk/gui/plugins/views/mkeventd.py +++ b/cmk/gui/plugins/views/mkeventd.py @@ -73,7 +73,8 @@ class RowTableEC(RowTableLivestatus): if c not in columns: columns.append(c) - rows = super(RowTableEC, self).query(view, columns, query, only_sites, limit) + rows = super(RowTableEC, self).query(view, columns, query, only_sites, limit, + all_active_filters) if not rows: return rows

5 years, 4 months

7231 FIX Fixed possible broken folding of form parts when using localized GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 63168fcc2d9d8ef100ce959571eb5ec705f53aa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63168fcc2d9d8e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 6 16:20:40 2019 +0100 7231 FIX Fixed possible broken folding of form parts when using localized GUI Change-Id: I0d390a8142102f8e4fcc03b99eb08b4144c4caa4 --- .werks/7231 | 10 ++++++++++ cmk/gui/forms.py | 27 +++++++-------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.werks/7231 b/.werks/7231 new file mode 100644 index 0000000..e8885c9 --- /dev/null +++ b/.werks/7231 @@ -0,0 +1,10 @@ +Title: Fixed possible broken folding of form parts when using localized GUI +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551885586 +Class: fix + + diff --git a/cmk/gui/forms.py b/cmk/gui/forms.py index 1d830e9..0aaac26 100644 --- a/cmk/gui/forms.py +++ b/cmk/gui/forms.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import base64 import six from cmk.gui.htmllib import HTML @@ -235,24 +236,6 @@ def edit_valuespec(vs, # New functions for painting forms -twofivesix = "".join(map(chr, range(0, 256))) - - -def strip_bad_chars(x): - s = "".join([c for c in x if c > ' ' and c < 'z']) - - if isinstance(x, unicode): - s = unicode(s) - return s.translate({ - ord(u"'"): None, - ord(u"&"): None, - ord(u";"): None, - ord(u"<"): None, - ord(u">"): None, - ord(u"\""): None, - }) - return s.translate(twofivesix, "'&;<>\"") - def header(title, isopen=True, table_id="", narrow=False, css=None): global g_header_open, g_section_open, g_section_isopen @@ -262,9 +245,13 @@ def header(title, isopen=True, table_id="", narrow=False, css=None): html.open_table( id_=table_id if table_id else None, class_=["nform", "narrow" if narrow else None, css if css else None]) - fold_id = strip_bad_chars(title) + g_section_isopen = html.begin_foldable_container( - html.form_name and html.form_name or "nform", fold_id, isopen, title, indent="nform") + treename=html.form_name if html.form_name else "nform", + id_=base64.b64encode(title.encode("utf-8") if isinstance(title, unicode) else title), + isopen=isopen, + title=title, + indent="nform") html.tr(html.render_td('', colspan=2), class_=["top", "open" if g_section_isopen else "closed"]) g_header_open = True g_section_open = False

5 years, 4 months

Fixed formating

by Lars Michelsen

Module: check_mk Branch: master Commit: 9a001c075887cd23ddb8cc14b2c3676a8213223c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a001c075887cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 13:09:55 2019 +0100 Fixed formating Change-Id: I7c7e06b080fbefa8cd8566023417f095f5e80035 --- cmk/gui/plugins/wato/check_mk_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 58dc6c9..d900ecc 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -4957,8 +4957,8 @@ def get_snmp_checktypes(): def get_snmp_section_names(): checks = watolib.check_mk_local_automation("get-check-information") snmp_section_names = set(cn.split(".", 1)[0] for (cn, c) in checks.items() if c['snmp']) - section_choices = [ (sn, sn) for sn in snmp_section_names ] - return [ (None, _('All SNMP Checks')) ] + sorted(section_choices) + section_choices = [(sn, sn) for sn in snmp_section_names] + return [(None, _('All SNMP Checks'))] + sorted(section_choices) @rulespec_registry.register

5 years, 4 months

7120 mk_oracle: 'locks' section is executed synchronously

by Simon Betz

Module: check_mk Branch: master Commit: ca43463fd825ceed926ca63b2ff19f3268f14bd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca43463fd825ce… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 12:31:57 2019 +0100 7120 mk_oracle: 'locks' section is executed synchronously Beside the multitenant implementation in the {{mk_oracle}} the SQL for the locks section was refactored and is more performant now. Change-Id: Ic157c0b7ee156befd7c789639178a0ce62506895 --- .werks/7120 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/7120 b/.werks/7120 new file mode 100644 index 0000000..ad7a928 --- /dev/null +++ b/.werks/7120 @@ -0,0 +1,11 @@ +Title: mk_oracle: 'locks' section is executed synchronously +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551958075 +Class: feature + +Beside the multitenant implementation in the {{mk_oracle}} the SQL +for the locks section was refactored and is more performant now.

5 years, 4 months

Fixed folding

by Simon Betz

Module: check_mk Branch: master Commit: c9667f27ed23b4f7379e200ec58f7ddd83fecf33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9667f27ed23b4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 7 12:38:48 2019 +0100 Fixed folding Change-Id: Icc57e8556ae87c5f1db46030d680de0461b2ab29 --- cmk/gui/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 8cc43a4..aa05364 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -8547,7 +8547,6 @@ perfometer_info.append({ 'exponent': 2.0, }) -#. perfometer_info.append({ "type": "linear", "segments": ["license_percentage"], @@ -8562,6 +8561,7 @@ perfometer_info.append({ "color": "16/a", }) +#. # .--Graphs--------------------------------------------------------------. # | ____ _ | # | / ___|_ __ __ _ _ __ | |__ ___ |

5 years, 4 months

← Newer
1
...
32
33
34
35
36
37
38
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019