Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4221 FIX Fixed "analyse parameters" page for services with umlauts in names

by Lars Michelsen

Module: check_mk Branch: master Commit: 7029e4f2ff15d20af9aba2dad18dcd8a7fdac1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7029e4f2ff15d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 10:38:21 2016 +0100 4221 FIX Fixed "analyse parameters" page for services with umlauts in names Change-Id: If789f8d52ad3cca4749e53ae0bc05596948cb34e --- .werks/4221 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4221 b/.werks/4221 new file mode 100644 index 0000000..ea3fa3f --- /dev/null +++ b/.werks/4221 @@ -0,0 +1,9 @@ +Title: Fixed "analyse parameters" page for services with umlauts in names +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482485868 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 970db7b..b05e768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 4003 FIX: esx_vsphere_objects: fixed check parameters display bug during WATO service discovery * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) + * 4221 FIX: Fixed "analyse parameters" page for services with umlauts in names Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 522b3c5..22e4ae1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2097,7 +2097,7 @@ def mode_object_parameters(phase): if host is None: raise MKGeneralException(_('The given host does not exist.')) host.need_permission("read") - service = html.var("service") + service = html.get_unicode_input("service") if phase == "title": title = _("Parameters of") + " " + hostname diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fc7ae4e..cc67dcb 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -5490,6 +5490,8 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti html.show_error(_("<h1>Cannot activate changes</h1>%s") % e) return + cmd = [ make_utf8(a) for a in cmd ] + try: # This debug output makes problems when doing bulk inventory, because # it garbles the non-HTML response output

7 years, 9 months

4220 FIX WATO folder filter: improve output of unknown folders

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e521d01f2ea9b49179d8c40a667da2fecbd7edb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e521d01f2ea9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 10:32:51 2016 +0100 4220 FIX WATO folder filter: improve output of unknown folders Change-Id: I7344a0f80d58b4ce8e29be389ad5ad983dd12ac4 --- .werks/4220 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/wato.py | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/.werks/4220 b/.werks/4220 new file mode 100644 index 0000000..022fba3 --- /dev/null +++ b/.werks/4220 @@ -0,0 +1,9 @@ +Title: WATO folder filter: improve output of unknown folders +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1482485555 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2b44839..970db7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 4004 FIX: Fixed exception when viewing availability of BI aggregations... * 4144 FIX: Sidebar: Bottom of last snapin was not 100% visible * 4145 FIX: Fixed exception when setting output_format in wrong case + * 4220 FIX: WATO folder filter: improve output of unknown folders WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 7b1316a..4d8f23a 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -41,6 +41,12 @@ def get_wato_folder(row, how, with_links = True): wato_path = filename[6:-9] try: title_path = wato.get_folder_title_path(wato_path, with_links) + except MKGeneralException: + # happens when a path can not be resolved using the local WATO. + # e.g. when having an independent site with different folder + # hierarchy added to the GUI. + # Display the raw path rather than the exception text. + title_path = wato_path.split("/") except Exception, e: return "%s" % e

7 years, 9 months

Added tests for testbuild resulting packages

by Lars Michelsen

