Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 53b217d57baa4849eca1848caad21cf119dd2840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53b217d57baa48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 11 11:25:17 2017 +0200 Fixed quoting issue in recent change Change-Id: I50c99bba0667b58a672ba3b1f481af993a079389 --- 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 ec0f407..c93d16d 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -343,7 +343,7 @@ class Site(object): (self.root, self.version.version_path())) >> 8 != 0: raise Exception("Failed to set new version to bin/python") - if os.system("sudo sed -i \"s|^initialize()$|sys.path.insert(0, '%s/lib/python')\ninitialize()|g\" " + if os.system("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\ninitialize()|g' " "%s/share/check_mk/web/htdocs/index.py" % (self.version.version_path(), self.version.version_path())) >> 8 != 0: raise Exception("Failed to add python module path of fake version")

7 years, 5 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: 8a8e67eadbead444f412596dc726d3fafbad7a5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a8e67eadbead4… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Apr 11 11:11:59 2017 +0200 Reserved 10 Werk IDS Change-Id: Id2922a47bb3f5076afb96b192a762efae8ccb6ec --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 93c1b5c..e2f5cf7 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4616 +4626

7 years, 5 months

Python path replace was done too late

by Lars Michelsen

Module: check_mk Branch: master Commit: e3c87b51e08d244ab476f2e7a1bd793a27388bf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3c87b51e08d24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 11 11:06:38 2017 +0200 Python path replace was done too late Change-Id: I67786a8ed3eadd0b599ac7d61a4605faadc04baa --- 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 139ef86..ec0f407 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -343,8 +343,8 @@ class Site(object): (self.root, self.version.version_path())) >> 8 != 0: raise Exception("Failed to set new version to bin/python") - if os.system("echo 'sys.path.insert(0, \"%s/lib/python\")' " - "| sudo tee -a %s/share/check_mk/web/htdocs/index.py >/dev/null" % + if os.system("sudo sed -i \"s|^initialize()$|sys.path.insert(0, '%s/lib/python')\ninitialize()|g\" " + "%s/share/check_mk/web/htdocs/index.py" % (self.version.version_path(), self.version.version_path())) >> 8 != 0: raise Exception("Failed to add python module path of fake version")

7 years, 5 months

4557 FIX Stacking on metrics with empty values is now possible

by Andreas Umbreit

Module: check_mk Branch: master Commit: 04e22be8dc108ef4f0ff627041838edef5699072 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04e22be8dc108e… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Apr 11 10:36:47 2017 +0200 4557 FIX Stacking on metrics with empty values is now possible --- .werks/4557 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4557 b/.werks/4557 new file mode 100644 index 0000000..639ab93 --- /dev/null +++ b/.werks/4557 @@ -0,0 +1,10 @@ +Title: Stacking on metrics with empty values is now possible +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1491898933 +Class: fix + +

7 years, 5 months

added werk 4556

by Andreas Umbreit

Module: check_mk Branch: master Commit: 0fc7f93ad0550ab6ab539d121c5b016c63bfd35b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc7f93ad0550a… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Mar 28 14:35:19 2017 +0200 added werk 4556 --- .werks/4556 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/4556 b/.werks/4556 new file mode 100644 index 0000000..cf50d49 --- /dev/null +++ b/.werks/4556 @@ -0,0 +1,20 @@ +Title: Fixed compatibility problem in agent updater with some older windows versions +Level: 1 +Edition: cee +Component: agents +Compatible: compat +Version: 1.5.0i1 +Date: 1490258522 +Class: fix + +When running Check_MK agent updater under some older Windows versions (eg. Windows XP), +a problem with some missing runtime libraries can possibly occur. +This would result in an error message beginning with "Error loading Python DLL:..." + +A quick-fix for this problem would be the installation of a Microsoft Visual C++ +Redistributable package. It can be found at Microsoft support homepage. +(support.microsoft.com) with the search term "vcredist_x86". +The MS VC++ 2008 Redistributable Package (x86) would be sufficient. + +However, the needed runtime libraries will be included in all Check_MK +releases containg this werk.

7 years, 5 months

4583 FIX netextreme_psu: Fixed empty data handling

by Simon Betz

Module: check_mk Branch: master Commit: 60ff7f8b9efc8714e6c383c6dbd473af2b9d976e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60ff7f8b9efc87… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 11 10:43:55 2017 +0200 4583 FIX netextreme_psu: Fixed empty data handling Change-Id: I16abd72a1b9982b3e3493369245b21949efdbaf9 --- .werks/4583 | 11 +++++++++++ checks/netextreme_psu | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4583 b/.werks/4583 new file mode 100644 index 0000000..88427ae --- /dev/null +++ b/.werks/4583 @@ -0,0 +1,11 @@ +Title: netextreme_psu: Fixed empty data handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1491900165 + + diff --git a/checks/netextreme_psu b/checks/netextreme_psu index 83812e2..0967bd5 100644 --- a/checks/netextreme_psu +++ b/checks/netextreme_psu @@ -36,7 +36,10 @@ factory_settings["netextreme_psu_default_levels"] = { def parse_netextreme_psu(info): - return { "1" : {"power" : float(info[0][0]) * pow(10, int(info[0][1])) }} + try: + return { "1" : {"power" : float(info[0][0]) * pow(10, int(info[0][1])) }} + except (IndexError, ValueError): + return {} check_info['netextreme_psu'] = {

7 years, 5 months

Set correct python path to fake version for tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 8efca094de9486a105c1af1ad467cf088fd2c8b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8efca094de9486… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 11 09:47:21 2017 +0200 Set correct python path to fake version for tests Change-Id: I2e23c387862cc84ebb1ff74b646e989f8dbf1d50 --- tests/testlib/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 0a0e221..139ef86 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -343,6 +343,11 @@ class Site(object): (self.root, self.version.version_path())) >> 8 != 0: raise Exception("Failed to set new version to bin/python") + if os.system("echo 'sys.path.insert(0, \"%s/lib/python\")' " + "| sudo tee -a %s/share/check_mk/web/htdocs/index.py >/dev/null" % + (self.version.version_path(), self.version.version_path())) >> 8 != 0: + raise Exception("Failed to add python module path of fake version") + def _update_with_f12_files(self): paths = [

7 years, 5 months

Updated werks

by Mathias Kettner

Module: check_mk Branch: master Commit: 79617485c51733d164ceb019c9ad40b1fdc9ecca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79617485c51733… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 10 16:16:54 2017 +0200 Updated werks Change-Id: I90dfc6b7d3d55c8ec332fcb02425e5e4fe26e95e --- .werks/2713 | 15 +++++++-------- .werks/3575 | 12 ++++++------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.werks/2713 b/.werks/2713 index 380e6bc..736866c 100644 --- a/.werks/2713 +++ b/.werks/2713 @@ -1,4 +1,4 @@ -Title: New bookmark lists, strucutrable and shareable between users +Title: New structured bookmark lists, shareable between users Level: 2 Component: multisite Compatible: compat @@ -7,13 +7,12 @@ Date: 1445942455 Class: feature The bookmark sidebar snapin has been extended to be structurable into -topics. Each bookmark can now be put into a topic which can then be -expanded or closed in the GUI. +topics. Each bookmark can now be put into a topic which can then be expanded +or closed in the GUI. It is now possible to group bookmarks together in multiple bookmark -lists. These lists can be made available to other users, just like -views, dashboards, reports and graph collections. +lists. These lists can be made available to other users, just like views, +dashboards, reports and graph collections. -The summary of all bookmark lists a user can access is grouped together -in the bookmark snapin and shown to the user as one single list of -bookmarks. +The summary of all bookmark lists a user can access is grouped together in +the bookmark snapin and shown to the user as one single list of bookmarks. diff --git a/.werks/3575 b/.werks/3575 index 6435351..ddb6059 100644 --- a/.werks/3575 +++ b/.werks/3575 @@ -1,4 +1,4 @@ -Title: User logins can now be limited to single session at a time +Title: User logins can now be limited to a single session at a time Level: 2 Component: multisite Compatible: compat @@ -6,9 +6,9 @@ Version: 1.4.0i1 Date: 1464094732 Class: feature -Normally a user can login to the GUI from unlimited number of clients at -the same time. If you want to enforce your users to be able to login only once +Normally a user can login to the GUI from unlimited number of clients at the +same time. If you want to enforce your users to be able to login only once (from one client which means device and browser), you can enable this option. -When the user logs out or is inactive for the configured amount of time, the -session is invalidated automatically and the user has to log in again from the -current or another device. +When the user logs out or is inactive for the configured amount of time, +the session is invalidated automatically and the user has to log in again +from the current or another device.

7 years, 5 months

Trying to fix possible races during WATO initial config creation

by Lars Michelsen

Module: check_mk Branch: master Commit: c7e6b07fd65c6d26379a8832e0de416cbd0b043e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7e6b07fd65c6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 10 15:12:08 2017 +0200 Trying to fix possible races during WATO initial config creation Change-Id: Ic03751b05afcb071bc121b799c105d9da29a07f8 --- web/htdocs/wato.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9b4ba63..f07c15a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -117,10 +117,19 @@ display_options = None wato_styles = [ "pages", "wato", "status" ] -def init_wato_datastructures(): - create_sample_config() # if called for the very first time! +# TODO: Must only be unlocked when it was not locked before. We should find a more +# robust way for doing something like this. If it is locked before, it can now happen +# that this call unlocks the wider locking when calling this funktion in a wrong way. +def init_wato_datastructures(with_wato_lock=False): + if with_wato_lock: + lock_exclusive() + + create_sample_config() init_watolib_datastructures() + if with_wato_lock: + unlock_exclusive() + #. # .--Main----------------------------------------------------------------. @@ -172,7 +181,7 @@ def page_handler(): lock_exclusive() try: - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=not html.is_transaction()) except: # Snapshot must work in any case if current_mode == 'snapshot': @@ -2633,7 +2642,7 @@ def mode_diag_host(phase): def ajax_diag_host(): try: - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=True) if not config.user.may('wato.diag_host'): raise MKAuthException(_('You are not permitted to perform this action.')) @@ -3479,7 +3488,7 @@ class ModeAjaxExecuteCheck(WatoWebApiMode): def page(self): - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=True) try: state, output = check_mk_automation(self._site, "active-check", [ self._host_name, self._check_type, self._item ], sync=False) @@ -5460,7 +5469,7 @@ class ModeActivateChanges(WatoMode, ActivateChanges): class ModeAjaxStartActivation(WatoWebApiMode): def page(self): - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=True) config.user.need_permission("wato.activate") @@ -5496,7 +5505,7 @@ class ModeAjaxStartActivation(WatoWebApiMode): class ModeAjaxActivationState(WatoWebApiMode): def page(self): - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=True) config.user.need_permission("wato.activate") @@ -10117,7 +10126,7 @@ def page_automation(): # we request the lock in all cases. lock_exclusive() - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=False) command = html.var("command") if command == "checkmk-automation": @@ -10174,8 +10183,6 @@ def automation_push_profile(): if not profile: raise MKGeneralException(_('Invalid call: The profile is missing.')) - init_wato_datastructures() - users = userdb.load_users(lock = True) profile = mk_eval(profile) users[user_id] = profile @@ -14368,6 +14375,8 @@ def page_user_profile(change_pw=False): else: users = userdb.load_users() + init_wato_datastructures(with_wato_lock=True) + # When in distributed setup, display the replication dialog instead of the normal # profile edit dialog after changing the password. if start_async_replication: @@ -14496,7 +14505,7 @@ def page_download_agent_output(): if ty not in [ "walk", "agent" ]: raise MKGeneralException(_("Invalid type specified.")) - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=True) host = Folder.current().host(host_name) if not host: @@ -16128,7 +16137,7 @@ def read_agent_contents_file(root): # master site. Finds the next folder to scan and starts it via WATO # automation. The result is written to the folder in the master site. def execute_network_scan_job(): - init_wato_datastructures() + init_wato_datastructures(with_wato_lock=True) if is_wato_slave_site(): return # Don't execute this job on slaves.

7 years, 5 months

8631 FIX netapp_api_luns: Fix nonsensical infotext, treat LUN offline status as CRIT instead of WARN

by Konstantin Büttner

Module: check_mk Branch: master Commit: bc3448ea20339bb117817f949d56e6d6b9c9b349 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc3448ea20339b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Apr 10 13:32:06 2017 +0200 8631 FIX netapp_api_luns: Fix nonsensical infotext, treat LUN offline status as CRIT instead of WARN Change-Id: I1d7cca70911d8a7e227e62688a73fd0a83b44978 --- .werks/8631 | 11 +++++++++++ checks/netapp_api_luns | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/8631 b/.werks/8631 new file mode 100644 index 0000000..b52fa23 --- /dev/null +++ b/.werks/8631 @@ -0,0 +1,11 @@ +Title: netapp_api_luns: Fix nonsensical infotext, treat LUN offline status as CRIT instead of WARN +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1491823896 + + diff --git a/checks/netapp_api_luns b/checks/netapp_api_luns index df040f2..99844b3 100644 --- a/checks/netapp_api_luns +++ b/checks/netapp_api_luns @@ -45,7 +45,7 @@ def check_netapp_api_luns(item, params, parsed): return if lun.get("online") != "true": - yield 1, "LUN is %s" % lun.get("online") + yield 2, "LUN is offline" if lun.get("read-only") != "false": yield 1, "read-only is %s" % lun.get("read-only")

7 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017