Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

Now really clean before .f12 during tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 75c675327913a45c9e55d446e3ca83da821d5f01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75c675327913a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 13:20:08 2017 +0200 Now really clean before .f12 during tests Change-Id: I4d8505508fa7b4be396f8891efe8199b2d08d448 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index e46dbcf..0a0e221 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -382,7 +382,7 @@ class Site(object): # Prevent build problems of livestatus print("Cleanup git files") - assert os.system("git clean -xfd") >> 8 == 0 + assert os.system("sudo git clean -xfd") >> 8 == 0 for path in paths: if os.path.exists("%s/.f12" % path):

7 years, 5 months

Fixed missing var after refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 691d1b3f2279f417d4817cf1d26b3e1660b60d77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=691d1b3f2279f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 13:01:13 2017 +0200 Fixed missing var after refactoring Change-Id: I6a4e7e2c0e531cdb07fb69c2314421cc9fcd4c04 --- web/htdocs/wato.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c58215d..9b4ba63 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15559,6 +15559,7 @@ def manpage_text(text): # '----------------------------------------------------------------------' def validate_icon(value, varprefix): + file_name = value[0] if os.path.exists("%s/share/check_mk/web/htdocs/images/icon_%s" % (cmk.paths.omd_root, file_name)) \ or os.path.exists("%s/share/check_mk/web/htdocs/images/icons/%s" % (cmk.paths.omd_root, file_name)): raise MKUserError(varprefix, _('Your icon conflicts with a Check_MK builtin icon. Please '

7 years, 5 months

Try to fix test build issues by first building livestatus

by Lars Michelsen

Module: check_mk Branch: master Commit: 50f0b8eaf98644c2b8c8627ee4e42de52c8241f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50f0b8eaf98644… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 11:54:44 2017 +0200 Try to fix test build issues by first building livestatus Change-Id: I247a188ce100fc02d8be0efbc7a25aa47f4fe2cf --- tests/testlib/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index f1574b0..e46dbcf 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -346,6 +346,8 @@ class Site(object): def _update_with_f12_files(self): paths = [ + cmk_path() + "/livestatus", + cmk_path() + "/livestatus/api/python", cmk_path() + "/bin", cmk_path() + "/modules", cmk_path() + "/cmk_base", @@ -355,8 +357,6 @@ class Site(object): cmk_path() + "/web", cmk_path() + "/inventory", cmk_path() + "/notifications", - cmk_path() + "/livestatus", - cmk_path() + "/livestatus/api/python", cmk_path() + "/.werks", ]

7 years, 5 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 8588276429d47d324e8e37ea19713e00fd8bf7dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8588276429d47d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 11:32:52 2017 +0200 Reserved 20 Werk IDS Change-Id: I71c20e87f2182a579b1fafff76e1c6cef0bf9571 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 148775a..93c1b5c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4596 +4616

7 years, 5 months

Fixed result test of git clean

by Lars Michelsen

Module: check_mk Branch: master Commit: eaa5d171b1565527ad5b48643399cf8520e431b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa5d171b15655… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 11:36:22 2017 +0200 Fixed result test of git clean Change-Id: Ia1c602237b53f659f598fec21486471eed46d390 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index efd0be1..f1574b0 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -382,7 +382,7 @@ class Site(object): # Prevent build problems of livestatus print("Cleanup git files") - assert os.system("git clean -xfd") + assert os.system("git clean -xfd") >> 8 == 0 for path in paths: if os.path.exists("%s/.f12" % path):

7 years, 5 months

4596 FIX agent_innovaphone: Fixed import error of lxml ( which is not shipped with Check_MK)

by Lars Michelsen

Module: check_mk Branch: master Commit: ccbd1ec74d0efbe47425a8158e11b80f1f4bfbcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccbd1ec74d0efb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 11:33:39 2017 +0200 4596 FIX agent_innovaphone: Fixed import error of lxml (which is not shipped with Check_MK) Change-Id: I64ca6c7f341ee7e2696a03f773ecab81eb2a0a57 --- .werks/4596 | 11 +++++++++++ agents/special/agent_innovaphone | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4596 b/.werks/4596 new file mode 100644 index 0000000..a1e41b6 --- /dev/null +++ b/.werks/4596 @@ -0,0 +1,11 @@ +Title: agent_innovaphone: Fixed import error of lxml (which is not shipped with Check_MK) +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1491816800 + + diff --git a/agents/special/agent_innovaphone b/agents/special/agent_innovaphone index e925962..dbbffb5 100755 --- a/agents/special/agent_innovaphone +++ b/agents/special/agent_innovaphone @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -from lxml import etree +import xml.etree.ElementTree as etree import sys from urllib2 import urlopen import urllib2, base64

