Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64657 discussions

Check_MK Git: check_mk: Updated bug entries #2202

by Lars Michelsen

Module: check_mk Branch: master Commit: 82517d860f7da501ef70a1d87b1aa22f921b09da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82517d860f7da5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 14:05:25 2014 +0200 Updated bug entries #2202 --- .bugs/2202 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/.bugs/2202 b/.bugs/2202 new file mode 100644 index 0000000..ec9641e --- /dev/null +++ b/.bugs/2202 @@ -0,0 +1,60 @@ +Title: smstools smsd monitoring +Component: checks +State: open +Date: 2014-10-08 14:04:38 +Targetversion: 1.2.5i1 +Class: feature + +We should implement such a monitoring, it would be really useful for the new SMS support of the appliance. + +http://smstools3.kekekasvi.com/index.php?p=statusmonitor + +Modem-Status: /var/log/smstools/smsd_stats/modem_status + Probleme hier: + + a) Datei verschwindet während die Daten neu abgefragt werden. + Damit muss der Agent richtig umgehen. + + b) Wenn das Modem auf nicht (mehr) da ist, wird die Datei nicht + aktualisiert. Man muss also das Dateialter im Blick haben. + + Der Agent-Part müsste verschiedene "übliche" Pfade ausprobieren: + /var/log/smstools/smsd_stats/modem_status (verschiedene howtos, appliance) + /dev/shm/sms_stat (alte checks, howtos) + /var/log/sms_stat (alte checks) + + Alles OK: + 2014-08-28 15:40:42,5, CEP_CT63: CMD: AT+CREG?;+CSQ;+COPS?: +CREG: 2,1,"4361","9499" +CSQ: 26,99 +COPS: 0,0,"Telekom.de" OK + + SIM-Karte gezogen: + 2014-08-28 15:36:55,5, CEP_CT63: CMD: AT+CREG?;+CSQ;+COPS?: +CREG: 2,0 +CSQ: 22,99 +COPS: 0 OK + + +Datei: /var/log/smstools/smsd_stats/status + Problem hier: Datei wird scheinbar nicht konsequent aktualisiert. Habe noch nicht ganz + herausgefunden, wann die Datei aktualisiert wird und wann nicht. + +Alles OK: + +Status: 14-08-28 12:00:02, i--------------------------------------------------------------- +CEP_CT63: 14-08-28 11:59:20, Idle, 0, 0, 0, ssi: -63 dBm (Excellent), ber: ?? + +Abgesteckt: + +Status: 14-08-28 12:03:08, ---------------------------------------------------------------- +CEP_CT63: -, Unknown, 0, 0, 0 + +Gerade angesteckt: + +Status: 14-08-28 12:03:37, b--------------------------------------------------------------- +CEP_CT63: -, Blocked, 0, 0, 0 + +Kurz nach anstecken: + +Status: 14-08-28 12:04:00, ---------------------------------------------------------------- +CEP_CT63: -, Unknown, 0, 0, 0 + +Nach abstecken: + +Status: 14-08-28 12:11:00, ---------------------------------------------------------------- +CEP_CT63: 14-08-28 12:09:12, Unknown, 0, 0, 0, ssi: -63 dBm (Excellent), ber: ??

10 years

Check_MK Git: check_mk: Reserved 20 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: d2503226a3311bd7fbf4ddfe50beb03843b1b6d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2503226a3311b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 14:04:22 2014 +0200 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 06f43a4..c7dc989 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2202 +2222

10 years

Check_MK Git: check_mk: New internal function for getting av data as data

by Mathias Kettner

Module: check_mk Branch: master Commit: 9c930e6ccfd6daa2e3aded63b2023f029f1ba6c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c930e6ccfd6da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 13:13:50 2014 +0200 New internal function for getting av data as data --- web/htdocs/table.py | 9 ++- web/plugins/views/availability.py | 116 ++++++++++++++++++++++++++++--------- 2 files changed, 95 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9c930e6ccf…

10 years

Check_MK Git: check_mk: Fix exception when a visual has no context

by Mathias Kettner

Module: check_mk Branch: master Commit: 3f5465a989db640aabd002f1e8057c5c7d4b0cd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f5465a989db64… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 11:21:09 2014 +0200 Fix exception when a visual has no context --- web/htdocs/visuals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index d31b991..689875b 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -898,7 +898,7 @@ def add_context_to_uri_vars(visual, only_infos=None, only_count=False): # Now apply the multiple context filters for info_key in only_infos: - for filter_name, filter_vars in visual['context'].items(): + for filter_name, filter_vars in visual.get('context', {}).items(): if type(filter_vars) == dict: # this is a multi-context filter # We add the filter only if *none* if its HTML variables are present on the URL # This important because checkbox variables are not present if the box is not checked.

