Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

3915 User access times: New icon when never logged in; New column " last seen"

by Lars Michelsen

Module: check_mk Branch: master Commit: 1161be348dac2bd7f6114f662bc41cf60eedbb84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1161be348dac2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 11:15:10 2016 +0200 3915 User access times: New icon when never logged in; New column "last seen" --- .werks/3915 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 19 +++++++++++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/3915 b/.werks/3915 new file mode 100644 index 0000000..008c58c --- /dev/null +++ b/.werks/3915 @@ -0,0 +1,9 @@ +Title: User access times: New icon when never logged in; New column "last seen" +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1475226861 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 003d92a..3e4c8d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running WATO: + * 3915 User access times: New icon when never logged in; New column "last seen" * 3914 FIX: Roles: Aliases are now unique during cloning diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 62a2371..4149bfa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9997,12 +9997,23 @@ def mode_users(phase): last_seen = user.get('last_seen', 0) if last_seen >= online_threshold: title = _('Online') - img_txt = 'on' - else: + img_txt = 'online' + elif last_seen != 0: title = _('Offline') - img_txt = 'off' + img_txt = 'offline' + elif last_seen == 0: + title = _('Never logged in') + img_txt = 'inactive' + title += ' (%s %s)' % (fmt_date(last_seen), fmt_time(last_seen)) - table.cell(_("Act."), '<img class=icon title="%s" src="images/icon_%sline.png" />' % (title, img_txt)) + table.cell(_("Act.")) + html.icon(title, img_txt) + + table.cell(_("Last seen")) + if last_seen != 0: + html.write("%s %s" % (fmt_date(last_seen), fmt_time(last_seen))) + else: + html.write(_("Never logged in")) # Connection if connection:

8 years

Updated bug entries #2505

by Lars Michelsen

Module: check_mk Branch: master Commit: 766c9269334d34640fa963d8fecfde4c2c22728a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=766c9269334d34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 11:00:01 2016 +0200 Updated bug entries #2505 --- .bugs/2505 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2505 b/.bugs/2505 index 179c72c..97703d8 100644 --- a/.bugs/2505 +++ b/.bugs/2505 @@ -1,9 +1,12 @@ Title: Wrong calculation of levels for remaining space in per cent on small filesystems Component: checks -State: open +Class: bug +State: done Date: 2016-08-03 13:14:29 Targetversion: 1.2.8 -Class: bug On small filesystems like 4KB on routers or switches the calculation of remaining hard disk space at per cent is wrong. The calculation calculates the wrong levels for it. + +2016-09-30 10:59:57: changed state open -> done +Should have been fixed in the meantime.

8 years

3914 FIX Roles: Aliases are now unique during cloning

by Lars Michelsen

Module: check_mk Branch: master Commit: e1f63b6c9bd5151e674f175f12f0bea40e87c9ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1f63b6c9bd515… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 10:58:46 2016 +0200 3914 FIX Roles: Aliases are now unique during cloning --- .bugs/2494 | 7 +++++-- .werks/3914 | 9 +++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 21 +++++++++++++++++++-- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/.bugs/2494 b/.bugs/2494 index 01bf7fe..95ffe4c 100644 --- a/.bugs/2494 +++ b/.bugs/2494 @@ -1,9 +1,12 @@ Title: Cloning of roles creates roles with an existing non-unique alias Component: wato -State: open +Class: bug +State: done Date: 2016-05-19 14:53:37 Targetversion: 1.2.8 -Class: bug This prevents you from saving the properties. And creates in invalid state. Rather create an artificial Alias like "Clone of role Administrator" or the like. + +2016-09-30 01:50:51: changed state open -> done +Fied diff --git a/.werks/3914 b/.werks/3914 new file mode 100644 index 0000000..2058626 --- /dev/null +++ b/.werks/3914 @@ -0,0 +1,9 @@ +Title: Roles: Aliases are now unique during cloning +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1475225899 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4ce978d..003d92a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running + WATO: + * 3914 FIX: Roles: Aliases are now unique during cloning + 1.4.0i1: Core & Setup: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 614aaab..62a2371 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10711,6 +10711,10 @@ def mode_roles(phase): if phase == "action": if html.var("_delete"): delid = html.var("_delete") + + if delid not in roles: + raise MKUserError(None, _("This role does not exist.")) + if html.transaction_valid() and roles[delid].get('builtin'): raise MKUserError(None, _("You cannot delete the builtin roles!")) @@ -10727,15 +10731,28 @@ def mode_roles(phase): elif html.var("_clone"): if html.check_transaction(): cloneid = html.var("_clone") - cloned_role = roles[cloneid] + + try: + cloned_role = roles[cloneid] + except KeyError: + raise MKUserError(None, _("This role does not exist.")) + newid = cloneid while newid in roles: newid += "x" + new_role = {} new_role.update(cloned_role) + + new_alias = new_role["alias"] + while not is_alias_used("roles", newid, new_alias)[0]: + new_alias += _(" (copy)") + new_role["alias"] = new_alias + if cloned_role.get("builtin"): - new_role["builtin"] = False + new_role["builtin"] = False new_role["basedon"] = cloneid + roles[newid] = new_role save_roles(roles) update_login_sites_replication_status()