7 years, 5 months

Fix test issues with livestatus .f12

by Lars Michelsen

Module: check_mk Branch: master Commit: 90048c79ee65980110c89769cbdacfa3f7eaee34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90048c79ee6598… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 11:28:45 2017 +0200 Fix test issues with livestatus .f12 Change-Id: I75f97579aee022072bb8eb90b4a7b992bacb28c9 --- tests/testlib/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 8be7f85..efd0be1 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -380,6 +380,10 @@ class Site(object): cme_path(), ] + # Prevent build problems of livestatus + print("Cleanup git files") + assert os.system("git clean -xfd") + for path in paths: if os.path.exists("%s/.f12" % path): print("Executing .f12 in \"%s\"..." % path)

7 years, 5 months

Fixed building compiled plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 48b2cc20ba46014151455b42e0c37ac7fa3dca3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48b2cc20ba4601… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 10:52:23 2017 +0200 Fixed building compiled plugins Change-Id: I3af4c69fd0276131ed44cb3192167277938bdab1 --- .../windows/frozen_binaries/pyinstaller-deps.make | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index 3994ac5..c72a21c 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -28,8 +28,9 @@ src/python-$(PYTHON_VERSION).msi: $(PYTHON_PACKAGES): src/python-$(PYTHON_VERSION).msi # Download needed python packages including depencencies. This has to be done # from within wine to obtain the correct win32 packages. - # Note: This target might download different or additional versions that specified in - # PYTHON_PACKAGES because the pip download option resolves dependencies. + # Note: We built this list to make the agent compilation reproducable. From time + # to time we should update the packages here, but we don't want to fetch new versions + # automatically. mkdir $(BUILD_DIR) && \ export WINEPREFIX=$(BUILD_DIR) && \ cd $(BUILD_DIR) && \ @@ -37,23 +38,23 @@ $(PYTHON_PACKAGES): src/python-$(PYTHON_VERSION).msi wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ mkdir pip && \ cd pip && \ - wine c:\\Python27\\python.exe -m pip download appdirs==1.4.3 && \ - wine c:\\Python27\\python.exe -m pip download idna==2.5 && \ - wine c:\\Python27\\python.exe -m pip download pyparsing==2.2.0 && \ - wine c:\\Python27\\python.exe -m pip download asn1crypto==0.22.0 && \ - wine c:\\Python27\\python.exe -m pip download ipaddress==1.0.18 && \ - wine c:\\Python27\\python.exe -m pip download pypiwin32==219 && \ - wine c:\\Python27\\python.exe -m pip download cffi==1.10.0 && \ - wine c:\\Python27\\python.exe -m pip download packaging==16.8 && \ - wine c:\\Python27\\python.exe -m pip download requests==2.13.0 && \ - wine c:\\Python27\\python.exe -m pip download cryptography==1.8.1 && \ - wine c:\\Python27\\python.exe -m pip download pycparser==2.17 && \ - wine c:\\Python27\\python.exe -m pip download setuptools==34.3.3 && \ - wine c:\\Python27\\python.exe -m pip download enum34==1.1.6 && \ - wine c:\\Python27\\python.exe -m pip download pyinstaller==3.2.1 && \ - wine c:\\Python27\\python.exe -m pip download six==1.10.0 && \ - wine c:\\Python27\\python.exe -m pip download future==0.16.0. && \ - wine c:\\Python27\\python.exe -m pip download pyOpenSSL==16.2.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps appdirs==1.4.3 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps idna==2.5 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pyparsing==2.2.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps asn1crypto==0.22.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps ipaddress==1.0.18 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pypiwin32==219 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps cffi==1.10.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps packaging==16.8 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps requests==2.13.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps cryptography==1.8.1 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pycparser==2.17 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps setuptools==34.3.3 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps enum34==1.1.6 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pyinstaller==3.2.1 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps six==1.10.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps future==0.16.0. && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pyOpenSSL==16.2.0 && \ mkdir -p $(CURDIR)/src/pip && \ cp -r * $(CURDIR)/src/pip rm -rf $(BUILD_DIR)

7 years, 5 months

CME: Implemented sidebar logo upload

by Lars Michelsen

