Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4663 FIX: check_mailboxes: Removed useless report_age which causes TypeError: float() argument must be a string or a number

by Simon Betz

Module: check_mk Branch: master Commit: 0a46086f97e6787949ab0d8b38a7ebed2b6086e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a46086f97e678… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 24 11:15:59 2017 +0200 4663 FIX: check_mailboxes: Removed useless report_age which causes TypeError: float() argument must be a string or a number Change-Id: I24d1ce2efaf61649a63899c93e0335af2a71afc8 --- .werks/4663 | 11 +++++++++++ active_checks/check_mailboxes | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4663 b/.werks/4663 new file mode 100644 index 0000000..e237786 --- /dev/null +++ b/.werks/4663 @@ -0,0 +1,11 @@ +Title: check_mailboxes: Removed useless report_age which causes TypeError: float() argument must be a string or a number +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495617082 + + diff --git a/active_checks/check_mailboxes b/active_checks/check_mailboxes index ece1a17..f460bc9 100755 --- a/active_checks/check_mailboxes +++ b/active_checks/check_mailboxes @@ -242,7 +242,6 @@ def main(options): old_mails = imap.mails(mb, before=(now - options.warn_age) + 86400) if old_mails: old_mails = old_mails[:options.retrieve_max] - report_age = None status = 0 status_icon = "" for mail in old_mails: @@ -252,7 +251,7 @@ def main(options): status = 2 status_icon = "(!!) " break - elif float(age) >= options.warn_age and float(age) > float(report_age): + elif float(age) >= options.warn_age: report_age = age status = 1 status_icon = "(!) "

7 years, 3 months

4747 FIX Fixed resetting global settings to factory defaults

by Lars Michelsen

Module: check_mk Branch: master Commit: 00a85d091da080a2e94b0d4bff7c15db44fe4276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00a85d091da080… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 24 11:07:23 2017 +0200 4747 FIX Fixed resetting global settings to factory defaults Change-Id: I3fd03c012c1136ed4d41c486a54857de7edc9c64 --- .werks/4747 | 11 +++++++++++ web/htdocs/wato.py | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4747 b/.werks/4747 new file mode 100644 index 0000000..1265c75 --- /dev/null +++ b/.werks/4747 @@ -0,0 +1,11 @@ +Title: Fixed resetting global settings to factory defaults +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495616831 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4dbc2e..6de6d4d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6952,8 +6952,7 @@ def mode_edit_configvar(phase, what = 'globalvars'): return "" elif c == None: return None - - if not html.check_transaction(): + elif not html.check_transaction(): return try:

7 years, 3 months

New Web-API features: Manage rules and folders

by Andreas Boesl

Module: check_mk Branch: master Commit: c0ed9e3098061d68594b483ceecfeb0e48b3d9c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ed9e3098061d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 15 09:28:59 2017 +0200 New Web-API features: Manage rules and folders Change-Id: Ide72c09a444f28792c3f25f7924804700c69d2d1 --- .werks/4699 | 39 ++++ web/htdocs/htmllib.py | 22 +- web/htdocs/watolib.py | 52 +++++ web/htdocs/webapi.py | 6 +- web/plugins/webapi/webapi.py | 533 +++++++++++++++++++++++++++++++++---------- 5 files changed, 523 insertions(+), 129 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c0ed9e3098…

7 years, 3 months

Fixed assert exception when no tables are shown on rule list page

by Lars Michelsen

Module: check_mk Branch: master Commit: bef145a1519aa87e87ca1e97bd82f8786c272dc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bef145a1519aa8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 24 10:37:19 2017 +0200 Fixed assert exception when no tables are shown on rule list page Change-Id: I9e318de991cfe1c448723a402ea5bf5f3d15d621 --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5de5ee3..e4dbc2e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13096,7 +13096,8 @@ class ModeEditRuleset(WatoMode): self._rule_cells(rule) - table.end() + if last_folder != None: + table.end() def _action_url(self, action, folder, rulenr):

7 years, 3 months

4739 FIX hp_proliant_da_phydrv: Implemented new possible values

by Marcel Arentz