Module: check_mk Branch: master Commit: 0aad4a03299eacc1ce2e5fd76337fe37ec930362 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aad4a03299eac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 08:41:44 2016 +0100 Added tests for testbuild resulting packages Change-Id: I47904c2c3dd9aebfb3c6835ca250e980a86201a5 --- .../packaging/{test_setuid_bits.py => conftest.py} | 14 +--- tests/packaging/test_files.py | 96 ++++++++++++++++++++++ 2 files changed, 98 insertions(+), 12 deletions(-) diff --git a/tests/packaging/test_setuid_bits.py b/tests/packaging/conftest.py similarity index 62% rename from tests/packaging/test_setuid_bits.py rename to tests/packaging/conftest.py index f2a0052..77bfffa 100644 --- a/tests/packaging/test_setuid_bits.py +++ b/tests/packaging/conftest.py @@ -1,20 +1,10 @@ -import pytest import os +import pytest -pytestmark = pytest.mark.packaging - +(a)pytest.fixture(scope="module") def version_path(): path = os.environ.get("VERSION_PATH") if not path: raise Exception("VERSION_PATH environment variable pointing to the version " "directory (e.g. /bauwelt/download/2016.12.22) is missing") return path - - -def test_setuid_bits(): - print version_path() - print os.listdir(version_path()) - - -def test_files_not_in_version_path(): - pass diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py new file mode 100644 index 0000000..549d239 --- /dev/null +++ b/tests/packaging/test_files.py @@ -0,0 +1,96 @@ +import pytest +import os +import subprocess +import re + +pytestmark = pytest.mark.packaging + +(a)pytest.mark.parametrize("what", [ + ("rpm"), + ("deb"), + ("cma"), +]) +def test_package_built(version_path, what): + files = os.listdir(version_path) + count = len([ e for e in files if e.startswith("check-mk-") and e.endswith("."+what) ]) + assert count > 0, "Found no %s package in %s" % (what.upper(), version_path) + + +def _get_package_paths(version_path, what): + for filename in os.listdir(version_path): + if filename.startswith("check-mk-") and filename.endswith(".%s" % what): + yield os.path.join(version_path, filename) + + +# In case packages grow/shrink this check has to be changed. +(a)pytest.mark.parametrize("what,min_size,max_size", [ + ("rpm", 95*1024*1024, 160*1024*1024), + ("deb", 80*1024*1024, 160*1024*1024), + ("cma", 150*1024*1024, 160*1024*1024), +]) +def test_package_sizes(version_path, what, min_size, max_size): + for pkg in _get_package_paths(version_path, what): + size = os.stat(pkg).st_size + assert size > min_size and size < max_size, \ + "Package %s size %s not between %s and %s bytes." % \ + (pkg, size, min_size, max_size) + + +(a)pytest.mark.parametrize("what", [ + ("rpm"), + ("deb"), +]) +def test_files_not_in_version_path(version_path, what): + allowed_patterns = { + "rpm": [ + "/opt", + "/opt/omd", + "/opt/omd/apache", + "/opt/omd/sites", + "/opt/omd/versions", + ], + "deb": [ + "/", + "/opt/", + "/opt/omd/", + "/usr/", + "/usr/share/", + "/usr/share/man/", + "/usr/share/man/man8/", + "/usr/share/doc/", + "/usr/share/doc/check-mk-(raw|enterprise)-*/", + "/usr/share/doc/check-mk-(raw|enterprise)-*/changelog.gz", + "/usr/share/doc/check-mk-(raw|enterprise)-*/COPYING.gz", + "/usr/share/doc/check-mk-(raw|enterprise)-*/TEAM", + "/usr/share/doc/check-mk-(raw|enterprise)-*/copyright", + "/usr/share/doc/check-mk-(raw|enterprise)-*/README", + "/usr/share/doc/check-mk-(raw|enterprise)-*/README.Debian", + "/etc/", + "/etc/init.d/", + "/etc/init.d/check-mk-(raw|enterprise)-*", + ], + } + + for pkg in _get_package_paths(version_path, what): + print "Testing %s" % pkg + + if what == "rpm": + paths = subprocess.check_output(["rpm", "-qlp", pkg]).splitlines() + + elif what == "deb": + paths = [] + for line in subprocess.check_output(["dpkg", "-c", pkg]).splitlines(): + paths.append(line.split()[5].lstrip(".")) + + for path in paths: + if not path.startswith("/opt/omd/versions/"): + is_allowed = any(re.match(p, path) for p in allowed_patterns[what]) + assert is_allowed, "Found unexpected global file: %s" % path + + +def test_cma_only_contains_version_paths(version_path): + for pkg in _get_package_paths(version_path, "cma"): + version = os.path.basename(pkg).split("-")[3] + for line in subprocess.check_output(["tar", "tvf", pkg]).splitlines(): + path = line.split()[5] + assert not path.startswith(version + "/")

7 years, 9 months

Added structure for packaging tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 38880e8938da5ba333cf682eff4b2e171b390a5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38880e8938da5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 15:29:53 2016 +0100 Added structure for packaging tests Change-Id: I0973a0a1627c2ad1d924b0874e6768058bf40c67 --- pytest.ini | 6 +++++- tests/packaging/test_setuid_bits.py | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index a43d447..b4e450f 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,4 +3,8 @@ testpaths = tests # Fail on first error and enable stepwise plugin to track steps and # be able to continue with the failed test after analyzing and fixing # the issue -addopts = -rs -v --maxfail=1 +addopts = -rs -v --maxfail=1 -m "not packaging" +# Register some markers to classify the tests +markers = + pylint: Mark a test as pylint test. + packaging: This is a test to execute to verify the packaging of the testbuilds. diff --git a/tests/packaging/test_setuid_bits.py b/tests/packaging/test_setuid_bits.py new file mode 100644 index 0000000..f2a0052 --- /dev/null +++ b/tests/packaging/test_setuid_bits.py @@ -0,0 +1,20 @@ +import pytest +import os + +pytestmark = pytest.mark.packaging + +def version_path(): + path = os.environ.get("VERSION_PATH") + if not path: + raise Exception("VERSION_PATH environment variable pointing to the version " + "directory (e.g. /bauwelt/download/2016.12.22) is missing") + return path + + +def test_setuid_bits(): + print version_path() + print os.listdir(version_path()) + + +def test_files_not_in_version_path(): + pass