10 years

Check_MK Git: check_mk: Fix exception when editing dict without title

by Mathias Kettner

Module: check_mk Branch: master Commit: 01da3e77d80fc40ffef7c4318c6fa595c52fb5f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01da3e77d80fc4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 11:21:00 2014 +0200 Fix exception when editing dict without title --- web/htdocs/forms.py | 4 ++-- web/htdocs/valuespec.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 01f6ae2..972d57a 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -61,7 +61,7 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, if type(d) == list: sections.append((keyname, title or _("Properties"), d)) else: - sections.append((keyname, d.title() or title, d)) # valuespec Dictionary + sections.append((keyname, None, d)) # valuespec Dictionary, title used from dict new_value = value.copy() if html.var("filled_in") == formname and html.transaction_valid(): @@ -90,7 +90,7 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, new_value[keyname] = entries.from_html_vars(keyname) entries.validate_value(new_value[keyname], keyname) except: - messages.append("%s: %s" % (title, e.message)) + messages.append("%s: %s" % (entries.title(), e.message)) html.add_user_error(e.varname, e.message) if validate and not html.has_user_errors(): diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1555a1f..6ad2027 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2676,7 +2676,7 @@ class Dictionary(ValueSpec): for header, sections in self._headers: self.render_input_form_header(varprefix, value, header, sections) else: - self.render_input_form_header(varprefix, value, self.title(), None) + self.render_input_form_header(varprefix, value, self.title() or _("Properties"), None) def render_input_form_header(self, varprefix, value, title, sections): forms.header(title, isopen=self._form_isopen, narrow=self._form_narrow)

10 years

Check_MK Git: check_mk: views: allow specifying limit when calling show_view()

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c32dd7525a021f90bae13346727dcfa86b87ef2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c32dd7525a021… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 09:59:42 2014 +0200 views: allow specifying limit when calling show_view() --- web/htdocs/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7e276d6..ed7778d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -845,7 +845,7 @@ def prepare_display_options(): # is about. def show_view(view, show_heading = False, show_buttons = True, show_footer = True, render_function = None, only_count=False, - all_filters_active=False): + all_filters_active=False, limit=None): if html.var("mode") == "availability" and html.has_var("av_aggr_name") and html.var("timeline"): bi.page_timeline() return @@ -899,9 +899,9 @@ def show_view(view, show_heading = False, show_buttons = True, # the limit was not applied on the resulting rows but on the # lines of the log processed. This resulted in wrong stats. # For these datasources we ignore the query limits. - limit = None - if not datasource.get('ignore_limit', False): - limit = get_limit() + if limit == None: # Otherwise: specified as argument + if not datasource.get('ignore_limit', False): + limit = get_limit() # Fork to availability view. We just need the filter headers, since we do not query the normal # hosts and service table, but "statehist". This is *not* true for BI availability, though (see later)

10 years

Check_MK Git: check_mk: Dictionary: allow form rendering when calling render_input

by Mathias Kettner

Module: check_mk Branch: master Commit: d7c91cc17c35188f4c7b6be5ed94d9270321cb23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7c91cc17c3518… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 09:59:15 2014 +0200 Dictionary: allow form rendering when calling render_input --- web/htdocs/valuespec.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 95eea18..1555a1f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2588,11 +2588,15 @@ class Dictionary(ValueSpec): else: return [] - def render_input(self, varprefix, value): + # Additional variale form allows to specify the rendering + # style right now + def render_input(self, varprefix, value, form=None): value = self.migrate(value) if type(value) != dict: value = {} # makes code simpler in complain phase - if self._render == "form": + if form == True: + self.render_input_form(varprefix, value) + elif self._render == "form" and form == None: self.render_input_form(varprefix, value) else: self.render_input_normal(varprefix, value, self._render == "oneline")

10 years

Check_MK Git: check_mk: Detect syntax error while loading reporting module

by Mathias Kettner

Module: check_mk Branch: master Commit: a96e6f1ddada967922c52bae8cd9c987d48f3901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a96e6f1ddada96… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 09:58:08 2014 +0200 Detect syntax error while loading reporting module --- web/htdocs/index.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index eeeb2be..f4c85b0 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -38,7 +38,9 @@ import livestatus import defaults, config, login, userdb, hooks, visuals, default_permissions try: import reporting -except 1: +except SyntaxError: + raise +except: reporting = None from html_mod_python import *

10 years

Check_MK Git: check_mk: forms: honor optional keys when editing a dictionary

by Mathias Kettner

