Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4714 FIX Inventory win_networkadapter: Fixed exception when values were missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 5d0e0f505ddddd2c130b1f64ea437e66f675aef8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d0e0f505ddddd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 12 11:24:41 2017 +0200 4714 FIX Inventory win_networkadapter: Fixed exception when values were missing Change-Id: I6c11e0b649389f994bc0f527641482d5fea559b3 --- .werks/4714 | 10 ++++++++++ inventory/win_networkadapter | 3 +++ 2 files changed, 13 insertions(+) diff --git a/.werks/4714 b/.werks/4714 new file mode 100644 index 0000000..db38ba7 --- /dev/null +++ b/.werks/4714 @@ -0,0 +1,10 @@ +Title: Inventory win_networkadapter: Fixed exception when values were missing +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497259436 +Class: fix + + diff --git a/inventory/win_networkadapter b/inventory/win_networkadapter index aeaed89..d1ba4cf 100644 --- a/inventory/win_networkadapter +++ b/inventory/win_networkadapter @@ -49,6 +49,9 @@ def inv_win_networkadapter(info): varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) + if not value: + continue + if first_varname and varname == first_varname: # Looks like we have a new instance node.append(array)

7 years

logwatch.py minor code cleanup in may_see function

by Andreas Boesl

Module: check_mk Branch: master Commit: 6a209f7ae7418f6563e02f24694067355c502d7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a209f7ae7418f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 12 11:16:16 2017 +0200 logwatch.py minor code cleanup in may_see function Change-Id: I058ba0bab13a8a6f78c3a176832486329369c915 --- web/htdocs/logwatch.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 3b301d3..e2feb0b 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -566,12 +566,17 @@ def may_see(site, host_name): if config.user.may("general.see_all"): return True - if site: - sites.live().set_only_sites([site]) + host_found = False + try: + if site: + sites.live().set_only_sites([site]) + # Note: This query won't work in a distributed setup and no site given as argument + # livestatus connection is setup with AuthUser + host_found = sites.live().query_value("GET hosts\nStats: state >= 0\nFilter: name = %s\n" % lqencode(host_name)) > 0 + finally: + sites.live().set_only_sites(None) - # Note: This query won't work in a distributed setup and no site given as argument - # livestatus connection is setup with AuthUser - return sites.live().query_value("GET hosts\nStats: state >= 0\nFilter: name = %s\n" % lqencode(host_name)) > 0 + return host_found # Tackle problem, where some characters are missing in the service

7 years

Refactoring: rename cmk_section_dict cmk_info, use string keys instead of unicode

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1375abe122e51613664351e3f02adbd8397aaf87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1375abe122e516… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 12 10:56:07 2017 +0200 Refactoring: rename cmk_section_dict cmk_info, use string keys instead of unicode Change-Id: If775f1479146d3d4f99c0b38c73b4adc838c93e4 --- modules/check_mk_base.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b897813..0e1705b 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1211,10 +1211,10 @@ def do_check(hostname, ipaddress, only_check_types = None): try: load_item_state(hostname) - cmk_section_dict, num_success, error_sections, problems = \ + cmk_info, num_success, error_sections, problems = \ do_all_checks_on_host(hostname, ipaddress, only_check_types) - agent_version = cmk_section_dict[u"version"] + agent_version = cmk_info["version"] num_errors = len(error_sections) save_item_state(hostname) @@ -1505,24 +1505,24 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag submit_aggregated_results(hostname) if fetch_agent_version: - cmk_section_dict = { u"version" : "(unknown)" } + cmk_info = { "version" : "(unknown)" } try: if is_tcp_host(hostname): for line in get_info_for_check(hostname, ipaddress, 'check_mk'): value = " ".join(line[1:]) if len(line) > 1 else None - cmk_section_dict[line[0][:-1].lower()] = value + cmk_info[str(line[0][:-1].lower())] = value else: - cmk_section_dict[u"version"] = None + cmk_info["version"] = None except MKAgentError: g_broken_agent_hosts.add(hostname) except: pass else: - cmk_section_dict[u"version"] = None + cmk_info["version"] = None error_section_list = sorted(list(error_sections)) - return cmk_section_dict, num_success, error_section_list, ", ".join(problems) + return cmk_info, num_success, error_section_list, ", ".join(problems) # Create a crash dump with a backtrace and the agent output.

7 years