8 years

Added missing file

by Lars Michelsen

Module: check_mk Branch: master Commit: 423a27c9809b6ec406f89a0d0238e0febc3a7020 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=423a27c9809b6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 11:20:26 2016 +0200 Added missing file --- web/htdocs/images/icon_inactive.png | Bin 0 -> 2729 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_inactive.png b/web/htdocs/images/icon_inactive.png new file mode 100644 index 0000000..169f917 Binary files /dev/null and b/web/htdocs/images/icon_inactive.png differ

8 years

Renamed different functions / variables:

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b6aab05cd39f809b7d76c08eb579dbbba95fe69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b6aab05cd39f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 29 23:52:13 2016 +0200 Renamed different functions / variables: config.user_id -> config.user.id config.may -> config.user.may config.need_permission -> config.user.need_permission config.load_user_file -> config.user.load_file --- web/htdocs/bi.py | 26 ++-- web/htdocs/config.py | 37 +++-- web/htdocs/crash_reporting.py | 5 +- web/htdocs/dashboard.py | 22 +-- web/htdocs/html_mod_python.py | 17 +-- web/htdocs/index.py | 4 +- web/htdocs/inventory.py | 2 +- web/htdocs/key_mgmt.py | 8 +- web/htdocs/login.py | 15 +- web/htdocs/logwatch.py | 6 +- web/htdocs/mobile.py | 6 +- web/htdocs/notifications.py | 18 +-- web/htdocs/notify.py | 8 +- web/htdocs/pagetypes.py | 38 ++--- web/htdocs/sidebar.py | 38 ++--- web/htdocs/sites.py | 14 +- web/htdocs/table.py | 2 +- web/htdocs/userdb.py | 4 +- web/htdocs/valuespec.py | 2 +- web/htdocs/views.py | 40 +++--- web/htdocs/visuals.py | 52 +++---- web/htdocs/wato.py | 248 ++++++++++++++++----------------- web/htdocs/watolib.py | 44 +++--- web/htdocs/webapi.py | 4 +- web/htdocs/weblib.py | 4 +- web/htdocs/werks.py | 4 +- web/plugins/icons/builtin.py | 8 +- web/plugins/icons/wato.py | 2 +- web/plugins/sidebar/shipped.py | 22 +-- web/plugins/sidebar/wato.py | 6 +- web/plugins/views/availability.py | 4 +- web/plugins/views/commands.py | 10 +- web/plugins/views/layouts.py | 2 +- web/plugins/views/mkeventd.py | 22 +-- web/plugins/wato/bi.py | 10 +- web/plugins/wato/builtin_attributes.py | 4 +- web/plugins/wato/mkeventd.py | 14 +- web/plugins/webapi/webapi.py | 4 +- 38 files changed, 390 insertions(+), 386 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7b6aab05cd…

8 years

Changed config.save_user_file to config.user.save_file calls

by Lars Michelsen

Module: check_mk Branch: master Commit: cbc7eaf69df794ba582addc7ee38dcf5bc6029c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbc7eaf69df794… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 00:17:39 2016 +0200 Changed config.save_user_file to config.user.save_file calls --- web/htdocs/bi.py | 4 ++-- web/htdocs/config.py | 28 ++++++++++++++++++++-------- web/htdocs/help.py | 2 +- web/htdocs/html_mod_python.py | 4 ++-- web/htdocs/login.py | 6 +++--- web/htdocs/main.py | 2 +- web/htdocs/notifications.py | 4 ++-- web/htdocs/sidebar.py | 9 +++++---- web/htdocs/sites.py | 5 +++-- web/htdocs/table.py | 2 +- web/htdocs/userdb.py | 2 +- web/htdocs/views.py | 4 ++-- web/htdocs/wato.py | 18 +++++++++--------- web/htdocs/webapi.py | 2 +- web/htdocs/weblib.py | 2 +- web/plugins/sidebar/shipped.py | 2 +- web/plugins/views/availability.py | 4 ++-- web/plugins/wato/mkeventd.py | 2 +- 18 files changed, 58 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cbc7eaf69d…

8 years

Fixed old function call

by Lars Michelsen

