Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

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: 897c97dd3f984957661e2a95eda50403390de7b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=897c97dd3f9849… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 9 11:38:32 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

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: 157e83e497c5ccad7db6a533845b09b82ea3226f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=157e83e497c5cc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 8 16:29:52 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Fixed position of dashboard variable declaration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: afbef279bcff199c7f291e3dd2dd867301716913 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afbef279bcff19… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 8 16:29:41 2012 +0100 Fixed position of dashboard variable declaration --- web/htdocs/dashboard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 2f389d8..38cb324 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -124,10 +124,10 @@ def render_dashboard(name): # data. title = board["title"] + global header_height if title is None: # If the title is none, hide the header line html.set_render_headfoot(False) - global header_height header_height = 0 title = ''

11 years, 10 months

Check_MK Git: check_mk: measurement unit support for if-checks ( bit/byte )

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1e87e4312b21ec33cb7aaf4a3b4e239aa07b944 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1e87e4312b21e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 8 14:33:32 2012 +0100 measurement unit support for if-checks ( bit/byte ) --- ChangeLog | 1 + checks/if.include | 30 +++++++---- modules/check_mk_base.py | 16 +++--- pnp-templates/check_mk-if.php | 91 ++++++++++++++++++++------------- web/plugins/perfometer/check_mk.py | 20 ++++--- web/plugins/views/perfometer.py | 14 +++--- web/plugins/wato/check_parameters.py | 16 +++++- 7 files changed, 116 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c1e87e4312…

11 years, 10 months

Check_MK Git: check_mk: Valuespec: fixed exception in DropDownchoice(), Display help texts of Alternative()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6bec6891bead9763d8d39ea18b8e941ca5ec65fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bec6891bead97… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 8 14:28:32 2012 +0100 Valuespec: fixed exception in DropDownchoice(), Display help texts of Alternative() --- ChangeLog | 2 ++ web/htdocs/valuespec.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad5fab6..b1ff70d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,8 @@ * FIX: Fixed editing of icon_image rules * Added support of locked hosts and folders ( created by CMDB ) * Logwatch: logwatch agents/plugins now with ok pattern support + * Valuespec: Alternative Value Spec now shows helptext of its elements + * Valuespec: DropdownChoice, fixed exception on validate_datatype Checks & Agents: * New check mssql_counters.locks: Monitors locking related information of diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 44fefcc..1e6ea41 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -874,7 +874,7 @@ class DropdownChoice(ValueSpec): if val == value: return raise MKUserError(varprefix, _("Invalid value %s, must be in %s") % - ", ".join([v for (v,t) in self.choices()])) + (value, ", ".join([v for (v,t) in self.choices()]))) # Special conveniance variant for monitoring states @@ -1606,6 +1606,7 @@ class Alternative(ValueSpec): else: checked = vs == mvs + html.help(vs.help()) title = vs.title() if not title and nr: html.write("  ")

11 years, 10 months

Check_MK Git: check_mk: Fix complain code in certain ValueSpecs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7ad89375a3c2c205c912e11069eb43e3b0c755a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7ad89375a3c2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 8 10:24:53 2012 +0100 Fix complain code in certain ValueSpecs --- web/htdocs/valuespec.py | 48 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 15 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5da0caa..44fefcc 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -624,17 +624,12 @@ class ListOf(ValueSpec): # of entries is stored in the hidden variable 'varprefix' def render_input(self, varprefix, value): - # In the 'complain' phase, where the user already saved the - # form but the validation failed, we must not display the - # original 'value' but take the value from the HTML variables. - if html.has_var("%s_count" % varprefix): - value = self.from_html_vars(varprefix) - - html.hidden_field('%s_count' % varprefix, - str(len(value)), - id = '%s_count' % varprefix, - add_var = True - ) + # Beware: the 'value' is only the default value in case the form + # has not yet been filled in. In the complain phase we must + # ignore 'value' but reuse the input from the HTML variables - + # even if they are not syntactically correct. Calling from_html_vars + # here is *not* an option since this might not work in case of + # a wrong user input. # Render reference element for cloning html.write('<table style="display:none" id="%s_prototype">' % varprefix) @@ -650,10 +645,25 @@ class ListOf(ValueSpec): self._valuespec.default_value()) html.write('</td></tr></table>') + # In the 'complain' phase, where the user already saved the + # form but the validation failed, we must not display the + # original 'value' but take the value from the HTML variables. + if html.has_var("%s_count" % varprefix): + filled_in = True + count = int(html.var("%s_count" % varprefix)) + value = [None] * count # dummy for the loop + else: + filled_in = False + html.hidden_field('%s_count' % varprefix, + str(len(value)), + id = '%s_count' % varprefix, + add_var = True + ) + # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) - for nr, v in enumerate(value): + for nr, v in enumerate(value): html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>') html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "") # reconstruct order after moving stuff @@ -1766,6 +1776,8 @@ class Dictionary(ValueSpec): self._headers = kwargs.get("headers") def render_input(self, varprefix, value): + if type(value) != dict: + value = {} # makes code simpler in complain phase if self._render == "form": self.render_input_form(varprefix, value) else: @@ -1807,7 +1819,13 @@ class Dictionary(ValueSpec): div_id, not visible and "none" or (oneline and "inline-block" or ""))) if self._columns == 1: html.help(vs.help()) - vs.render_input(vp, value.get(param, vs.default_value())) + # Remember: in complain mode we do not render 'value' (the default value), + # but re-display the values from the HTML variables. We must not use 'value' + # in that case. + if type(value) == dict: + vs.render_input(vp, value.get(param, vs.default_value())) + else: + vs.render_input(vp, None) html.write("</div>") if not oneline: html.write("</td></tr>") @@ -2010,9 +2028,9 @@ class Foldable(ValueSpec): self._title_function = kwargs.get("title_function", None) def render_input(self, varprefix, value): - if self._title_function: + try: title = self._title_function(value) - else: + except: title = self._valuespec.title() if not title: title = _("(no title)")

