Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: a9dbaa10bc5a86de2f9becebc9f764267e758c07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9dbaa10bc5a86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 7 12:50:19 2017 +0100 Fixed wrong access to var Change-Id: Ie98ed5ddbf402a875d6e6f8c0d51aa0992f3bc01 --- web/plugins/wato/datasource_programs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 88cb637..b92aacc 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -638,7 +638,7 @@ register_rule(group, ], optional_keys = None, ), - factory_default = Rulespec.FACTORY_DEFAULT_UNUSED, + factory_default = watolib.Rulespec.FACTORY_DEFAULT_UNUSED, match = "first", )

6 years, 10 months

Report scheduler: Scheduled reports can now be stored locally

by Lars Michelsen

Module: check_mk Branch: master Commit: add3658bb2c383ba01928fcf54920588324ee845 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=add3658bb2c383… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 15:31:45 2017 +0100 Report scheduler: Scheduled reports can now be stored locally Change-Id: I0ed09cb691622ec6ecdb8a290859d9ddb84e9961 --- web/htdocs/visuals.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 3ca54e2..3efbccc 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -727,18 +727,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, )), ] if config.user.may("general.publish_" + what): - visibility_elements.append(('public', CascadingDropdown( - choices = [ - (True, _("Publish to all users")), - ("contact_groups", _("Publish to members of contact groups"), userdb.GroupChoice( - "contact", - title = _("Publish to members of contact groups"), - rows = 5, - size = 40, - )), - ], - title = _('Make this %s available for other users') % visual_type["title"] - ))) + visibility_elements.append(('public', PublishTo(type_title=visual_type["title"]))) vs_general = Dictionary( title = _("General Properties"), @@ -885,6 +874,24 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, html.end_form() html.footer() + + +class PublishTo(CascadingDropdown): + def __init__(self, type_title=None, **kwargs): + super(PublishTo, self).__init__( + choices = [ + (True, _("Publish to all users")), + ("contact_groups", _("Publish to members of contact groups"), userdb.GroupChoice( + "contact", + title = _("Publish to members of contact groups"), + rows = 5, + size = 40, + )), + ], + title = _('Make this %s available for other users') % type_title, + **kwargs + ) + #. # .--Filters-------------------------------------------------------------. # | _____ _ _ _ |

6 years, 10 months

Minor cleanups in permission checks and exception handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 7222c886f7552d4ca831d02852ee3c1e7f7ba3ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7222c886f7552d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 7 10:06:02 2017 +0100 Minor cleanups in permission checks and exception handling Change-Id: If3e4dad7ca3c021e9ea377181d8c211ec6d2be75 --- web/htdocs/pagetypes.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 9749e37..5602458 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -471,6 +471,11 @@ class Overridable(Base): def is_mine(self): return self.owner() == config.user.id + + def is_mine_and_may_have_own(self): + return self.is_mine() and config.user.may("general.edit_" + self.type_name()) + + def owner(self): return self._["owner"] @@ -633,7 +638,7 @@ class Overridable(Base): # My own pages for page in cls.instances(): - if page.is_mine() and config.user.may("general.edit_" + cls.type_name()): + if page.is_mine_and_may_have_own(): pages[page.name()] = page return sorted(pages.values(), cmp = lambda a, b: cmp(a.title(), b.title())) @@ -657,7 +662,7 @@ class Overridable(Base): if page.name() != name: continue - if page.is_mine() and config.user.may("general.edit_" + cls.type_name()): + if page.is_mine_and_may_have_own(): mine = page elif page.is_public() and page.may_see(): @@ -833,10 +838,15 @@ class Overridable(Base): delname = html.var("_delete") if delname and html.transaction_valid(): owner = html.var('_owner', config.user.id) - if owner != config.user.id: - cls.need_overriding_permission("delete_foreign") - instance = cls.instance((owner, delname)) + try: + instance = cls.instance((owner, delname)) + except KeyError: + raise MKUserError("_delete", _("The %s you are trying to delete " + "does not exist.") % cls.phrase("title")) + + if not instance.may_delete(): + raise MKUserError("_delete", _("You are not permitted to perform this action.")) try: if owner != config.user.id:

6 years, 10 months

5567 Scheduled reports can now be stored in the site

by Lars Michelsen

Module: check_mk Branch: master Commit: bac3690c9543cf2cecb82e8ebe44ff0d13782df9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bac3690c9543cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 7 12:06:52 2017 +0100 5567 Scheduled reports can now be stored in the site Instead of sending an email with the created report in the scheduled interval it is now possible to store the just created reports locally in the site. This feature is configured in the configuration of the schedule. You can now choose the action Store locally instead of Send via Email and configure different action specific things after this. Each user allowed to use the report scheduler can open the page "Scheduler > Stored reports" to view and open all stored reports available to the user. All reports are stored below <tt>~/var/check_mk/reports/archive/</tt>. In the first directory below the base directory each user that creates such stored reports gets a directory. All stored reports of this user are saved below this directory. In case the user configures a schedule to publish the resulting PDFs to other users, the reports are stored in the <tt>public</tt> sub directory. A schedule can be configured to store the report either directly in these directories or in a hierarchy of subdirectories below these parent directories. You can configure stored reports to be deleted after a given time. Change-Id: I7e8e7aadaaef41f4019fb441186d0285395a678c --- .werks/5567 | 33 +++++++++++++++++++++++++++++++++ web/htdocs/pagetypes.py | 10 ++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/.werks/5567 b/.werks/5567 new file mode 100644 index 0000000..34b6d24 --- /dev/null +++ b/.werks/5567 @@ -0,0 +1,33 @@ +Title: Scheduled reports can now be stored in the site +Level: 2 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1512640854 +Class: feature + +Instead of sending an email with the created report in the scheduled +interval it is now possible to store the just created reports locally +in the site. + +This feature is configured in the configuration of the schedule. You +can now choose the action Store locally instead of +Send via Email and configure different action specific things +after this. + +Each user allowed to use the report scheduler can open the page +"Scheduler > Stored reports" to view and open all stored reports +available to the user. + +All reports are stored below <tt>~/var/check_mk/reports/archive/</tt>. + +In the first directory below the base directory each user that creates +such stored reports gets a directory. All stored reports of this user +are saved below this directory. In case the user configures a schedule +to publish the resulting PDFs to other users, the reports are stored +in the <tt>public</tt> sub directory. A schedule can be configured +to store the report either directly in these directories or in a +hierarchy of subdirectories below these parent directories. + +You can configure stored reports to be deleted after a given time. diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 5602458..3153a19 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -476,6 +476,11 @@ class Overridable(Base): return self.is_mine() and config.user.may("general.edit_" + self.type_name()) + @classmethod + def _delete_permission(cls): + return "general.edit_" + cls.type_name() + + def owner(self): return self._["owner"] @@ -514,7 +519,7 @@ class Overridable(Base): def may_delete(self): if self.is_builtin(): return False - elif self.is_mine(): + elif self.is_mine() and config.user.may(self._delete_permission()): return True else: return config.user.may('general.delete_foreign_%s' % self.type_name()) @@ -523,7 +528,7 @@ class Overridable(Base): def may_edit(self): if self.is_builtin(): return False - elif self.is_mine(): + elif self.is_mine() and config.user.may("general.edit_%s" % self.type_name()): return True else: return config.user.may('general.edit_foreign_%s' % self.type_name()) @@ -582,6 +587,7 @@ class Overridable(Base): _("Make %s visible and usable for other users.") % cls.phrase("title_plural"), [ "admin", "user" ]) + # TODO: Bug: This permission does not seem to be used config.declare_permission("general.see_user_" + cls.type_name(), _("See user %s") % cls.phrase("title_plural"), _("Is needed for seeing %s that other users have created.") % cls.phrase("title_plural"),