Fixed werk version number

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ca92fe5fba126f8f72e3786e9c75e6ac95f4449 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ca92fe5fba126… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 12 10:32:57 2017 +0200 Fixed werk version number Change-Id: I1aa99f08f46ab7d5d0cce5ffca8aac5c2bbef434 --- .werks/4052 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4052 b/.werks/4052 index 7b596e8..9b8605d 100644 --- a/.werks/4052 +++ b/.werks/4052 @@ -3,7 +3,7 @@ Level: 1 Component: multisite Compatible: compat Edition: cre -Version: 1.5.0i1 +Version: 1.4.0b6 Date: 1493199600 Class: fix

7 years

Added git test to prevent adding werks with wrong versions to version branches

by Lars Michelsen

Module: check_mk Branch: master Commit: c1f299c99c1aa44b1de5875e9dd00be4321d660f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1f299c99c1aa4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 12 10:31:53 2017 +0200 Added git test to prevent adding werks with wrong versions to version branches Change-Id: Ia6ab0a5d0baaa417335bb070d6736b603968ee6e --- tests/lib/test_werks.py | 22 ++++++++++++++++++++++ tests/testlib/__init__.py | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/tests/lib/test_werks.py b/tests/lib/test_werks.py index 8a4c06b..7b38e4e 100644 --- a/tests/lib/test_werks.py +++ b/tests/lib/test_werks.py @@ -61,3 +61,25 @@ def test_write_precompiled_werks(tmpdir, site, monkeypatch): merged_werks.update(cmc_werks) assert merged_werks == werks_loaded + + +def test_werk_versions(site): + import cmk_base.utils + + # All versions are allowed in master branch. We only want to ensure that version specific + # branches don't have werks with newer version numbers. + v = cmk.omd_version() + if cmk_base.utils.is_daily_build_version(v): + branch = cmk_base.utils.branch_of_daily_build(v) + if branch == "master": + return + else: + v = branch + + parsed_version = cmk.werks.parse_check_mk_version(v) + + for werk_id, werk in cmk.werks.load().items(): + parsed_werk_version = cmk.werks.parse_check_mk_version(werk["version"]) + + assert parsed_werk_version <= parsed_version, \ + "Version %s of werk #%d is not allowed in this branch" % (werk["version"], werk_id) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 274aabd..af416c2 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -104,6 +104,10 @@ class CMKVersion(object): self.version = version + def branch(self): + return self._branch + + def edition(self): return self.edition_short == CMKVersion.CRE and "raw" or "enterprise"

7 years

Revert "Fixed werk version number"

by Lars Michelsen

Module: check_mk Branch: master Commit: 47e652aabd9e92a0e8dd568a8028144dbba483f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47e652aabd9e92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 12 10:33:11 2017 +0200 Revert "Fixed werk version number" This reverts commit 1dd1b7b6e0a76828bfe5e3c1a17a1d2d6e7c08de. --- .werks/4052 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4052 b/.werks/4052 index 9b8605d..7b596e8 100644 --- a/.werks/4052 +++ b/.werks/4052 @@ -3,7 +3,7 @@ Level: 1 Component: multisite Compatible: compat Edition: cre -Version: 1.4.0b6 +Version: 1.5.0i1 Date: 1493199600 Class: fix

7 years

Updated bug entries #2901

by Lars Michelsen

Module: check_mk Branch: master Commit: a2777d4bb3f74885a24faa54457c6805d5ada145 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2777d4bb3f748… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 31 17:26:28 2017 +0200 Updated bug entries #2901 Change-Id: I3dafcc8bffeec997f33e1d0ff0ec902fbc95cf9b --- .bugs/2901 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2901 b/.bugs/2901 index e214937..ba4683a 100644 --- a/.bugs/2901 +++ b/.bugs/2901 @@ -1,9 +1,9 @@ Title: ActivateChangesManager: is_running fails if last known process id is used by another process Component: wato -State: open +Class: bug +State: done Date: 2017-05-31 11:26:15 Targetversion: 1.4.0 -Class: bug The activation folder seems to include some status files for each site. @@ -47,3 +47,6 @@ This may happen on "Activate changes", which shows an "[Errno 1] Operation not p OSError: [Errno 1] Operation not permitted + +2017-05-31 17:26:25: changed state open -> done +fixed with werk 4754

7 years

Updated bug entries #2556

by Mathias Kettner

Module: check_mk Branch: master Commit: 704a3434fe965b1a303665e7366530e6bf1e0984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=704a3434fe965b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 12 09:48:41 2017 +0200 Updated bug entries #2556 Change-Id: I265fc40af1ecc7a4b27ad7d2eff54aaef0750b24 --- .bugs/2556 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.bugs/2556 b/.bugs/2556 new file mode 100644 index 0000000..8a1f9ab --- /dev/null +++ b/.bugs/2556 @@ -0,0 +1,23 @@ +Title: Rework setting of environment variables in whole OMD context +Component: core +State: open +Date: 2017-06-12 09:45:35 +Targetversion: 1.4.0 +Class: bug + +Environment variables should only be set in ~/.profile and +will then be inherited by all sub- and subsubprocesses. It +seem that some start scripts explicitely source that file. +It also seems that in some situations not all variables +are correctly inherited. + +We need to investigate this, clean this up, remove explizit +sourcing of .profile and streamline this. + +All variables should be set just in two places: + +1. su - mysite +2. omd ... mysite + +All other scripts such auch etc/init.d/* should simply +rely on correct inheritance.

7 years

4754 FIX Fixed possible "Operation not permitted issue" during activation

by Lars Michelsen

Module: check_mk Branch: master Commit: e2a69826f3f899ea85048ea7246a34294621bc7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2a69826f3f899… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 31 17:26:16 2017 +0200 4754 FIX Fixed possible "Operation not permitted issue" during activation In case a pid of a former activation process is reused by a process of another user a "OSError: [Errno 1] Operation not permitted" exception could occur. Change-Id: Id79bd5010e9cf985893c41f276baf69f7e1ffffa --- .werks/4754 | 12 ++++++++++++ web/htdocs/watolib.py | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4754 b/.werks/4754 new file mode 100644 index 0000000..32c8d31 --- /dev/null +++ b/.werks/4754 @@ -0,0 +1,12 @@ +Title: Fixed possible "Operation not permitted issue" during activation +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496244281 +Class: fix + +In case a pid of a former activation process is reused by a process of +another user a "OSError: [Errno 1] Operation not permitted" exception +could occur. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index a185b55..599e1e2 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4558,7 +4558,9 @@ class ActivateChangesManager(ActivateChanges): os.kill(site_state["_pid"], 0) return True # -> running except OSError, e: - if e.errno == 3: + # 3: not running + # 1: operation not permitted (another process reused this) + if e.errno in [ 3, 1 ]: pass # -> not running else: raise

7 years

Revert " 4797 FIX Removed deprecated global service discovery setting and added new standard rule "

by Lars Michelsen

Module: check_mk Branch: master Commit: 174146cd2011fbc22c460c13b8514517fcf00a67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=174146cd2011fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 12 09:47:06 2017 +0200 Revert "4797 FIX Removed deprecated global service discovery setting and added new standard rule" This reverts commit 261bb97ae769bf2dcb6d9e4a58ff1d6dfcda2fb5. Change-Id: I1ed7382f7e857f058f73fb72c9d2868da86e1589 --- .werks/4797 | 13 ------------- web/htdocs/wato.py | 9 +-------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.werks/4797 b/.werks/4797 deleted file mode 100644 index addba29..0000000 --- a/.werks/4797 +++ /dev/null @@ -1,13 +0,0 @@ -Title: Removed deprecated global service discovery setting and added new standard rule -Level: 1 -Component: checks -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0i1 -Date: 1496774354 - -Removed deprecated global service discovery setting for new created sites -and added a new standard rule which will execute every two hours a service -discovery. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e3857c7..1cb3acc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14387,6 +14387,7 @@ def create_sample_config(): "qmail_stats", ], "enable_rulebased_notifications": True, + "inventory_check_interval": 120, } ) @@ -14453,14 +14454,6 @@ def create_sample_config(): 'extra_service_conf:check_interval': [ ( 1440, [], ALL_HOSTS, [ "Check_MK HW/SW Inventory$" ], {'description': u'Restrict HW/SW-Inventory to once a day'} ), ], - - # Periodic service discovery - 'periodic_discovery': [ - ({'severity_unmonitored': 1, - 'severity_vanished': 0, - 'inventory_check_do_scan': True, - 'check_interval': 120.0}, [], ALL_HOSTS, {'description': u'Perform every two hours a service discovery'} ), - ], } rulesets = FolderRulesets(Folder.root_folder())

7 years

← Newer
1
...
17
18
19
20
21
22
23
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017