Module: check_mk Branch: master Commit: a34828547bf2bb9ef4d8152e05f7e9024e5555d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a34828547bf2bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 01:28:50 2016 +0200 Fixed old function call --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 97bcc6e..614aaab 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15859,7 +15859,7 @@ def execute_network_scan_job(): save_network_scan_result(folder, result) if old_user: - config.set_user(old_user) + config.set_user_by_id(old_user) # Find the folder which network scan is longest waiting and return the

8 years

Cleaned up LoggedInSuperUser/LoggedInNobody a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 11b961be4dd7df78311e2c8fcf6853c93ee8dc69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11b961be4dd7df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 01:19:40 2016 +0200 Cleaned up LoggedInSuperUser/LoggedInNobody a bit --- web/htdocs/config.py | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 3d133b7..3d8b331 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -40,6 +40,9 @@ import cmk.paths # | Declarations of global variables and constants | # '----------------------------------------------------------------------' +multisite_users = {} +admin_users = [] + # hard coded in various permissions builtin_role_ids = [ "user", "admin", "guest" ] @@ -309,7 +312,7 @@ class LoggedInUser(object): # profile in multisite_users (e.g. due to WATO), we rather # use that profile. Remaining (unknown) users get the default_user_role. # That can be set to None -> User has no permissions at all. - self.role_ids = roles_of_user(self.id) + self.role_ids = self._gather_roles() # Get base roles (admin/user/guest) self._load_base_roles() @@ -323,6 +326,10 @@ class LoggedInUser(object): self.baserole_id = "guest" + def _gather_roles(self): + return roles_of_user(self.id) + + def _load_base_roles(self): base_roles = set([]) for r in self.role_ids: @@ -451,30 +458,44 @@ class LoggedInUser(object): # TODO: Can we somehow get rid of this? class LoggedInSuperUser(LoggedInUser): def __init__(self): - self.id = None - self.role_ids = [ "admin" ] - self.baserole_ids = [ "admin" ] - self.baserole_id = "admin" - self.attributes = { "roles" : self.role_ids } + super(LoggedInSuperUser, self).__init__(None) self.alias = "Superuser for unauthenticated pages" self.email = "admin" - self.permissions = {} + + + def _gather_roles(self): + return [ "admin" ] + + + def _load_confdir(self): + self.confdir = None + + + def _load_site_config(self): self.siteconf = {} + class LoggedInNobody(LoggedInUser): def __init__(self): - self.id = None - self.role_ids = [] - self.baserole_ids = [] - self.baserole_id = "" - self.attributes = { "roles" : self.role_ids } + super(LoggedInNobody, self).__init__(None) self.alias = "Unauthenticated user" - self.email = "" - self.permissions = {} + self.email = "nobody" + + + def _gather_roles(self): + return [] + + + def _load_confdir(self): + self.confdir = None + + + def _load_site_config(self): self.siteconf = {} + def clear_user_login(): _set_user(LoggedInNobody())

8 years

Commented out experimental file io using python context manager

by Lars Michelsen

