Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: fix host group filter from firing of not variable is set

by Mathias Kettner

Module: check_mk Branch: master Commit: 714649f43d1a918927f9f9077701eba37ab5672f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=714649f43d1a91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 8 16:05:42 2014 +0200 fix host group filter from firing of not variable is set --- web/plugins/visuals/filters.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 243b033..e63c225 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -209,6 +209,9 @@ class FilterGroupCombo(Filter): return html.var(htmlvar) def filter(self, infoname): + if not html.has_var(self.htmlvars[0]): + return "" # Skip if filter is not being set at all + current_value = self.current_value() if not current_value: if not self.enforce:

9 years, 9 months

Check_MK Git: check_mk: Fixed spelling

by Konstantin Büttner

Module: check_mk Branch: master Commit: 69bae97e1b4932c998a8fac2acd8b802a9ca32e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69bae97e1b4932… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 8 15:19:25 2014 +0200 Fixed spelling --- web/plugins/views/commands.py | 2 +- web/plugins/wato/active_checks.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index a2b1ef2..dd8a41f 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -45,7 +45,7 @@ def command_reschedule(cmdtag, spec, row, row_nr, total_rows): spread = saveint(html.var("_resched_spread")) text = _("reschedule an immediate check") if spread: - text += _(" spreaded over %d minutes ") % spread + text += _(" spread over %d minutes ") % spread text += "" + _("of") diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 26cdae9..4aba07f 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -487,13 +487,13 @@ register_rule(group, ("job", CascadingDropdown( title = _("Mode of the Check"), - help = _("Choose if you just want to query the version number," - " or if you want to check the response to a address querie"), + help = _("Choose, whether you just want to query the version number," + " or if you want to check the response to an adress query."), choices = [ ("version", _("Check for Version")), - ("address", _("Check for a Address"), + ("address", _("Check for an Adress"), Dictionary( - title = _("Address Check mode"), + title = _("Adress Check mode"), optional_keys = False, elements = [ ( "street",

9 years, 9 months

Check_MK Git: check_mk: Some spelling fixed

by Konstantin Büttner

Module: check_mk Branch: master Commit: f92baded8c01384003b7feb5a948c2b9b9e0657d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f92baded8c0138… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 8 14:17:26 2014 +0200 Some spelling fixed --- mkeventd/web/plugins/wato/mkeventd.py | 8 ++++---- web/plugins/views/datasources.py | 2 +- web/plugins/wato/check_mk_configuration.py | 6 +++--- web/plugins/wato/check_parameters.py | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 148b49f..6ea1e41 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -292,10 +292,10 @@ vs_mkeventd_rule = Dictionary( ListOf( GroupSelection("contact"), title = _("Fallback Contact Groups"), - help = _("When displaying events in the Check_MK GUI you can make a user only see events " - "for hosts he is a contact for. When you expect this rule to reveice events from " - "hosts that are not known to the monitoring you can specify contact groups " - "for the visibility here. Note: if you activate this option and do not specify " + help = _("When displaying events in the Check_MK GUI, you can make a user see only events " + "for hosts he is a contact for. When you expect this rule to receive events from " + "hosts that are not known to the monitoring, you can specify contact groups " + "for visibility here. Note: If you activate this option and do not specify " "any group, then users with restricted permissions can never see these events."), movable = False, ) diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 70563de..88b5a4a 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -89,7 +89,7 @@ multisite_datasources["hostsbygroup"] = { "keys" : [ "host_name", "host_downtimes" ], "join" : ( "services", "host_name" ), "idkeys" : [ "site", "hostgroup_name", "host_name" ], - "description" : _("Using this datasources host rows might appear multiple times depending " + "description" : _("Using this, datasources host rows might appear multiple times depending " "on their membership in hostgroups."), } diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8079e5c..9d86a84 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -534,7 +534,7 @@ register_configvar(group, Checkbox(title = _("Allow upload of insecure WATO snapshots"), label = _("upload insecure snapshots"), help = _("When enabled, insecure snapshots are allowed. Please keep in mind that the upload " - "of unverified snapshots represent a security risk, since the content of a snapshot is executed " + "of unverified snapshots represents a security risk, since the content of a snapshot is executed " "during runtime. Any manipulations in the content - either willingly or unwillingly (XSS attack) " "- pose a serious security risk."), default_value = False), @@ -553,7 +553,7 @@ register_configvar(group, "wato_hide_varnames", Checkbox(title = _("Hide names of configuration variables"), label = _("hide variable names"), - help = _("When enabled, internal configuration variable names of Check_MK are hidded " + help = _("When enabled, internal configuration variable names of Check_MK are hidden " "from the user (for example in the rule editor)"), default_value = True), domain = "multisite") @@ -563,7 +563,7 @@ register_configvar(group, "wato_hide_help_in_lists", Checkbox(title = _("Hide help text of rules in list views"), label = _("hide help text"), - help = _("When disabled, WATO shows the help texts of the rules also in the list views."), + help = _("When disabled, WATO shows the help texts of rules also in the list views."), default_value = True), domain = "multisite") diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 235e893..14a849b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1824,7 +1824,7 @@ register_check_parameters( ( 'levels', Tuple( title = _("Maximum Number of E-Mails in Queue"), - help = _("This rule applies to the number of E-Mails in the various Exchange Message Queues"), + help = _("This rule applies to the number of e-mails in the various Exchange Message Queues"), elements = [ Integer(title = _("Warning if above"), unit = _("E-Mails")), Integer(title = _("Critical if above"), unit = _("E-Mails")) @@ -1834,7 +1834,7 @@ register_check_parameters( Integer( title = _("Offset"), help = _("Use this only if you want to overwrite the postion of the information in the agent " - "Output. Also refer to the rule Microsoft Exchange Queues Inventory ") + "output. Also refer to the rule Microsoft Exchange Queues Inventory ") ) ), ], @@ -6508,7 +6508,7 @@ register_check_parameters( title = _("Collection time levels"), elements = [ Tuple( - title = _("Time of garbage gollection in ms per minute"), + title = _("Time of garbage collection in ms per minute"), elements = [ Integer(title = _("Warning at"), unit = _("ms"),

9 years, 9 months

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: ??

9 years, 9 months

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

9 years, 9 months

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…

9 years, 9 months

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.

9 years, 9 months

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)

9 years, 9 months

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)

9 years, 9 months

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")

9 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014