Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 4186784ff1036df51407689cbda62108b95641a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4186784ff1036d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 4 08:17:42 2017 +0200 Cleaned up edition detection in sidebar Change-Id: Ia0580f988848ff2ce06b2f7c30a8768a2dc640d0 --- web/htdocs/sidebar.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 252ab22..ba48b4c 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -190,11 +190,16 @@ def save_user_config(user_config): def get_check_mk_edition_title(): - version_link = os.readlink("%s/version" % cmk.paths.omd_root) - if version_link.endswith(".cee.demo"): - return "Enterprise (Demo)" - elif "cee" in version_link: - return "Enterprise" + import cmk + if cmk.is_enterprise_edition(): + if cmk.is_demo(): + return "Enterprise (Demo)" + else: + return "Enterprise" + + elif cmk.is_managed_edition(): + return "Managed" + else: return "Raw"

7 years, 5 months

Updated tests to match new HTML code rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: 6956cb77766188f5f0fc1df00db1e430567a7be1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6956cb77766188… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 4 09:22:40 2017 +0200 Updated tests to match new HTML code rendering Change-Id: I0c8991aecc72fc8a30fd90cefa683de975051cf6 --- tests/testlib/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index aea9389..8e25b9f 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -837,7 +837,9 @@ class CMKWebSession(WebSession): profile_page = self.get("user_profile.py").text assert "name=\"language\"" in profile_page - assert "value=\""+lang+"\"" in profile_page + + if lang: + assert "value=\""+lang+"\"" in profile_page r = self.post("user_profile.py", data={ "filled_in" : "profile",

7 years, 5 months

removed conversion of value in perfdata

by Marcel Arentz

Module: check_mk Branch: master Commit: 709b45c753016f65e35875ef21a964b9c6449c3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=709b45c753016f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Apr 3 17:34:49 2017 +0200 removed conversion of value in perfdata Change-Id: Iff1529404878be5cc43f0b0061149ec411cf2fce --- checks/3par_volumes | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/3par_volumes b/checks/3par_volumes index b6893e1..698f08c 100644 --- a/checks/3par_volumes +++ b/checks/3par_volumes @@ -66,9 +66,10 @@ def check_3par_volumes(item, params, parsed): yield 0, "Compact: %s" % entry['capacityEfficiency']['compaction'] # Add some additional information and the performance data about Provisioning - yield states[entry['state']], \ - "Type: %s, WWN: %s" % (provisioning_map[entry['provisioningType']], entry['wwn']), \ - [ ( "fs_provisioning", get_bytes_human_readable(entry['userSpace']['rawReservedMiB'] * 1024 * 1024)) ] + provisioning = entry['userSpace']['rawReservedMiB'] * 1024 * 1024 + yield states[entry['state']], "Type: %s, WWN: %s" % \ + (provisioning_map[entry['provisioningType']], entry['wwn']), \ + [ ( "fs_provisioning", provisioning) ] check_info['3par_volumes'] = {

7 years, 5 months

4553 FIX 3par_volumes: Fixed graphs (removed useless and added missing)

by Marcel Arentz

Module: check_mk Branch: master Commit: a1e9f5373615f051ec4d73fab4e6fe228cd6a95d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1e9f5373615f0… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Apr 3 16:39:10 2017 +0200 4553 FIX 3par_volumes: Fixed graphs (removed useless and added missing) Change-Id: I7f20b19bdf1b75e59b2615899ba193fa4d803faf --- .werks/4553 | 10 ++++++++++ web/plugins/metrics/check_mk.py | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/4553 b/.werks/4553 new file mode 100644 index 0000000..878349c --- /dev/null +++ b/.werks/4553 @@ -0,0 +1,10 @@ +Title: 3par_volumes: Fixed graphs (removed useless and added missing) +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1491230257 +Class: fix + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0600ec6..fe22acb 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4183,6 +4183,7 @@ check_metrics["check_mk-emc_isilon_ifs"] = df_translation check_metrics["check_mk-mongodb_collections"] = df_translation check_metrics["check_mk-3par_cpgs.usage"] = df_translation check_metrics["check_mk-3par_capacity"] = df_translation +check_metrics["check_mk-3par_volumes"] = df_translation disk_utilization_translation = { "disk_utilization" : { "scale" : 100.0 } }

7 years, 5 months

Refactored html api calls.

by Roland Halbig

Module: check_mk Branch: master Commit: 449e168b7ae7045f98b5cd3bba7ef180145a2f5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=449e168b7ae704… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Feb 28 12:00:51 2017 +0100 Refactored html api calls. Change-Id: I6f1f101806c0fb6b62b026d86185d367b83e74b9 --- web/htdocs/dashboard.py | 10 ++++----- web/htdocs/htmllib.py | 15 +++++++++---- web/htdocs/metrics.py | 4 ++-- web/htdocs/mobile.py | 6 +++-- web/htdocs/pagetypes.py | 27 +++++++++++++--------- web/htdocs/valuespec.py | 23 ++++++++++--------- web/htdocs/visuals.py | 47 ++++++++++++++++++++++----------------- web/htdocs/wato.py | 6 ++--- web/htdocs/watolib.py | 4 ++-- web/plugins/dashboard/dashlets.py | 42 +++++++++++++++++----------------- web/plugins/sidebar/search.py | 7 +++--- web/plugins/sidebar/shipped.py | 2 +- web/plugins/views/commands.py | 16 ++++++------- web/plugins/views/layouts.py | 6 ++--- web/plugins/views/mkeventd.py | 2 +- web/plugins/views/mobile.py | 2 +- web/plugins/views/webservice.py | 16 ++++++------- web/plugins/visuals/filters.py | 10 ++++----- web/plugins/visuals/inventory.py | 40 +++++++++++++++++++-------------- web/plugins/visuals/mkeventd.py | 4 ++-- web/plugins/wato/bi.py | 9 ++++++-- web/plugins/wato/mkeventd.py | 44 ++++++++++++++++++++---------------- 22 files changed, 189 insertions(+), 153 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=449e168b7a…

7 years, 5 months

Refactored htmllib.

by Roland Halbig

Module: check_mk Branch: master Commit: 27d31bf616ee353f3ee7bacb8c54840228b97d9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27d31bf616ee35… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 23 14:48:45 2017 +0100 Refactored htmllib. Adjusted test framework, tests for checkbox. Made class attribute handling foolproof. Change-Id: I18d1b427e6d3eb3b960cee69d6f1a186fb8f2e5b --- tests/web/class_deprecated_renderer.py | 41 ++ tests/web/generate_integration.py | 32 +- tests/web/html_tests.py | 99 +-- tests/web/test_generator.py | 13 + tests/web/unittest_files/checkbox.unittest | 768 +++++++++++++++++++++ .../unittest_files/context_button_test.unittest | 384 +++++------ tests/web/unittest_files/select.unittest | 72 +- tests/web/unittest_files/text_area.unittest | 44 +- tests/web/unittest_files/text_input.unittest | 2 +- tests/web/unittest_generation/README.md | 22 +- tests/web/unittest_generation/checkbox.testgen | 13 + web/htdocs/htmllib.py | 265 +++---- web/htdocs/valuespec.py | 19 +- web/htdocs/watolib.py | 14 +- web/plugins/views/commands.py | 11 +- web/plugins/visuals/filters.py | 6 +- web/plugins/wato/mkeventd.py | 2 +- 17 files changed, 1287 insertions(+), 520 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=27d31bf616…

7 years, 5 months

Fake omd version for tests: Also replace version in omd bin

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b94c2f5c9822735a975107f29ec48f8e0ae629c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b94c2f5c98227… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 3 11:51:36 2017 +0200 Fake omd version for tests: Also replace version in omd bin Change-Id: I926647e4c28bb996e40cc8fa7c47d109c145696b --- tests/testlib/__init__.py | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 35e882a..aea9389 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -295,21 +295,8 @@ class Site(object): if not self.version.is_installed(): self.version.install() - # When using the Git version, the original version files will be - # replaced by the .f12 scripts. When tests are running in parallel - # with the same daily build, this may lead to problems when the .f12 - # scripts are executed while another test is loading affected files - # As workaround we copy the original files to a test specific version - # Don't do this in non CI environments - if self.update_with_git and os.environ.get("BUILD_NUMBER"): - src_path = self.version.version_path() - new_version_name = "%s-%s" % (self.version.version, os.environ["BUILD_NUMBER"]) - self.version = CMKVersion(new_version_name, self.version._edition, self.version._branch) - print("Copy CMK '%s' to '%s'" % (src_path, self.version.version_path())) - cmd = "sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path()) - if os.system(cmd) >> 8 != 0: - raise Exception("Failed to copy Check_MK: %s" % cmd) - + if self.update_with_git: + self._copy_omd_version_for_test() if not self.reuse and self.exists(): raise Exception("The site %s already exists." % self.id) @@ -327,6 +314,32 @@ class Site(object): self._enable_mod_python_debug() + # When using the Git version, the original version files will be + # replaced by the .f12 scripts. When tests are running in parallel + # with the same daily build, this may lead to problems when the .f12 + # scripts are executed while another test is loading affected files + # As workaround we copy the original files to a test specific version + def _copy_omd_version_for_test(self): + if not os.environ.get("BUILD_NUMBER"): + return # Don't do this in non CI environments + + src_version, src_path = self.version.version, self.version.version_path() + new_version_name = "%s-%s" % (src_version, os.environ["BUILD_NUMBER"]) + self.version = CMKVersion(new_version_name, self.version._edition, self.version._branch) + + print("Copy CMK '%s' to '%s'" % (src_path, self.version.version_path())) + assert not os.path.exists(self.version.version_path()), \ + "New version path '%s' already exists" % self.version.version_path() + + cmd = "sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path()) + if os.system(cmd) >> 8 != 0: + raise Exception("Failed to copy Check_MK: %s" % cmd) + + if os.system("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % + (src_version, new_version_name, self.version.version_path())) >> 8 != 0: + raise Exception("Failed to set new version to bin/omd") + + def _update_with_f12_files(self): paths = [ cmk_path() + "/bin",

7 years, 5 months

tests: Trying to fix random issues during crawls and integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 5fd4153e8f040417cf161d001cc5d30c24cc2619 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fd4153e8f0404… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 3 10:40:08 2017 +0200 tests: Trying to fix random issues during crawls and integration tests Change-Id: I67b03504d1caf013307e8b71809fcd34c350861e --- tests/testlib/__init__.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index a108e98..35e882a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -65,6 +65,10 @@ class CMKVersion(object): CRE = "cre" def __init__(self, version, edition, branch): + self._version = version + self._edition = edition + self._branch = branch + self.set_version(version, branch) if len(edition) != 3: @@ -85,6 +89,7 @@ class CMKVersion(object): def set_version(self, version, branch): if version in [ CMKVersion.DAILY, CMKVersion.GIT ]: date_part = time.strftime("%Y.%m.%d") + if branch != "master": self.version = "%s-%s" % (branch, date_part) else: @@ -290,6 +295,22 @@ class Site(object): if not self.version.is_installed(): self.version.install() + # When using the Git version, the original version files will be + # replaced by the .f12 scripts. When tests are running in parallel + # with the same daily build, this may lead to problems when the .f12 + # scripts are executed while another test is loading affected files + # As workaround we copy the original files to a test specific version + # Don't do this in non CI environments + if self.update_with_git and os.environ.get("BUILD_NUMBER"): + src_path = self.version.version_path() + new_version_name = "%s-%s" % (self.version.version, os.environ["BUILD_NUMBER"]) + self.version = CMKVersion(new_version_name, self.version._edition, self.version._branch) + print("Copy CMK '%s' to '%s'" % (src_path, self.version.version_path())) + cmd = "sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path()) + if os.system(cmd) >> 8 != 0: + raise Exception("Failed to copy Check_MK: %s" % cmd) + + if not self.reuse and self.exists(): raise Exception("The site %s already exists." % self.id)

7 years, 5 months

Inline match_levels_alternative into Levels, as that's the only place it' s being used

by Konstantin Büttner

Module: check_mk Branch: master Commit: f3eb747466eff2778c94add35571ade9d5b653ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3eb747466eff2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Mar 30 17:26:55 2017 +0200 Inline match_levels_alternative into Levels, as that's the only place it's being used Change-Id: I3fe1cc342f22696ce914c3122c9bb11c53819f78 --- web/htdocs/wato.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 774ca5d..36d4f53 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13978,15 +13978,16 @@ def PredictiveLevels(**args): # To be used as ValueSpec for levels on numeric values, with # prediction -def match_levels_alternative(v): - if type(v) == dict: - return 2 - elif type(v) == tuple and v != (None, None): - return 1 - else: - return 0 - def Levels(**kwargs): + + def match_levels_alternative(v): + if type(v) == dict: + return 2 + elif type(v) == tuple and v != (None, None): + return 1 + else: + return 0 + help = kwargs.get("help") unit = kwargs.get("unit") title = kwargs.get("title")

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