Module: check_mk Branch: master Commit: 0be9b5adb86e752a581d4b1e0ec0300fd944ffc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0be9b5adb86e75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 01:35:13 2016 +0200 Commented out experimental file io using python context manager --- bin/mkbackup | 4 +- lib/store.py | 164 +++++++++++++++++++++++++++++------------------------------ 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index 3c02f6c..ed38f8b 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1345,8 +1345,8 @@ def save_state(new_attrs, update=True): state = {} state.update(new_attrs) - with store.open(state_path(), "w") as f: - json.dump(state, f, sort_keys=True, indent=4, separators=(',', ': ')) + store.save_file(state_path(), + json.dumps(state, sort_keys=True, indent=4, separators=(',', ': '))) def state_path(): diff --git a/lib/store.py b/lib/store.py index 98a76b8..e5d3d29 100644 --- a/lib/store.py +++ b/lib/store.py @@ -38,8 +38,6 @@ import pprint from .exceptions import MKGeneralException -# TODO: Please note that this is still experimental. - # TODO: Clean this up one day by using the way recommended by gettext. # (See https://docs.python.org/2/library/gettext.html). For this we # need the path to the locale files here. @@ -48,86 +46,6 @@ try: except NameError: _ = lambda x: x # Fake i18n when not available - -# Simple class to offer locked file access via flock for cross process locking -class LockedOpen(object): - def __init__(self, path, *args, **kwargs): - self._path = path - self._open_args = args - self._open_kwargs = kwargs - self._file_obj = None - - - def __enter__(self): - # If not existant, create the file that the open can not fail in - # read mode and the lock is possible - if not os.path.exists(self._path): - file(self._path, "a+") - - f = file(self._path, *self._open_args, **self._open_kwargs) - - # Handle the case where the file has been renamed while waiting - while True: - fcntl.flock(f.fileno(), fcntl.LOCK_EX) - fnew = file(self._path, *self._open_args, **self._open_kwargs) - if os.path.sameopenfile(f.fileno(), fnew.fileno()): - fnew.close() - break - else: - f.close() - f = fnew - - self._file_obj = f - self._file_obj.__enter__() - return self - - - def __exit__(self, _exc_type, _exc_value, _traceback): - result = self._file_obj.__exit__(_exc_type, _exc_value, _traceback) - return result - - - def __getattr__(self, name): - return getattr(self._file_obj, name) - - -# This class offers locked file opening. Read operations are made on the -# locked file. All write operation go to a temporary file which replaces -# the locked file while closing the object. -class LockedOpenWithTempfile(LockedOpen): - def __init__(self, name, mode): - super(LockedOpenWithTempfile, self).__init__(name, "r") - self._new_file_obj = None - self._new_file_mode = mode - - - def __enter__(self): - super(LockedOpenWithTempfile, self).__enter__() - self._new_file_obj = tempfile.NamedTemporaryFile(self._new_file_mode, - dir=os.path.dirname(self._path), - prefix=os.path.basename(self._path)+"_tmp", - delete=False) - self._new_file_obj.__enter__() - return self - - - def write(self, txt): - self._new_file_obj.write(txt) - - - def writelines(self, seq): - self._new_file_obj.writelines(seq) - - - def __exit__(self, _exc_type, _exc_value, _traceback): - self._new_file_obj.__exit__(_exc_type, _exc_value, _traceback) - os.rename(self._new_file_obj.name, self._path) - return super(LockedOpenWithTempfile, self).__exit__(_exc_type, _exc_value, _traceback) - - -open = LockedOpenWithTempfile - - #. # .--.mk Configs---------------------------------------------------------. # | _ ____ __ _ | @@ -328,3 +246,85 @@ def release_all_locks(): g_aquired_locks = [] g_locked_paths = [] + + +# Experimental but not used yet. +## Simple class to offer locked file access via flock for cross process locking +#class LockedOpen(object): +# def __init__(self, path, *args, **kwargs): +# self._path = path +# self._open_args = args +# self._open_kwargs = kwargs +# self._file_obj = None +# +# +# def __enter__(self): +# # If not existant, create the file that the open can not fail in +# # read mode and the lock is possible +# if not os.path.exists(self._path): +# file(self._path, "a+") +# +# f = file(self._path, *self._open_args, **self._open_kwargs) +# +# # Handle the case where the file has been renamed while waiting +# while True: +# fcntl.flock(f.fileno(), fcntl.LOCK_EX) +# fnew = file(self._path, *self._open_args, **self._open_kwargs) +# if os.path.sameopenfile(f.fileno(), fnew.fileno()): +# fnew.close() +# break +# else: +# f.close() +# f = fnew +# +# self._file_obj = f +# self._file_obj.__enter__() +# return self +# +# +# def __exit__(self, _exc_type, _exc_value, _traceback): +# result = self._file_obj.__exit__(_exc_type, _exc_value, _traceback) +# return result +# +# +# def __getattr__(self, name): +# return getattr(self._file_obj, name) +# +# +## This class offers locked file opening. Read operations are made on the +## locked file. All write operation go to a temporary file which replaces +## the locked file while closing the object. +#class LockedOpenWithTempfile(LockedOpen): +# def __init__(self, name, mode): +# super(LockedOpenWithTempfile, self).__init__(name, "r") +# self._new_file_obj = None +# self._new_file_mode = mode +# +# +# def __enter__(self): +# super(LockedOpenWithTempfile, self).__enter__() +# self._new_file_obj = tempfile.NamedTemporaryFile(self._new_file_mode, +# dir=os.path.dirname(self._path), +# prefix=os.path.basename(self._path)+"_tmp", +# delete=False) +# self._new_file_obj.__enter__() +# return self +# +# +# def write(self, txt): +# self._new_file_obj.write(txt) +# +# +# def writelines(self, seq): +# self._new_file_obj.writelines(seq) +# +# +# def __exit__(self, _exc_type, _exc_value, _traceback): +# self._new_file_obj.__exit__(_exc_type, _exc_value, _traceback) +# os.rename(self._new_file_obj.name, self._path) +# return super(LockedOpenWithTempfile, self).__exit__(_exc_type, _exc_value, _traceback) +# +# +#open = LockedOpenWithTempfile + +

8 years

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 983fa996fb2c0883007a87ec569ccf6ab0690f32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=983fa996fb2c08… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 30 10:57:32 2016 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5ba12d7..5e583de 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3914 +3934

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016