6 years, 10 months

by Lars Michelsen

Module: check_mk Branch: master Commit: bb3fd3249d38c53b6c743aaf6bdfa6d3cca20d24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb3fd3249d38c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 7 10:41:13 2017 +0100 Register GUI jobs through register function Change-Id: I4d1b910614a8d7bf1bce5046de792d1e673c5acb --- web/htdocs/cron.py | 4 ++++ web/plugins/cron/network_scan.py | 2 +- web/plugins/cron/user_sync.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/cron.py b/web/htdocs/cron.py index 352d9b4..9fc5f89 100644 --- a/web/htdocs/cron.py +++ b/web/htdocs/cron.py @@ -48,6 +48,10 @@ def load_plugins(force): loaded_with_language = current_language +def register_job(cron_job): + multisite_cronjobs.append(cron_job) + + # Page called by some external trigger (usually cron job in OMD site) # Note: this URL is being called *without* any login. We have no # user. Everyone can call this! We must not read any URL variables. diff --git a/web/plugins/cron/network_scan.py b/web/plugins/cron/network_scan.py index b6432aa..68d72ec 100644 --- a/web/plugins/cron/network_scan.py +++ b/web/plugins/cron/network_scan.py @@ -26,4 +26,4 @@ import wato -multisite_cronjobs.append(wato.execute_network_scan_job) +register_job(wato.execute_network_scan_job) diff --git a/web/plugins/cron/user_sync.py b/web/plugins/cron/user_sync.py index a7bc2eb..b706a2e 100644 --- a/web/plugins/cron/user_sync.py +++ b/web/plugins/cron/user_sync.py @@ -26,4 +26,4 @@ import userdb -multisite_cronjobs.append(userdb.execute_userdb_job) +register_job(userdb.execute_userdb_job)

6 years, 10 months

Transform valuespec: Allow enclosing VS specific render_input() parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d7d94629a9fff6f02164c921c439f5bdc7653d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d7d94629a9fff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 14:47:47 2017 +0100 Transform valuespec: Allow enclosing VS specific render_input() parameters Change-Id: I800bde62499b19429b1187bb4cb0aac7588ab8b5 --- web/htdocs/valuespec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3cd2295..047d1c5 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3798,9 +3798,9 @@ class Transform(ValueSpec): else: return self._valuespec.help() - def render_input(self, varprefix, value): + def render_input(self, varprefix, value, **kwargs): self.classtype_info() - self._valuespec.render_input(varprefix, self.forth(value)) + self._valuespec.render_input(varprefix, self.forth(value), **kwargs) def set_focus(self, *args): self._valuespec.set_focus(*args)

6 years, 10 months

Added logging for report scheduler

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b297dd81e1b7ced3090db1339b236dff3dd0f6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b297dd81e1b7c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 15:56:07 2017 +0100 Added logging for report scheduler Change-Id: If1e8ec8efb4533dcda01a71ef6abea904654d9af --- web/htdocs/cron.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/htdocs/cron.py b/web/htdocs/cron.py index 54e2aea..352d9b4 100644 --- a/web/htdocs/cron.py +++ b/web/htdocs/cron.py @@ -64,12 +64,18 @@ def page_run_cron(): file(lock_file, "w") # touches the file aquire_lock(lock_file) + logger.debug("Starting cron jobs") + for cron_job in multisite_cronjobs: try: + job_name = cron_job.__name__ + + logger.debug("Starting [%s]" % job_name) cron_job() + logger.debug("Finished [%s]" % job_name) except Exception: html.write("An exception occured. Take a look at the web.log.\n") - logger.error("Exception in cron_job [%s]:\n%s" % - (cron_job.__name__, traceback.format_exc())) + logger.exception("Exception in cron job [%s]" % job_name) + logger.debug("Finished all cron jobs") html.write("OK\n")

6 years, 10 months

Minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: f3f9d0fe21b1f061a0a266389bbd13295ea8cabf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3f9d0fe21b1f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 6 09:17:06 2017 +0100 Minor cleanups Change-Id: Ie3740eebe9a9b61335c9ca58c86a99fa268ca39a --- web/htdocs/pagetypes.py | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 1510f52..9749e37 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -736,7 +736,11 @@ class Overridable(Base): (cls.type_name(), path, e)) cls._load() + cls._declare_instance_permissions() + + @classmethod + def _declare_instance_permissions(cls): # Declare permissions - one for each of the pages, if it is public config.declare_permission_section(cls.type_name(), cls.phrase("title_plural"), do_sort = True) @@ -862,20 +866,7 @@ class Overridable(Base): html.footer() return - my_instances = [] - foreign_instances = [] - builtin_instances = [] - for instance in cls.instances_sorted(): - if instance.may_see(): - if instance.is_builtin(): - builtin_instances.append(instance) - elif instance.is_mine(): - my_instances.append(instance) - elif instance.is_public() \ - or instance.may_delete() or instance.may_edit(): - foreign_instances.append(instance) - - + my_instances, foreign_instances, builtin_instances = cls.get_instances() for what, title, instances in [ ("my", _('Customized'), my_instances), ("foreign", _('Owned by other users'), foreign_instances), @@ -959,6 +950,23 @@ class Overridable(Base): @classmethod + def get_instances(cls): + my_instances, foreign_instances, builtin_instances = [], [], [] + + for instance in cls.instances_sorted(): + if instance.may_see(): + if instance.is_builtin(): + builtin_instances.append(instance) + elif instance.is_mine(): + my_instances.append(instance) + elif instance.is_public() \ + or instance.may_delete() or instance.may_edit(): + foreign_instances.append(instance) + + return my_instances, foreign_instances, builtin_instances + + + @classmethod def _bulk_delete_after_confirm(cls, what): to_delete = [] for varname in html.all_varnames_with_prefix("_c_%s+" % what):

6 years, 10 months

New icon for config analyser

by Mathias Kettner

Module: check_mk Branch: master Commit: 00d827da31c82b9b554f34bcf9c53fc5d462a743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00d827da31c82b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 7 11:38:31 2017 +0100 New icon for config analyser --- web/htdocs/images/icon_analyze_config.png | Bin 1732 -> 4045 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_analyze_config.png b/web/htdocs/images/icon_analyze_config.png index a9794b8..ba4744f 100644 Binary files a/web/htdocs/images/icon_analyze_config.png and b/web/htdocs/images/icon_analyze_config.png differ

6 years, 10 months

5480 bdt_tape_info, bdt_tape_status, bdtms_tape_info, bdtms_tape_module, bdtms_tape_status: new checks to monitor tape libraries

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 28df139650e11491214f8b65952573e1f3af4aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28df139650e114… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 27 15:36:48 2017 +0100 5480 bdt_tape_info, bdt_tape_status, bdtms_tape_info, bdtms_tape_module, bdtms_tape_status: new checks to monitor tape libraries This werk adds new checks for tape libraries that can be monitored based on the BDTMIB and BDT-MS-MIB mibs. They are used for example in Fujitsu Eternus LT40 and Fujitsu Eternus LT260 devices, respectively. Change-Id: I542c678f4bdeb5b73194973088dc19f3c304dd03 --- .werks/5480 | 12 +++++++++ checkman/bdt_tape_info | 15 +++++++++++ checkman/bdt_tape_status | 16 ++++++++++++ checkman/bdtms_tape_info | 15 +++++++++++ checkman/bdtms_tape_module | 16 ++++++++++++ checkman/bdtms_tape_status | 15 +++++++++++ checks/bdt_tape_info | 51 ++++++++++++++++++++++++++++++++++++ checks/bdt_tape_status | 65 ++++++++++++++++++++++++++++++++++++++++++++++ checks/bdtms_tape_info | 51 ++++++++++++++++++++++++++++++++++++ checks/bdtms_tape_module | 61 +++++++++++++++++++++++++++++++++++++++++++ checks/bdtms_tape_status | 63 ++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 380 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=28df139650…

6 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017