Module: check_mk Branch: master Commit: 29fee33cd8bd18b571fbbc3c074090650ead4c10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29fee33cd8bd18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 09:58:50 2014 +0200 forms: honor optional keys when editing a dictionary --- web/htdocs/forms.py | 69 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 1c0ae42..01f6ae2 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -61,7 +61,7 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, if type(d) == list: sections.append((keyname, title or _("Properties"), d)) else: - sections.append((keyname, d.title() or title, d._elements)) # valuespec Dictionary + sections.append((keyname, d.title() or title, d)) # valuespec Dictionary new_value = value.copy() if html.var("filled_in") == formname and html.transaction_valid(): @@ -70,17 +70,26 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, messages = [] for keyname, section_title, entries in sections: - new_value[keyname] = {} - for name, vs in entries: - if len(sections) == 1: - vp = varprefix - else: - vp = keyname + "_" + varprefix + if type(entries) == list: + new_value[keyname] = {} + for name, vs in entries: + if len(sections) == 1: + vp = varprefix + else: + vp = keyname + "_" + varprefix + try: + v = vs.from_html_vars(vp + name) + vs.validate_value(v, keyname + "_" + varprefix + name) + new_value[keyname][name] = v + except MKUserError, e: + messages.append("%s: %s" % (title, e.message)) + html.add_user_error(e.varname, e.message) + + else: try: - v = vs.from_html_vars(vp + name) - vs.validate_value(v, keyname + "_" + varprefix + name) - new_value[keyname][name] = v - except MKUserError, e: + new_value[keyname] = entries.from_html_vars(keyname) + entries.validate_value(new_value[keyname], keyname) + except: messages.append("%s: %s" % (title, e.message)) html.add_user_error(e.varname, e.message) @@ -103,23 +112,27 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, html.begin_form(formname, method=method) for keyname, title, entries in sections: subvalue = value.get(keyname, {}) - header(title) - first = True - for name, vs in entries: - section(vs.title()) - html.help(vs.help()) - if name in subvalue: - v = subvalue[name] - else: - v = vs.default_value() - if len(sections) == 1: - vp = varprefix - else: - vp = keyname + "_" + varprefix - vs.render_input(vp + name, v) - if (not focus and first) or (name == focus): - vs.set_focus(vp + name) - first = False + if type(entries) == list: + header(title) + first = True + for name, vs in entries: + section(vs.title()) + html.help(vs.help()) + if name in subvalue: + v = subvalue[name] + else: + v = vs.default_value() + if len(sections) == 1: + vp = varprefix + else: + vp = keyname + "_" + varprefix + vs.render_input(vp + name, v) + if (not focus and first) or (name == focus): + vs.set_focus(vp + name) + first = False + else: + entries.render_input(keyname, subvalue, form=True) + end() if buttons:

10 years

Check_MK Git: check_mk: visuals: Internal cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 65b3a8098bb9cd40a18696b8ae9b46df32038514 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65b3a8098bb9cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 8 09:46:49 2014 +0200 visuals: Internal cleanup --- web/htdocs/dashboard.py | 4 ++-- web/htdocs/views.py | 2 +- web/htdocs/visuals.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 82e6739..97d7d9a 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -609,7 +609,7 @@ def page_edit_dashboards(): # '----------------------------------------------------------------------' def page_create_dashboard(): - visuals.page_create_visual('dashboards', _("Dashboard"), visuals.infos.keys()) + visuals.page_create_visual('dashboards', visuals.infos.keys()) #. # .--Dashb. Config-------------------------------------------------------. @@ -694,7 +694,7 @@ def page_create_view_dashlet_infos(): raise MKGeneralException(_('The given datasource is not supported')) # Create a new view by choosing the datasource and the single object types - visuals.page_create_visual('views', _("View"), views.multisite_datasources[ds_name]['infos'], + visuals.page_create_visual('views', views.multisite_datasources[ds_name]['infos'], next_url = html.makeuri_contextless([ ('name', html.var('name')), ('type', 'view'), diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7e276d6..e4baae0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -278,7 +278,7 @@ def page_create_view_infos(): if ds_name not in multisite_datasources: raise MKGeneralException(_('The given datasource is not supported')) - visuals.page_create_visual('views', _("View"), multisite_datasources[ds_name]['infos'], + visuals.page_create_visual('views', multisite_datasources[ds_name]['infos'], next_url = 'edit_view.py?mode=create&datasource=%s&single_infos=%%s' % ds_name) #. diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 2a2636c..d31b991 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -361,8 +361,8 @@ def page_list(what, title, visuals, custom_columns = [], # | Realizes the steps before getting to the editor (context type) | # '----------------------------------------------------------------------' -# FIXME: title is not needed, that's contained in visual_types -def page_create_visual(what, title, info_keys, next_url = None): +def page_create_visual(what, info_keys, next_url = None): + title = visual_types[what]['title'] what_s = what[:-1] # FIXME: Sort by (assumed) common usage

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits