Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64361 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fce896c0269c0617dbb8086b199fc4149660abed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fce896c0269c06… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 19 15:54:07 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: agents/plugins/jolokia: Add info to send for tomcat state and request counters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96a001330aacaf4d73a0adf5a3de716f4430488c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96a001330aacaf… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 19 15:53:59 2012 +0200 agents/plugins/jolokia: Add info to send for tomcat state and request counters --- agents/plugins/mk_jolokia | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 8a2ac77..f7be1f5 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -180,9 +180,13 @@ specific_vars = { ], "tomcat" : [ ( "*:type=Manager,*/activeSessions,maxActiveSessions", None, [ "path", "context" ] ), - ( "*:type=Manager,*/stateName", None, [ "path", "context" ] ), -# ( "*:J2EEApplication=none,J2EEServer=none,WebModule=*,j2eeType=Servlet,name=jsp/stateName", None, [ "path", "context" ] ), -# ( "Catalina:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule=,name=*,stateName", None, [ "path", "context" ] ), + ( "*:j2eeType=Servlet,name=default,*/stateName", None, [ "WebModule" ] ), + # Check not yet working + ( "*:j2eeType=Servlet,name=default,*/requestCount", None, [ "WebModule" ]), + + # too wide location for addressing the right info + # ( "*:j2eeType=Servlet,*/requestCount", None, [ "WebModule" ] ), + ], "jboss" : [ ( "*:type=Manager,*/activeSessions,maxActiveSessions", None, [ "path", "context" ] ),

12 years

Check_MK Git: check_mk: Introducted multisite config option hide_languages to remove available

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4fbb55159c0c76f4a89f2e00f993eddf42502e44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fbb55159c0c76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 13:29:16 2012 +0200 Introducted multisite config option hide_languages to remove available languages from the multisite selection dialogs. To hide the builtin english language simply add None to the list of hidden languages. --- ChangeLog | 3 +++ web/htdocs/config.py | 6 ++++++ web/htdocs/wato.py | 2 +- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa732de..743eb0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,9 @@ * Sidebar: Sorting aggregation groups in BI snapin now * Sidebar: Sorting sites in master control snapin case insensitive * Added some missing localizations (error messages, view editor) + * Introducted multisite config option hide_languages to remove available + languages from the multisite selection dialogs. To hide the builtin + english language simply add None to the list of hidden languages. * FIX: fixed localization of general permissions * FIX: show multisite warning messages even after page reload * FIX: fix bug in Age ValueSpec: days had been ignored diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 48ad109..20a25c9 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -235,6 +235,9 @@ def get_language(default = None): default = default_language return user and user.get('language', default) or default +def hide_language(lang): + return lang in hide_languages + def roles_of_user(user): # Make sure, builtin roles are present, even if not modified # and saved with WATO. @@ -534,6 +537,9 @@ def load_default_values(into): # Default language for l10n into["default_language"] = None + + # Hide these languages from user selection + into['hide_languages'] = [] # Default timestamp format to be used in multisite into["default_ts_format"] = 'mixed' diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 949aaa6..eb5b17e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10650,7 +10650,7 @@ def register_rule(group, varname, valuespec = None, title = None, # def select_language(user_language): - languages = get_languages() + languages = [ l for l in get_languages() if not config.hide_language(l[0]) ] inactive = user_language != '' if languages:

12 years

Check_MK Git: check_mk: Added some missing localizations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ac291e3b931f2bf964b237286023e5375a0477e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ac291e3b931f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 13:03:33 2012 +0200 Added some missing localizations --- web/htdocs/views.py | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 64c84fd..efddf44 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -200,9 +200,9 @@ class Filter: return False def display(self): - raise MKInternalError("Incomplete implementation of filter %s '%s': missing display()" % \ + raise MKInternalError(_("Incomplete implementation of filter %s '%s': missing display()") % \ (self.name, self.title)) - html.write("FILTER NOT IMPLEMENTED") + html.write(_("FILTER NOT IMPLEMENTED")) def filter(self, tablename): return "" @@ -552,12 +552,12 @@ def page_edit_view(): html.help(_("The datasource of a view cannot be changed.")) forms.section(_("Topic")) - html.text_input("view_topic", "Other", size=50) + html.text_input("view_topic", _("Other"), size=50) html.help(_("The view will be sorted under this topic in the Views snapin. ")) forms.section(_("Buttontext")) html.text_input("view_linktitle", size=26) - html.write("  Icon: ") + html.write(_("  Icon: ")) html.text_input("view_icon", size=14) html.help(_("If you define a text here, then it will be used in " "buttons to the view instead of of view title.")) @@ -641,7 +641,7 @@ def page_edit_view(): html.sorted_select("%s%d" % (var_prefix, n), collist) html.write(" ") html.select("%sorder_%d" % (var_prefix, n), [("asc", _("Ascending")), ("dsc", _("Descending"))]) - + def column_selection(title, var_prefix, data): allowed = allowed_for_datasource(data, datasourcename) @@ -674,10 +674,10 @@ def page_edit_view(): forms.header(_("Layout"), isopen=False) forms.section(_("Basic Layout")) html.sorted_select("layout", [ (k, v["title"]) for k,v in multisite_layouts.items() if not v.get("hide")]) - + forms.section(_("Number of Columns")) html.number_input("num_columns", 1) - + forms.section(_('Column headers')) # 1.1.11i3: Fix deprecated column_header option: perpage -> pergroup @@ -776,7 +776,7 @@ def ajax_get_edit_column(): def load_view_into_html_vars(view): # view is well formed, not checks neccessary html.set_var("view_title", view["title"]) - html.set_var("view_topic", view.get("topic", "Other")) + html.set_var("view_topic", view.get("topic", _("Other"))) html.set_var("view_linktitle", view.get("linktitle", view["title"])) html.set_var("view_icon", view.get("icon")), html.set_var("view_description", view.get("description", "")) @@ -962,7 +962,7 @@ def create_view(): allowed_cols = collist_of_collection(allowed_for_datasource(multisite_painters, datasourcename)) joined_cols = collist_of_collection(allowed_for_joined_datasource(multisite_painters, datasourcename), allowed_cols) if is_joined_value(joined_cols, "col_%d" % n) and not join_index: - raise MKUserError('col_join_index_%d' % n, "Please specify the service to show the data for") + raise MKUserError('col_join_index_%d' % n, _("Please specify the service to show the data for")) if join_index and col_title: painternames.append((pname, viewname, tooltip, join_index, col_title)) @@ -1020,10 +1020,10 @@ def page_view(): load_views() view_name = html.var("view_name") if view_name == None: - raise MKGeneralException("Missing the variable view_name in the URL.") + raise MKGeneralException(_("Missing the variable view_name in the URL.")) view = html.available_views.get(view_name) if not view: - raise MKGeneralException("No view defined with the name '%s'." % view_name) + raise MKGeneralException(("No view defined with the name '%s'.") % view_name) show_view(view, True, True, True) @@ -1390,7 +1390,7 @@ def render_view(view, rows, datasource, group_painters, painters, and 'W' in display_options \ and (html.output_format == "html" or not config.is_multisite()): for sitename, info in html.live.deadsites.items(): - html.show_error("<b>%s - Livestatus error</b><br>%s" % (info["site"]["alias"], info["exception"])) + html.show_error("<b>%s - %s</b><br>%s" % (info["site"]["alias"], _('Livestatus error'), info["exception"])) # FIXME: Sauberer wäre noch die Status Icons hier mit aufzunehmen if 'R' in display_options: @@ -1958,7 +1958,7 @@ def allowed_for_joined_datasource(collection, datasourcename): def is_joined_value(collection, varname): selected_label = [ label for name, label in collection if name == html.var(varname, '') ] - return selected_label and selected_label[0][:8] == 'SERVICE:' + return selected_label and selected_label[0][:8] == _('SERVICE:') def collist_of_collection(collection, join_target = []): def sort_list(l): @@ -1970,7 +1970,7 @@ def collist_of_collection(collection, join_target = []): if not join_target: return sort_list([ (name, p["title"]) for name, p in collection.items() ]) else: - return sort_list([ (name, 'SERVICE: ' + p["title"]) for name, p in collection.items() if (name, p["title"]) not in join_target ]) + return sort_list([ (name, _('SERVICE:') + ' ' + p["title"]) for name, p in collection.items() if (name, p["title"]) not in join_target ]) # .----------------------------------------------------------------------. # | ____ _ | @@ -2486,7 +2486,3 @@ def declare_1to1_sorter(painter_name, func, col_num = 0, reverse = False): reverse and r2 or r1) } return painter_name - - -# load_plugins() -

12 years

Check_MK Git: check_mk: Updated bug entries #0706

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e63cd582b2f997e19bc5f8b2c3d1d7b5567a72c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e63cd582b2f997… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 12:57:04 2012 +0200 Updated bug entries #0706 --- .bugs/706 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/706 b/.bugs/706 new file mode 100644 index 0000000..0859b15 --- /dev/null +++ b/.bugs/706 @@ -0,0 +1,9 @@ +Title: Make icons selectable in view editor +Component: multisite +State: open +Date: 2012-09-19 12:56:10 +Targetversion: future +Class: nastiness + +At the moment there is only a select field without any description what to put into it. +A dropdownfield of the available icons would be much better.

12 years

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63480c0699ecc858cf41062d6d5d752fd1b0de60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63480c0699ecc8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 13:04:06 2012 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 102cb9a..aa732de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ display the title of this folder * Sidebar: Sorting aggregation groups in BI snapin now * Sidebar: Sorting sites in master control snapin case insensitive + * Added some missing localizations (error messages, view editor) * FIX: fixed localization of general permissions * FIX: show multisite warning messages even after page reload * FIX: fix bug in Age ValueSpec: days had been ignored

12 years

Check_MK Git: check_mk: FIX: Fixed localization of default permissions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c402013ebf981b3eab9b1ef0262cecdc07453297 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c402013ebf981b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 11:40:11 2012 +0200 FIX: Fixed localization of default permissions --- ChangeLog | 1 + web/htdocs/config.py | 12 ++- web/htdocs/default_permissions.py | 184 +++++++++++++++++++------------------ web/htdocs/index.py | 2 + 4 files changed, 108 insertions(+), 91 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c402013ebf…

12 years

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d12a2f5e9cb8bd873cd2d4dd8c2096a4b15e3f14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d12a2f5e9cb8bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 11:40:59 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82f4c9b9e455221323d990602cd8ff11031c0fef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82f4c9b9e45522… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 19 11:24:41 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: ValueSpec ListOfStrings: new parameter allow_empty

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9391a0c2517524ee145d7f1f050c6d0468b3e1f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9391a0c2517524… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 19 11:24:34 2012 +0200 ValueSpec ListOfStrings: new parameter allow_empty --- web/htdocs/valuespec.py | 49 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 13 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 78ef4b4..8fce87b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -373,7 +373,7 @@ class EmailAddress(TextAscii): # "10.0.0.0/8" or "192.168.56.1" class IPv4Network(TextAscii): def __init__(self, **kwargs): - kwargs.setdefault("size", 12) + kwargs.setdefault("size", 18) TextAscii.__init__(self, **kwargs) def validate_value(self, value, varprefix): @@ -392,23 +392,37 @@ class IPv4Network(TextAscii): if value.count(".") != 3: raise MKUserError(varprefix, _("The network must contain three dots")) + + octets = self.validate_ipaddress(network, varprefix) + + # Make sure that non-network bits are zero + l = (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) + (octets[3]) + for b in range(bits, 32): + if l & (2 ** (31-b)) != 0: + raise MKUserError(varprefix, _("Please make sure that only the %d non-network bits are non-zero") % bits) + + def validate_ipaddress(self, value, varprefix): try: - octets = map(int, network.split(".")) + octets = map(int, value.split(".")) if len(octets) != 4: raise MKUserError(varprefix, _("Please specify four octets (X.X.X.X/YY)")) for o in octets: if o < 0 or o > 255: raise MKUserError(varprefix, _("Invalid octet %d (must be in range 1 ... 255)") % o) + return octets except MKUserError: raise except: - raise MKUserError(varprefix, _("Please use the syntax X.X.X.X/YY")) + raise MKUserError(varprefix, _("Invalid IP address syntax")) - # Make sure that non-network bits are zero - l = (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) + (octets[3]) - for b in range(bits, 32): - if l & (2 ** (31-b)) != 0: - raise MKUserError(varprefix, _("Please make sure that only the %d non-network bits are non-zero") % bits) + +class IPv4Address(IPv4Network): + def __init__(self, **kwargs): + kwargs.setdefault("size", 16) + IPv4Network.__init__(self, **kwargs) + + def validate_value(self, value, varprefix): + self.validate_ipaddress(value, varprefix) # Valuespec for a HTTP Url (not HTTPS), that @@ -518,6 +532,7 @@ class ListOfStrings(ValueSpec): ValueSpec.__init__(self, **kwargs) self._valuespec = kwargs.get("valuespec", TextAscii()) self._vertical = kwargs.get("orientation", "vertical") == "vertical" + self._allow_empty = kwargs.get("allow_empty", True) def render_input(self, vp, value): # Form already submitted? @@ -544,10 +559,13 @@ class ListOfStrings(ValueSpec): return [] def value_to_text(self, value): - s = '<table>' - for v in value: - s += '<tr><td>%s</td></tr>' % self._valuespec.value_to_text(v) - return s + '</table>' + if self._vertical: + s = '<table>' + for v in value: + s += '<tr><td>%s</td></tr>' % self._valuespec.value_to_text(v) + return s + '</table>' + else: + return ", ".join([ self._valuespec.value_to_text(v) for v in value ]) def from_html_vars(self, vp): value = [] @@ -567,6 +585,8 @@ class ListOfStrings(ValueSpec): self._valuespec.validate_datatype(s, vp + "_%d" % nr) def validate_value(self, value, vp): + if len(value) == 0 and not self._allow_empty: + raise MKUserError(vp + "_0", _("Please specify at least one value")) for nr, s in enumerate(value): self._valuespec.validate_value(s, vp + "_%d" % nr) @@ -1640,7 +1660,10 @@ class Tuple(ValueSpec): html.write("<tr>") for no, element in enumerate(self._elements): - val = value[no] + try: + val = value[no] + except: + val = element.default_value() vp = varprefix + "_" + str(no) if self._orientation == "vertical": html.write("<tr>")

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits