Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

Cleaned up recent WATO host specific rule creation fix

by Lars Michelsen

Module: check_mk Branch: master Commit: f7001690fac1a7fd0a0b4ee25458ce08573c4100 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7001690fac1a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 10:46:38 2017 +0100 Cleaned up recent WATO host specific rule creation fix Change-Id: Iaf519a5080cb6ec907cb110911e89018322fda25 --- web/htdocs/wato.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ca4299f..f535412 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2300,7 +2300,7 @@ def output_analysed_ruleset(all_rulesets, rulespec, hostname, service, known_set ('rule_folder', rule.folder.path()), ('rulenr', rule.index()), ('host', hostname), - ('item', service and mk_repr(service) or ''), + ('item', mk_repr(service) if service else ''), ]) varname = rulespec.name @@ -2310,7 +2310,7 @@ def output_analysed_ruleset(all_rulesets, rulespec, hostname, service, known_set ('mode', 'edit_ruleset'), ('varname', varname), ('host', hostname), - ('item', mk_repr(service)) + ('item', mk_repr(service)), ]) forms.section('<a href="%s">%s</a>' % (url, rulespec.title)) @@ -11978,8 +11978,9 @@ class ModeEditRuleset(WatoMode): if not may_edit_ruleset(self._name): raise MKAuthException(_("You are not permitted to access this ruleset.")) - # TODO: Clean this up. In which case is it used? self._item = None + + # TODO: Clean this up. In which case is it used? if html.var("check_command"): check_command = html.var("check_command") checks = check_mk_local_automation("get-check-information") @@ -11992,7 +11993,7 @@ class ModeEditRuleset(WatoMode): try: self._item = matcher.group(1) except: - self._item = None + pass elif check_command.startswith("check_mk_active-"): check_command = check_command[16:].split(" ")[0][:-1] self._name = "active_checks:" + check_command @@ -12502,8 +12503,7 @@ class ModeEditRuleset(WatoMode): html.open_td() html.button("_new_host_rule", _("Create %s specific rule for: ") % ty) html.hidden_field("host", self._hostname) - if self._item: - html.hidden_field("item", mk_repr(self._item)) + html.hidden_field("item", mk_repr(self._item)) html.close_td() html.open_td(style="vertical-align:middle") html.write_text(label) @@ -13070,9 +13070,10 @@ class ModeNewRule(ModeEditRule): if hostname: host_list = [hostname] - item = mk_eval(html.var("item")) if html.has_var("item") else NO_ITEM - if item != NO_ITEM: - item_list = [ "%s$" % escape_regex_chars(item) ] + if self._rulespec.item_type: + item = mk_eval(html.var("item")) if html.has_var("item") else NO_ITEM + if item != NO_ITEM: + item_list = [ "%s$" % escape_regex_chars(item) ] self._rule = Rule.create(self._folder, self._ruleset, host_list, item_list)

7 years, 5 months

Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: a8215f155d6387da19756ddf106d983460b392b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8215f155d6387… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 09:53:52 2017 +0100 Removed debug output Change-Id: I105e13e47fc2206343c93faa167a950b33495bae --- tests/web/classes.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/web/classes.py b/tests/web/classes.py index cb30202..bd852d7 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -6,9 +6,6 @@ import re import json -import sys -print sys.path - # internal imports from htmllib import html from htmllib import HTMLGenerator, HTMLCheck_MK

7 years, 5 months

4313 FIX ps: Improved performance of ps check on systems with a large number of processes

by Lars Michelsen

Module: check_mk Branch: master Commit: c692ef970dc319ed22d52b19b6cb98c8d05a89a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c692ef970dc319… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 09:54:24 2017 +0100 4313 FIX ps: Improved performance of ps check on systems with a large number of processes Change-Id: Ibc118fd46156bf9d33b6873f5f49feb7ea579489 --- .werks/4313 | 9 +++++++++ ChangeLog | 1 + checks/ps | 4 ++-- checks/ps.include | 6 +++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/4313 b/.werks/4313 new file mode 100644 index 0000000..d9b32b2 --- /dev/null +++ b/.werks/4313 @@ -0,0 +1,9 @@ +Title: ps: Improved performance of ps check on systems with a large number of processes +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1485507240 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 74bf3eb..7daf617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 4214 FIX: jolokia_metrics.tp: Fix crash in case of partial thread information... * 4304 FIX: mk_inventory.linux: fixed missing redirection to null device in if statement * 4305 FIX: postgres_stat_database.size: fixed missing database size perfometer + * 4313 FIX: ps: Improved performance of ps check on systems with a large number of processes Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/ps b/checks/ps index 394b106..0fa7087 100644 --- a/checks/ps +++ b/checks/ps @@ -117,11 +117,11 @@ def ps_get_counters_to_delete(pids): def ps_get_current_pids(parsed): - pids = [] + pids = set() for line in parsed: process_info = line[1] if ps_has_extended_perfdata(process_info): - pids.append(process_info[4]) + pids.add(process_info[4]) return pids diff --git a/checks/ps.include b/checks/ps.include index 4112294..13d35d3 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -327,7 +327,11 @@ def ps_cleanup_params(params): def ps_has_extended_perfdata(process_info): - return len(process_info) > 4 + try: + process_info[4] + return True + except IndexError: + return False def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes", total_ram = None):

7 years, 5 months

Fixed issue in recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: 68084d8c4de22d44f6751257e574d483ad0f688d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68084d8c4de22d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 08:14:31 2017 +0100 Fixed issue in recent change Change-Id: Ic6253dd9f54242e1c64ddcd3d42f9812bfcbd45d --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index b20c958..fbcd902 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -118,7 +118,7 @@ def _site_id(): site_id = os.environ.get("OMD_SITE") if site_id == None: site_id = file(testlib.repo_path() + "/.site").read().strip() - putenv("OMD_SITE", site_id) + os.putenv("OMD_SITE", site_id) return site_id

7 years, 5 months

Fixed import error in git tests

by Lars Michelsen

Module: check_mk Branch: master Commit: b930fe1cbc2f82811dcfd8993c0a8c82d5ab43b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b930fe1cbc2f82… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 08:12:28 2017 +0100 Fixed import error in git tests Change-Id: I7482a597b2b700a114ca770dc694ae1c718a5cdb --- tests/conftest.py | 1 + tests/web/classes.py | 3 +++ tests/web/conftest.py | 5 ++++- tests/web/test_table.py | 7 +++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 4ef06b1..b20c958 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -118,6 +118,7 @@ def _site_id(): site_id = os.environ.get("OMD_SITE") if site_id == None: site_id = file(testlib.repo_path() + "/.site").read().strip() + putenv("OMD_SITE", site_id) return site_id diff --git a/tests/web/classes.py b/tests/web/classes.py index bd852d7..cb30202 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -6,6 +6,9 @@ import re import json +import sys +print sys.path + # internal imports from htmllib import html from htmllib import HTMLGenerator, HTMLCheck_MK diff --git a/tests/web/conftest.py b/tests/web/conftest.py index e93e43e..82f8066 100644 --- a/tests/web/conftest.py +++ b/tests/web/conftest.py @@ -1,9 +1,12 @@ import __builtin__ import _pytest +import testlib import cmk monkeypatch = _pytest.monkeypatch.MonkeyPatch() -monkeypatch.syspath_prepend("%s/htdocs" % cmk.paths.web_dir) +# TODO: Use site path (in integration tests) +monkeypatch.syspath_prepend("%s/web/htdocs" % (testlib.cmk_path())) +#monkeypatch.syspath_prepend("/omd/sites/%s/%s/htdocs" % (os.environ["OMD_SITE"], cmk.paths.web_dir)) # Fake the localization wrapper _(...) monkeypatch.setattr(__builtin__, "_", lambda x: x, raising=False) diff --git a/tests/web/test_table.py b/tests/web/test_table.py index 1728668..3375f4d 100644 --- a/tests/web/test_table.py +++ b/tests/web/test_table.py @@ -14,8 +14,6 @@ from tools import compare_html , gentest, compare_and_empty from classes import DeprecatedRenderer -import config -import table import traceback def save_user_mock(name, data, user, unlock=False): pass @@ -47,21 +45,25 @@ def test_table(monkeypatch, tmpdir): def test_limit(monkeypatch, tmpdir): + import config monkeypatch.setattr(config, "save_user_file", save_user_mock) table_test_cubical(False, False, 2, 'html', tmpdir) def test_sortable(monkeypatch, tmpdir): + import config monkeypatch.setattr(config, "save_user_file", save_user_mock) table_test_cubical(True, False, None, 'html', tmpdir) def test_searchable(monkeypatch, tmpdir): + import config monkeypatch.setattr(config, "save_user_file", save_user_mock) table_test_cubical(False, True, None, 'html', tmpdir) def test_csv(monkeypatch, tmpdir): + import config monkeypatch.setattr(config, "save_user_file", save_user_mock) table_test_cubical(False, False, None, 'csv', tmpdir) @@ -88,6 +90,7 @@ def read_out_csv(text, separator): def table_test_cubical(sortable, searchable, limit, output_format, tmpdir): + import table html = TableTest() __builtin__.html = html

7 years, 5 months

Removed not used import

by Lars Michelsen

Module: check_mk Branch: master Commit: bfb6f00acffae11ab5bfea3fb5dcc3321ff2d6ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfb6f00acffae1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 08:00:36 2017 +0100 Removed not used import Change-Id: Ic9d08e795fd5845ef90cc1f4cd16b8cb3491b723 --- tests/mkeventd/test_mkeventd_status.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index d1f6bfd..f78f9b9 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -2,7 +2,6 @@ # encoding: utf-8 import pytest -import livestatus import time from testlib import web, ec

7 years, 5 months

Simplified some test stuff

by Lars Michelsen

Module: check_mk Branch: master Commit: 96745d74fd9992ee93a5c6406289b3d4194c87df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96745d74fd9992… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 27 07:57:59 2017 +0100 Simplified some test stuff Change-Id: I0ff459a6668f1f64af0d191a283dbdc70883ff44 --- tests/conftest.py | 29 +++++++---------- tests/mkeventd/test_mkeventd_status.py | 16 +++++++++ tests/testlib/__init__.py | 59 +++++++++++++++++----------------- tests/web/auto_build_test.py | 7 ---- tests/web/classes.py | 5 --- tests/web/conftest.py | 9 ++++++ tests/web/test_auto_sidebar.py | 8 ----- tests/web/test_generator.py | 5 --- tests/web/test_html.py | 5 --- tests/web/test_htmllib_integration.py | 5 --- tests/web/test_table.py | 6 ---- tests/web/tools.py | 5 --- 12 files changed, 65 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=96745d74fd…

7 years, 5 months

tests: Fixed permission issues during site creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e24b46e9b00556665b335fe4836bbce14ef4380 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e24b46e9b0055… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 26 17:39:02 2017 +0100 tests: Fixed permission issues during site creation Change-Id: Id3947a975a99f3d50a3c84d4ae2fa65ebd16d594 --- tests/testlib/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 845281a..392beb4 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -268,8 +268,9 @@ class Site(object): raise Exception("The site %s already exists." % self.id) if not self.exists(): - p = self.execute(["/usr/bin/omd", "-V", self.version.version_directory(), - "create", "--apache-reload", self.id]) + p = subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", + "-V", self.version.version_directory(), + "create", "--apache-reload", self.id]) assert p.wait() == 0 assert os.path.exists("/omd/sites/%s" % self.id) @@ -324,7 +325,8 @@ class Site(object): def rm(self, site_id=None): if site_id == None: site_id = self.id - assert self.execute(["/usr/bin/omd", "-f", "rm", "--kill", site_id]).wait() == 0 + assert subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", + "-f", "rm", "--kill", site_id]).wait() == 0 def cleanup_old_sites(self, cleanup_pattern):

7 years, 5 months

Setting up site only when needed

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f036aeba271841bd0ceef645acecd721e6d4d94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f036aeba27184… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 26 17:32:16 2017 +0100 Setting up site only when needed Change-Id: Ic29e644d77b68b274ce7e7968459d99a40b4b5b8 --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0331dea..2a47eaa 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -132,11 +132,11 @@ def _site_id(): add_python_paths() ensure_equal_branches() -setup_site_and_switch_user() import testlib # Session fixtures must be in conftest.py to work properly @pytest.fixture(scope="session", autouse=True) def site(request): + setup_site_and_switch_user() return _get_site_object()

7 years, 5 months

Run all tests (except explicitly marked) in site context

by Lars Michelsen

Module: check_mk Branch: master Commit: 66a9f7e03cc3606965735b7b5a4f3194e2521968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66a9f7e03cc360… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 26 17:19:40 2017 +0100 Run all tests (except explicitly marked) in site context Change-Id: I5f6bf60dec3c1a6172f16396fe03b382bbbfd348 --- pytest.ini | 7 +- tests/conftest.py | 83 +++++++++++------ tests/git/conftest.py | 9 ++ .../test_find_debug_code_web.py} | 4 + tests/{general => git}/test_find_debug_print.py | 2 +- tests/{general => git}/test_permissions.py | 2 +- .../windows => git}/test_precompiled_age.py | 2 +- .../test_precompiled_cmk_update_agent.py | 2 +- tests/lib/test_paths.py | 9 +- tests/testlib/__init__.py | 103 +++++++++++++++------ tests/web/test_key_mgmt.py | 1 - tests/web/test_table.py | 44 +++++---- 12 files changed, 179 insertions(+), 89 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=66a9f7e03c…

7 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017