Module: check_mk Branch: master Commit: e1eff13d387fa1f272fbf3afa12ef5200f4831da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1eff13d387fa1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed May 24 10:28:09 2017 +0200 4739 FIX hp_proliant_da_phydrv: Implemented new possible values Change-Id: I9934dccd1c06d27a0faf7e01f83679fd39109a99 --- .werks/4739 | 10 ++++++++++ checks/hp_proliant_da_phydrv | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/4739 b/.werks/4739 new file mode 100644 index 0000000..4a803c9 --- /dev/null +++ b/.werks/4739 @@ -0,0 +1,10 @@ +Title: hp_proliant_da_phydrv: Implemented new possible values +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1495614437 +Class: fix + + diff --git a/checks/hp_proliant_da_phydrv b/checks/hp_proliant_da_phydrv index 0d7db57..5a35ac3 100644 --- a/checks/hp_proliant_da_phydrv +++ b/checks/hp_proliant_da_phydrv @@ -46,6 +46,8 @@ hp_proliant_da_phydrv_status = { 5: 'erasing', 6: 'eraseDone', 7: 'eraseQueued', + 8: 'ssdWearOut', + 9: 'notAuthenticated', } hp_proliant_da_phydrv_smart_status = {

7 years, 3 months

Cleaned up odd pagetype inheritance in pagetype constructors

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d0b58289df1a7ee91fe57e7d174e55b64b27716 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d0b58289df1a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 23 16:23:57 2017 +0200 Cleaned up odd pagetype inheritance in pagetype constructors Change-Id: I1cf4389cffffede20b0f9e667a7337a4d3aca469 --- web/htdocs/pagetypes.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 5be5c53..247c3cd 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -60,11 +60,6 @@ class Base(object): # and saved to files using repr(). self._ = d - # Now give all subclasses that chance to add mandatory keys - # if they are missing - for clazz in inspect.getmro(self.__class__)[::-1]: - if "sanitize" in clazz.__dict__: - clazz.sanitize(d) def internal_representation(self): return self._ @@ -324,7 +319,7 @@ class PageRenderer(Base): # Parameters special for page renderers. These can be added to the sidebar, # so we need a topic and a checkbox for the visibility @classmethod - def parameters(self, clazz): + def parameters(self, cls): return [(_("General Properties"), [ ( 1.4, 'topic', TextUnicode( title = _('Topic') + '*', @@ -408,9 +403,9 @@ class PageRenderer(Base): # '----------------------------------------------------------------------' class Overridable(Base): - @classmethod - def sanitize(self, d): - d.setdefault("public", False) + def __init__(self, d): + super(Overridable, self).__init__(d) + self._.setdefault("public", False) @classmethod @@ -1080,9 +1075,10 @@ class Overridable(Base): # '----------------------------------------------------------------------' class Container(Base): - @classmethod - def sanitize(self, d): - d.setdefault("elements", []) + def __init__(self, d): + super(Container, self).__init__(d) + self._.setdefault("elements", []) + # Which kind of elements are allowed to be added to this container? # Defaulting to all possible elements. @@ -1090,21 +1086,26 @@ class Container(Base): def may_contain(self, element_type_name): return True + def elements(self): return self._["elements"] + def add_element(self, element): self._["elements"].append(element) + def move_element(self, nr, whither): el = self._["elements"][nr] del self._["elements"][nr] self._["elements"][whither:whither] = [ el ] + def is_empty(self): return not self.elements() + class OverridableContainer(Overridable, Container): # The popup for "Add to ...", e.g. for adding a graph to a report # or dashboard. This is needed for page types with the aspect "ElementContainer".

7 years, 3 months

Cleaned up some more cls/self confusions

by Lars Michelsen

Module: check_mk Branch: master Commit: d579178bf8632fcdf5906d548102b3660549c396 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d579178bf8632f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 24 09:00:57 2017 +0200 Cleaned up some more cls/self confusions Change-Id: Ie322c3a85810c06281f75a8bb6eeda25a4e128de --- web/plugins/sidebar/shipped.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 352cb50..3919f52 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1289,12 +1289,12 @@ div.snapin table.master_control td img.iconbutton { class BookmarkList(pagetypes.Overridable): @classmethod - def type_name(self): + def type_name(cls): return "bookmark_list" @classmethod - def phrase(self, what): + def phrase(cls, what): return { "title" : _("Bookmark list"), "title_plural" : _("Bookmark lists"), @@ -1383,8 +1383,8 @@ class BookmarkList(pagetypes.Overridable): @classmethod - def _load(self): - self.load_legacy_bookmarks() + def _load(cls): + cls.load_legacy_bookmarks() @classmethod @@ -1403,25 +1403,25 @@ class BookmarkList(pagetypes.Overridable): @classmethod - def load_legacy_bookmarks(self): + def load_legacy_bookmarks(cls): # Don't load the legacy bookmarks when there is already a my_bookmarks list - if self.has_instance((config.user.id, "my_bookmarks")): + if cls.has_instance((config.user.id, "my_bookmarks")): return # Also don't load them when the user has at least one bookmark list - for user_id, name in self.instances_dict().keys(): + for user_id, name in cls.instances_dict().keys(): if user_id == config.user.id: return - self.add_default_bookmark_list() - bookmark_list = self.instance((config.user.id, "my_bookmarks")) + cls.add_default_bookmark_list() + bookmark_list = cls.instance((config.user.id, "my_bookmarks")) for title, url in load_legacy_bookmarks(): bookmark_list.add_bookmark(title, url) @classmethod - def new_bookmark(self, title, url): + def new_bookmark(cls, title, url): return { "title" : title, "url" : url,

7 years, 3 months

Cleanup: Cleaned up naming of class references clazz/self to cls

by Lars Michelsen

Module: check_mk Branch: master Commit: b8269eea41886389245ec26d65e59783e40e650f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8269eea418863… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 23 16:46:57 2017 +0200 Cleanup: Cleaned up naming of class references clazz/self to cls Change-Id: Ia731f6be666d2ee2e1f269bdd67f3c9f48a48f68 --- web/htdocs/pagetypes.py | 335 ++++++++++++++++++++++++------------------------ 1 file changed, 170 insertions(+), 165 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b8269eea41…

7 years, 3 months

Cleaned up odd pagetype inheritance in pagetype parameters()

by Lars Michelsen

and page_handlers() Message-ID: <59254009.PZgylAlO+zpNi+Ph%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1a0c6a46291988f77b5115360f8ee2a77889466f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a0c6a46291988… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 24 09:00:06 2017 +0200 Cleaned up odd pagetype inheritance in pagetype parameters() and page_handlers() Change-Id: I82a9c559c9428f104d27c2f423ade8d45224633e --- web/htdocs/pagetypes.py | 99 ++++++++++++++++++++++-------------------- web/plugins/sidebar/shipped.py | 2 +- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index ee38f3f..c360cfa 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -32,16 +32,17 @@ # comment "don't override this". It would be much clearer to split # this into separate classes. -import os, inspect -import config, table, forms, userdb -from lib import * -from valuespec import * +import os +import json + import cmk.store as store -try: - import simplejson as json -except ImportError: - import json +import config +import table +import forms +import userdb +from lib import * +from valuespec import * # .--Base----------------------------------------------------------------. # | ____ | @@ -83,22 +84,18 @@ class Base(object): # Implement this function in a subclass in order to add parameters # to be editable by the user when editing the details of such page - # type. Note: This method does *not* use overriding, but all methods - # of this name will be called in all inherited classes and concatenated. - # Note: - # - self is the original class, e.g. PageRenderer - # - cls is the derived class, e.g. GraphCollection + # type. # Returns a list of entries. # Each entry is a pair of a topic and a list of elements. # Each element is a triple of order, key and valuespec # TODO: Add topic here @classmethod - def parameters(self, cls): + def parameters(cls): return [ ( _("General Properties"), [ ( 1.1, 'name', ID( title = _('Unique ID'), help = _("The ID will be used do identify this page in URLs. If this page has the " - "same ID as a builtin page of the type %s then it will shadow the builtin one.") % self.phrase("title"), + "same ID as a builtin page of the type %s then it will shadow the builtin one.") % cls.phrase("title"), )), ( 1.2, 'title', TextUnicode( title = _('Title') + '*', @@ -118,28 +115,19 @@ class Base(object): # in index.py. That way we do not need to hard code page handlers for all types of # PageTypes in plugins/pages. It is simply sufficient to register a PageType and # all page handlers will exist :-) - # Do *not* override this. It collects all page handlers of our - # page type by calling _page_handlers() for each class @classmethod - def page_handlers(self): - # Collect all page handlers from subclasses - handlers = {} - for cls in inspect.getmro(self)[::-1]: - if "_page_handlers" in cls.__dict__: - handlers.update(cls._page_handlers(self)) - return handlers + def page_handlers(cls): + return {} # Do *not* override this. It collects all editable parameters of our # page type by calling parameters() for each class @classmethod - def collect_parameters(self): + def collect_parameters(cls): topics = {} - for cls in inspect.getmro(self)[::-1]: - if "parameters" in cls.__dict__: - for topic, elements in cls.parameters(self): - el = topics.setdefault(topic, []) - el += elements + for topic, elements in cls.parameters(): + el = topics.setdefault(topic, []) + el += elements # Sort topics and elements in the topics for topic in topics.values(): @@ -323,8 +311,10 @@ class PageRenderer(Base): # Parameters special for page renderers. These can be added to the sidebar, # so we need a topic and a checkbox for the visibility @classmethod - def parameters(self, cls): - return [(_("General Properties"), [ + def parameters(cls): + parameters = super(PageRenderer, cls).parameters() + + parameters += [(_("General Properties"), [ ( 1.4, 'topic', TextUnicode( title = _('Topic') + '*', size = 50, @@ -336,12 +326,16 @@ class PageRenderer(Base): )), ])] + return parameters + @classmethod - def _page_handlers(self, cls): - return { + def page_handlers(cls): + handlers = super(PageRenderer, cls).page_handlers() + handlers.update({ cls.type_name(): lambda: cls.page_show(), - } + }) + return handlers # Most important: page for showing the page ;-) @@ -413,24 +407,28 @@ class Overridable(Base): @classmethod - def parameters(self, cls): + def parameters(cls): + parameters = super(Overridable, cls).parameters() + if cls.has_overriding_permission("publish"): - return [( _("General Properties"), [ + parameters += [( _("General Properties"), [ ( 2.2, 'public', Checkbox( title = _("Visibility"), label = _('Make available for all users') )), ])] - else: - return [] + + return parameters @classmethod - def _page_handlers(self, cls): - return { + def page_handlers(cls): + handlers = super(Overridable, cls).page_handlers() + handlers.update({ "%ss" % cls.type_name() : lambda: cls.page_list(), "edit_%s" % cls.type_name() : lambda: cls.page_edit(), - } + }) + return handlers def page_header(self): @@ -1148,6 +1146,16 @@ class OverridableContainer(Overridable, Container): html.close_li() + @classmethod + def page_handlers(cls): + handlers = super(OverridableContainer, cls).page_handlers() + handlers.update({ + # Ajax handler for adding elements to a container + "ajax_pagetype_add_element": lambda: cls.ajax_add_element() + }) + return handlers + + # Callback for the Javascript function pagetype_add_to_container(). The # create_info will contain a dictionary that is known to the underlying # element. Note: this is being called with the base class object Container, @@ -1229,12 +1237,9 @@ def all_page_types(): # page handler table def page_handlers(): page_handlers = {} - for page_type in page_types.values(): - page_handlers.update(page_type.page_handlers()) + for page_type_class in page_types.values(): + page_handlers.update(page_type_class.page_handlers()) - # Ajax handler for adding elements to a container - # TODO: Shouldn't we move that declaration into the class? - page_handlers["ajax_pagetype_add_element"] = lambda: OverridableContainer.ajax_add_element() return page_handlers diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index c1e3ebd..352cb50 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1307,7 +1307,7 @@ class BookmarkList(pagetypes.Overridable): @classmethod - def parameters(self, clazz): + def parameters(cls): vs_topic = TextUnicode( title = _("Topic") + "*", size = 50,

7 years, 3 months

Updated notes

by Lars Michelsen

Module: check_mk Branch: master Commit: bf9298248262087424a53b84238b128c78dd36a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf929824826208… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 24 09:02:49 2017 +0200 Updated notes Change-Id: Ifd9cac1cc160157ccf183eb7ad6525aed8075190 --- web/htdocs/pagetypes.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index c360cfa..18a71da 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -25,12 +25,18 @@ # Boston, MA 02110-1301 USA. # TODO: -# - The classes here mix two things: +# - The classes here mix two things: # a) Manager/Container classes # b) The object classes # This is done by a lot of classmethods where some have even have a # comment "don't override this". It would be much clearer to split # this into separate classes. +# - The classes are more used as namespaces (lot of classmethods). +# It would be easier to understand what's happening here when we +# used real instances. We could - for example - add a single instance +# per type to the page_types dictionary. Or add some management object +# for this + import os import json

7 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017