11 years, 10 months

Check_MK Git: check_mk: Notifications editable by user himself

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b3971990af634c254289085ed62e447c867a30d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b3971990af634… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 8 10:26:29 2012 +0100 Notifications editable by user himself --- web/htdocs/default_permissions.py | 7 +++++++ web/htdocs/wato.py | 26 ++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index 2a51b64..d2c3a4c 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -111,6 +111,13 @@ def load(): [ 'admin', 'user' ] ) + config.declare_permission('general.edit_notifications', + _('Edit personal notification settings'), + _('This allows a user to edit his personal notification settings. You also need the permission ' + '<i>Edit the user profile</i> in order to do this.'), + [ 'admin', 'user' ] + ) + config.declare_permission('general.change_password', _('Edit the user password'), _('Permits the user to change the password.'), diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 174f78b..cd017b5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11027,6 +11027,10 @@ def page_user_profile(): # load the new language load_language(config.get_language()) + if config.may('general.edit_notifications'): + value = forms.get_input(vs_notification_method, "notification_method") + users[config.user_id]["notification_method"] = value + # Change the password if requested if config.may('general.change_password'): password = html.var('password') @@ -11059,15 +11063,19 @@ def page_user_profile(): if html.has_user_errors(): html.show_user_errors() + users = load_users() + user = users.get(config.user_id) + if user == None: + html.warning(_("Sorry, your user account does not exist.")) + html.footer() + return + html.begin_form("profile", method="POST") html.write('<div class=wato>') forms.header(_("Personal Settings")) forms.section(_("Name"), simple=True) - html.write(config.user_id) - - if config.may('general.edit_profile'): - select_language(config.get_language('')) + html.write(user["alias"]) if config.may('general.change_password'): forms.section(_("Password")) @@ -11076,6 +11084,16 @@ def page_user_profile(): forms.section(_("Password confirmation")) html.password_input('password2') + if config.may('general.edit_profile'): + select_language(config.get_language('')) + # Let the user configure how he wants to be notified + if config.may('general.edit_notifications') and user.get("notifications_enabled"): + forms.section(_("Notifications")) + html.help(_("Here you can configure how you want to be notified about host and service problems and " + "other monitoring events.")) + vs_notification_method.render_input("notification_method", user.get("notification_method")) + # forms.input(vs_notification_method, "notification_method", user.get("notification_method")) + # Save button forms.end() html.button("_save", _("Save"))

11 years, 10 months

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: b945169402343696682fb24f0a1f98f11b9e9ee0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9451694023436… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 8 10:26:31 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Added missing perfdata option in pdu_gude

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55fd5c75cb889d5dd4a16fa0d103a39928003b55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fd5c75cb889d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 8 09:58:29 2012 +0100 Added missing perfdata option in pdu_gude --- checks/pdu_gude_8301 | 1 + checks/pdu_gude_8310 | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/checks/pdu_gude_8301 b/checks/pdu_gude_8301 index 057a63c..4c205bf 100644 --- a/checks/pdu_gude_8301 +++ b/checks/pdu_gude_8301 @@ -37,6 +37,7 @@ check_info['pdu_gude_8301'] = { 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.28507.26"], 'service_description' : 'Phase %s', 'group' : 'pdu_gude', + 'has_perfdata' : True, 'snmp_info' : ( '.1.3.6.1.4.1.28507.26.1.5.1.2.1', [3, 4, 5, 6,10] ), 'includes' : ["pdu_gude.include"], } diff --git a/checks/pdu_gude_8310 b/checks/pdu_gude_8310 index e64d836..0b6f392 100644 --- a/checks/pdu_gude_8310 +++ b/checks/pdu_gude_8310 @@ -36,6 +36,7 @@ check_info['pdu_gude_8310'] = { 'inventory_function' : inventory_pdu_gude, 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.28507.27"], 'service_description' : 'Phase %s', + 'has_perfdata' : True, 'group' : 'pdu_gude', 'snmp_info' : ( '.1.3.6.1.4.1.28507.27.1.5.1.2.1', [3, 4, 5, 6,10] ), 'includes' : ["pdu_gude.include"],

11 years, 10 months

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: 1f739f54a953d3b496cdbc5e08b03545dd4db1cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f739f54a953d3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 8 09:58:47 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

← Newer
1
...
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 November 2012