Module: check_mk Branch: master Commit: a19ee834e80d2885ce3e847f620a31833cdda1d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a19ee834e80d28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 5 11:16:52 2017 +0200 CME: Implemented sidebar logo upload Change-Id: I03aa3322a23a420c8a3051e4cd48e0ed26219266 --- web/htdocs/valuespec.py | 32 ++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 24 ++++++------------------ 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e775d92..631b655 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3947,6 +3947,38 @@ class FileUpload(ValueSpec): +class ImageUpload(FileUpload): + def __init__(self, max_size=None, *args, **kwargs): + self._max_size = max_size + FileUpload.__init__(self, *args, **kwargs) + + + def validate_value(self, value, varprefix): + from PIL import Image + from StringIO import StringIO + + file_name, mime_type, content = value + + if file_name[-4:] != '.png' \ + or mime_type != 'image/png' \ + or not content.startswith('\x89PNG'): + raise MKUserError(varprefix, _('Please choose a PNG image.')) + + try: + im = Image.open(StringIO(content)) + except IOError: + raise MKUserError(varprefix, _('Please choose a valid PNG image.')) + + if self._max_size: + w, h = im.size + max_w, max_h = self._max_size + if w > max_w or h > max_h: + raise MKUserError(varprefix, _('Maximum image size: %dx%dpx') % (max_w, max_h)) + + ValueSpec.custom_validate(self, value, varprefix) + + + class UploadOrPasteTextFile(Alternative): def __init__(self, **kwargs): file_title = kwargs.get("file_title", _("File")) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c77d41b..c58215d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6616,6 +6616,10 @@ def mode_globalvars(phase): if config.user.may("wato.set_read_only"): html.context_button(_("Read only mode"), folder_preserving_link([("mode", "read_only")]), "read_only") + + if cmk.is_managed_edition(): + cme_global_settings_buttons() + return # Get default settings of all configuration variables of interest in the domain @@ -15555,23 +15559,6 @@ def manpage_text(text): # '----------------------------------------------------------------------' def validate_icon(value, varprefix): - from PIL import Image - from StringIO import StringIO - file_name, mime_type, content = value - if file_name[-4:] != '.png' \ - or mime_type != 'image/png' \ - or not content.startswith('\x89PNG'): - raise MKUserError(varprefix, _('Please choose a PNG icon.')) - - try: - im = Image.open(StringIO(content)) - except IOError: - raise MKUserError(varprefix, _('Please choose a valid PNG icon.')) - - w, h = im.size - if w > 80 or h > 80: - raise MKUserError(varprefix, _('Maximum image size: 80x80px')) - if os.path.exists("%s/share/check_mk/web/htdocs/images/icon_%s" % (cmk.paths.omd_root, file_name)) \ or os.path.exists("%s/share/check_mk/web/htdocs/images/icons/%s" % (cmk.paths.omd_root, file_name)): raise MKUserError(varprefix, _('Your icon conflicts with a Check_MK builtin icon. Please ' @@ -15622,9 +15609,10 @@ def mode_icons(phase): optional_keys = False, render = "form", elements = [ - ('icon', FileUpload( + ('icon', ImageUpload( title = _('Icon'), allow_empty = False, + max_size = (80, 80), validate = validate_icon, )), ('category', DropdownChoice(

7 years, 5 months

Continued customer sidebar snapin

by Simon Betz

Module: check_mk Branch: master Commit: 20f725e588e800e75f2592db99bb31b1624d369e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20f725e588e800… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 29 11:33:22 2017 +0200 Continued customer sidebar snapin Change-Id: I37d99f3f42b2c4a968b67d34ca3272af8a1c5bfb --- web/htdocs/images/button_sitestatus_partial.png | Bin 0 -> 1025 bytes web/htdocs/js/sidebar.js | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/images/button_sitestatus_partial.png b/web/htdocs/images/button_sitestatus_partial.png new file mode 100644 index 0000000..4ec2117 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_partial.png differ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 229a66c..eaab460 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -670,10 +670,14 @@ function reload_main_plus_sidebar(id, code) { parent.frames[0].location.reload(); /* reload side bar */ } +// TODO move to managed/web/htdocs/js +function switch_customer(customer_id, switch_state) { + get_url("switch_customer.py?_customer_switch=" + customer_id + ":" + switch_state, + reload_main_plus_sidebar, null); +} + function switch_site(switchvar) { get_url("switch_site.py?" + switchvar, reload_main_plus_sidebar, null); - /* After the site switch has been done, everything must be reloaded since - everything is affected by the switch */ } var g_seconds_to_update = null;

7 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017