7 years, 9 months

Revert "Refactored valuespec."

by Roland Halbig

Module: check_mk Branch: master Commit: a78d577e4be7519871ede871a4c814b5e9b949e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a78d577e4be751… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 22 15:05:06 2016 +0100 Revert "Refactored valuespec." This reverts commit 7eee6773f2d2bf88d533d0b96574cd834f40c061. --- web/htdocs/valuespec.py | 655 +++++++++++++++++++++--------------------------- 1 file changed, 284 insertions(+), 371 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a78d577e4b…

7 years, 9 months

Refactored valuespec.

by Roland Halbig

Module: check_mk Branch: master Commit: 7eee6773f2d2bf88d533d0b96574cd834f40c061 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eee6773f2d2bf… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Dec 22 13:28:06 2016 +0100 Refactored valuespec. Change-Id: Ia27a7fc44ef39c45893be4addee57448f0d2f90c --- web/htdocs/valuespec.py | 655 +++++++++++++++++++++++++++--------------------- 1 file changed, 371 insertions(+), 284 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7eee6773f2…

7 years, 9 months

It is now possible to explicitly search for used/unused and deprecated/ not deprecated rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: 27a51bbdafdb70265ddd4f4761a0d1cff547ccd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27a51bbdafdb70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 14:02:41 2016 +0100 It is now possible to explicitly search for used/unused and deprecated/not deprecated rulesets Change-Id: I538bea63af2ede481853989fc79c7c5891a432a5 --- web/htdocs/wato.py | 19 ++++++++++++++----- web/htdocs/watolib.py | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2749b18..522b3c5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11880,16 +11880,19 @@ class ModeRuleEditor(WatoMode): html.context_button(_("Used Rulesets"), folder_preserving_link([ ("mode", "rulesets"), - ("search_p_ruleset_used_USE", "on") + ("search_p_ruleset_used", "0"), + ("search_p_ruleset_used_USE", "on"), ]), "usedrulesets") html.context_button(_("Ineffective rules"), folder_preserving_link([ ("mode", "rulesets"), + ("search_p_rule_ineffective", "0"), ("search_p_rule_ineffective_USE", "on")] ), "rulesets_ineffective") html.context_button(_("Deprecated Rulesets"), folder_preserving_link([ ("mode", "rulesets"), + ("search_p_ruleset_deprecated", "0"), ("search_p_ruleset_deprecated_USE", "on") ]), "rulesets_deprecated") @@ -12820,13 +12823,19 @@ class ModeRuleSearch(WatoMode): size = 60, mode = RegExpUnicode.infix, )), - ("ruleset_deprecated", FixedValue(False, + ("ruleset_deprecated", DropdownChoice( title = _("Deprecated"), - totext = _("Search for deprecated rulesets"), + choices = [ + (True, _("Search for deprecated rulesets")), + (False, _("Search for not deprecated rulesets")), + ], )), - ("ruleset_used", FixedValue(False, + ("ruleset_used", DropdownChoice( title = _("Used"), - totext = _("Search for rulesets that have rules configured"), + choices = [ + (True, _("Search for rulesets that have rules configured")), + (False, _("Search for rulesets that don't have rules configured")), + ], )), ("rule_description", RegExpUnicode( diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 9f7a1df..fc7ae4e 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6325,10 +6325,10 @@ class Ruleset(object): def matches_search(self, search_options): - if "ruleset_deprecated" in search_options and not self.is_deprecated(): + if "ruleset_deprecated" in search_options and search_options["ruleset_deprecated"] != self.is_deprecated(): return False - if "ruleset_used" in search_options and self.is_empty_in_folder(Folder.current()): + if "ruleset_used" in search_options and search_options["ruleset_used"] == self.is_empty_in_folder(Folder.current()): return False if "ruleset_group" in search_options \

7 years, 9 months

It is now possible to explicitly search for enabled/ disabled and ineffective/effective rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b01135599c9c1507e059e24c8c128e3ca45b912 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b01135599c9c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 13:55:23 2016 +0100 It is now possible to explicitly search for enabled/disabled and ineffective/effective rules Change-Id: I638a2f6739e2ea0fd5ddab206a974ac46a492c4a --- web/htdocs/valuespec.py | 4 +++- web/htdocs/wato.py | 14 ++++++++++---- web/htdocs/watolib.py | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 91c797a..260b9ac 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -30,7 +30,9 @@ # and rename to better name # - Consolidate RadioChoice and DropdownChoice to use same class # and rename to better name -# - Checkbox -> rename to Boolean +# - Checkbox +# -> rename to Boolean +# -> Add alternative rendering "dropdown" import math, os, time, re, sre_constants, urlparse, forms, tempfile import base64 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb1dac4..2749b18 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12857,13 +12857,19 @@ class ModeRuleSearch(WatoMode): ("rule_hosttags", HostTagCondition( title = _("Used host tags")) ), - ("rule_disabled", FixedValue(False, + ("rule_disabled", DropdownChoice( title = _("Disabled"), - totext = _("Search for disabled rules"), + choices = [ + (True, _("Search for disabled rules")), + (False, _("Search for enabled rules")), + ], )), - ("rule_ineffective", FixedValue(False, + ("rule_ineffective", DropdownChoice( title = _("Ineffective"), - totext = _("Search for ineffective rules (not matching any host or service)"), + choices = [ + (True, _("Search for ineffective rules (not matching any host or service)")), + (False, _("Search for effective rules")), + ], )), ], ) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 776fc0f..9f7a1df 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6770,10 +6770,10 @@ class Rule(object): def matches_search(self, search_options): - if "rule_disabled" in search_options and not self.is_disabled(): + if "rule_disabled" in search_options and search_options["rule_disabled"] != self.is_disabled(): return False - if "rule_ineffective" in search_options and not self.is_ineffective(): + if "rule_ineffective" in search_options and search_options["rule_ineffective"] != self.is_ineffective(): return False if not match_search_expression(search_options, "rule_description", self.description()):

7 years, 9 months

Fixed element dragging with different sized rows

by Lars Michelsen

Module: check_mk Branch: master Commit: 52f3331fb2559ad93339eeb73eda633f40b95b7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52f3331fb2559a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 13:41:35 2016 +0100 Fixed element dragging with different sized rows Change-Id: I5f32b21680fa6f412fa980b78c822c405a91cbbd --- web/htdocs/js/checkmk.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 9de8f55..618439e 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1755,8 +1755,7 @@ function element_dragging(event) function position_dragging_object(event) { var dragging = g_dragging.dragging, - container = dragging.parentNode, - offset_y = Math.abs(mouse_offset_to_middle(dragging, event).y); + container = dragging.parentNode; var get_previous = function(node) { var previous = node.previousElementSibling; @@ -1777,7 +1776,7 @@ function position_dragging_object(event) // Move it up? var previous = get_previous(dragging); - while (previous && Math.abs(mouse_offset_to_middle(previous, event).y) < offset_y) { + while (previous && mouse_offset_to_middle(previous, event).y < 0) { g_dragging.moved = true; container.insertBefore(dragging, previous); previous = get_previous(dragging); @@ -1785,7 +1784,7 @@ function position_dragging_object(event) // Move it down? var next = get_next(dragging); - while (next && Math.abs(mouse_offset_to_middle(next, event).y) < offset_y) { + while (next && mouse_offset_to_middle(next, event).y > 0) { g_dragging.moved = true; container.insertBefore(dragging, next.nextElementSibling); next = get_next(dragging);

7 years, 9 months

Slightly improved dragging visualization

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f630540ad888d0e0287220c153414dd244e36e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f630540ad888d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 22 13:45:19 2016 +0100 Slightly improved dragging visualization Change-Id: Ida6a5b8d1bd2d10e2e3e352ff7f431961069f6ee --- web/htdocs/pages.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 6d61c97..b4153ad 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1261,6 +1261,11 @@ a.element_dragger:hover { .dragging { cursor: move; box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.6); + -webkit-transform: scale(1.005); + -moz-transform: scale(1.005); + -ms-transform: scale(1.005); + -o-transform: scale(1.005); + transform: scale(1.005); }

7 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016