Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: Make size of text input for command line wider

by Mathias Kettner

Module: check_mk Branch: master Commit: ecd33d690808900f87df90a6720b3665c49c7659 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecd33d69080890… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 1 13:50:22 2013 +0200 Make size of text input for command line wider --- web/htdocs/check_mk.css | 1 + web/htdocs/htmllib.py | 17 +++++++++++------ web/htdocs/valuespec.py | 13 +++++-------- web/plugins/wato/active_checks.py | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 0f378ed..a71ace0 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -361,6 +361,7 @@ div.warning a { '-------------------------------------------------------------------------*/ table.dictionary { + width: 100%; } table.dictionary b.header { diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8f7e6d9..f85a6b0 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -390,15 +390,19 @@ class html: def add_form_var(self, varname): self.form_vars.append(varname) - def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, submit = None, **args): + def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, + submit = None, attrs = {}, **args): if default_value == None: default_value = "" addprops = "" add_style = "" if "size" in args and args["size"]: - addprops += " size=%d" % (args["size"] + 1) - if "width:" not in args.get("style", "") and not self.mobile: - add_style = "width: %d.8ex; " % args["size"] + if args["size"] == "max": + add_style = "width: 100%; " + else: + addprops += " size=%d" % (args["size"] + 1) + if "width:" not in args.get("style", "") and not self.mobile: + add_style = "width: %d.8ex; " % args["size"] if "type" in args: mytype = args["type"] @@ -433,8 +437,9 @@ class html: if id: addprops += " id='%s'" % id - html += "<input type=%s class=%s value=\"%s\" name=\"%s\"%s>" % \ - (mytype, cssclass, self.attrencode(value), varname, addprops) + attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) + html += "<input type=%s class=%s value=\"%s\" name=\"%s\"%s%s>" % \ + (mytype, cssclass, self.attrencode(value), varname, addprops, attributes) if error: html += "</x>" self.set_focus(varname) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 082419f..15b93aa 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -308,7 +308,7 @@ class TextAscii(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._label = kwargs.get("label") - self._size = kwargs.get("size", 25) + self._size = kwargs.get("size", 25) # also possible: "max" self._strip = kwargs.get("strip", True) self._allow_empty = kwargs.get("allow_empty", True) self._read_only = kwargs.get("read_only") @@ -331,8 +331,8 @@ class TextAscii(ValueSpec): if self._label: html.write(self._label) html.write(" ") - html.text_input(varprefix, str(value), size = self._size, - read_only = self._read_only) + + html.text_input(varprefix, str(value), size = self._size, read_only = self._read_only) self.render_buttons() def render_buttons(self): @@ -386,10 +386,6 @@ class TextUnicode(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) - def render_input(self, varprefix, value): - html.text_input(varprefix, value, size = self._size) - self.render_buttons() - def from_html_vars(self, varprefix): return html.var_utf8(varprefix, "").strip() @@ -563,7 +559,8 @@ class TextAreaUnicode(TextUnicode): if value == None: value = "" # should never happen, but avoids exception for invalid input if self._rows == "auto": - attrs = { "onkeyup" : 'valuespec_textarea_resize(this);' } + func = 'valuespec_textarea_resize(this);' + attrs = { "onkeyup" : func, "onmousedown" : func, "onmouseup" : func, "onmouseout" : func } if html.has_var(varprefix): rows = len(html.var(varprefix).splitlines()) else: diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index d21fe40..bc129e8 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -846,7 +846,7 @@ register_rule(group, "directory (<tt>~/lib/nagios/plugins</tt>) within your site directory.<br><br>" "<b>Passive checks</b>: Do no specify a command line if you want " "to define passive checks."), - size = 80, + size = "max", ) ), ( "command_name",

11 years, 2 months

Check_MK Git: check_mk: ldap: Added filter group option

by Lars Michelsen

Module: check_mk Branch: master Commit: c6047bf7c46fff8571eee4c31e34c0a47c487863 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6047bf7c46fff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 1 13:14:25 2013 +0200 ldap: Added filter group option --- ChangeLog | 5 +++- web/plugins/userdb/ldap.py | 35 +++++++++++++++++++++++++++- web/plugins/wato/check_mk_configuration.py | 15 +++++++++++- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32fd745..a179514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,13 +86,16 @@ searches (Can be enabled in connection settings) * LDAP: It is now possible to provide multiple failover servers, which are tried when the primary ldap server fails + * LDAP: Supporting posixGroup with memberUid as member attribute + * LDAP: Added filter_group option to user configuration to make the + synchonized users filterable by group memberships in directories without + memberof attributes * Added option to enable browser scrollbar to the multisite sidebar (only via "sidebar_show_scrollbar = True" in multisite.mk * Added option to disable automatic userdb synchronizations in multisite * Implemented search forms for most data tables * New icons in view footers: export as CSV, export as JSON * Availability: new columns for shortest, longest, average and count - * LDAP: Supporting posixGroup with memberUid as member attribute * Editing localized strings (like the title) is now optional when cloning views or editing cloned views. If not edited, the views inherit the localized strings from their ancestors diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 37b707a..500ef2b 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -365,15 +365,48 @@ def ldap_get_user(username, no_escape = False): else: return (dn.replace('\\', '\\\\'), user_id) -def ldap_get_users(add_filter = None): +def ldap_get_users(add_filter = ''): columns = [ ldap_user_id_attr(), # needed in all cases as uniq id ] + ldap_needed_attributes() filt = ldap_filter('users') + + # Create filter by the optional filter_group + filter_group_dn = config.ldap_userspec.get('filter_group', None) + member_filter = '' + if filter_group_dn: + member_attr = ldap_member_attr().lower() + # posixGroup objects use the memberUid attribute to specify the group memberships. + # This is the username instead of the users DN. So the username needs to be used + # for filtering here. + user_cmp_attr = member_attr == 'memberuid' and ldap_user_id_attr() or 'distinguishedname' + + # Apply configured group ldap filter + try: + group = ldap_search(ldap_replace_macros(filter_group_dn), + columns = [member_attr], + scope = 'base') + except MKLDAPException: + group = None + + if not group: + raise MKLDAPException(_('The configured ldap user filter group could not be found. ' + 'Please check <a href="%s">your configuration</a>.') % + 'wato.py?mode=edit_configvar&varname=ldap_userspec') + + members = group[0][1].values()[0] + + member_filter_items = [] + for member in members: + member_filter_items.append('(%s=%s)' % (user_cmp_attr, member)) + add_filter += '(|%s)' % ''.join(member_filter_items) + if add_filter: filt = '(&%s%s)' % (filt, add_filter) + html.write(repr(filt)) + result = {} for dn, ldap_user in ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), filt, columns = columns): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index af3232b..2f76529 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -596,6 +596,19 @@ register_configvar(group, size = 80, default_value = lambda: userdb.ldap_filter('users', False), )), + ("filter_group", LDAPDistinguishedName( + title = _("Filter Group"), + help = _("Using this option you can define the DN of a group object which is used to filter the users. " + "Only members of this group will then be synchronized. This is a filter which can be " + "used to extend capabilities of the regular \"Search Filter\". Using the search filter " + "you can only define filters which directly apply to the user objects. To filter by " + "group memberships, you can use the \"memberOf\" attribute of the user objects in some " + "directories. But some directories do not have such attributes because the memberships " + "are stored in the group objects as e.g. \"member\" attributes. You should use the " + "regular search filter whenever possible and only use this filter when it is really " + "neccessary."), + size = 80, + )), ("user_id", TextAscii( title = _("User-ID Attribute"), help = _("The attribute used to identify the individual users. It must have " @@ -610,7 +623,7 @@ register_configvar(group, totext = _("Enforce lower case User-IDs."), )), ], - optional_keys = ['scope', 'filter', 'user_id', 'lower_user_ids'], + optional_keys = ['scope', 'filter', 'filter_group', 'user_id', 'lower_user_ids'], ), domain = "multisite", )

11 years, 2 months

Check_MK Git: check_mk: Fix syntax error in WATO file

by Mathias Kettner

Module: check_mk Branch: master Commit: a76f2ddced7e97cd95d96da5c1587cc696e065b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a76f2ddced7e97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 1 11:50:43 2013 +0200 Fix syntax error in WATO file --- web/plugins/wato/check_parameters.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 046af0d..347f364 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3165,47 +3165,47 @@ register_check_parameters( Tuple( title = _("Number of connections"), elements = [ - Integer(title = _("Warning at"))), - Integer(title = _("Critical at"))), + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), ] )), ("messageRate", Tuple( title = _("Number of messages delivered"), elements = [ - Integer(title = _("Warning at"))), - Integer(title = _("Critical at"))), + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), ] )), ("dataRate", Tuple( title = _("Amount of data processed"), elements = [ - Integer(title = _("Warning at"))), - Integer(title = _("Cricital at"))), + Integer(title = _("Warning at")), + Integer(title = _("Cricital at")), ] )), ("queuedMessages", Tuple( title = _("Number of messages currently queued"), elements = [ - Integer(title = _("Warning at"))), - Integer(title = _("Critical at"))), + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), ] )), ("queueSize", Tuple( title = _("Size of the queue"), elements = [ - Integer(title = _("Warning at"))), - Integer(title = _("Critical at"))), + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), ] )), ("deferredMessages", Tuple( title = _("Number of messages in deferred state"), elements = [ - Integer(title = _("Warning at"))), + Integer(title = _("Warning at")), Integer(title = _("Critical at")), ] )),

11 years, 2 months

Check_MK Git: check_mk: Remove empty i18n strings _("")

by Mathias Kettner

Module: check_mk Branch: master Commit: cf12da68424a46b14569681fc786001d810a204f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf12da68424a46… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 1 11:46:40 2013 +0200 Remove empty i18n strings _("") They break gettext --- web/plugins/wato/check_parameters.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8cc98ab..046af0d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3165,47 +3165,47 @@ register_check_parameters( Tuple( title = _("Number of connections"), elements = [ - Integer(title = _("Warning at"), unit = _("")), - Integer(title = _("Critical at"), unit = _("")), + Integer(title = _("Warning at"))), + Integer(title = _("Critical at"))), ] )), ("messageRate", Tuple( title = _("Number of messages delivered"), elements = [ - Integer(title = _("Warning at"), unit = _("")), - Integer(title = _("Critical at"), unit = _("")), + Integer(title = _("Warning at"))), + Integer(title = _("Critical at"))), ] )), ("dataRate", Tuple( title = _("Amount of data processed"), elements = [ - Integer(title = _("Warning at"), unit = _("")), - Integer(title = _("Cricital at"), unit = _("")), + Integer(title = _("Warning at"))), + Integer(title = _("Cricital at"))), ] )), ("queuedMessages", Tuple( title = _("Number of messages currently queued"), elements = [ - Integer(title = _("Warning at"), unit = _("")), - Integer(title = _("Critical at"), unit = _("")), + Integer(title = _("Warning at"))), + Integer(title = _("Critical at"))), ] )), ("queueSize", Tuple( title = _("Size of the queue"), elements = [ - Integer(title = _("Warning at"), unit = _("")), - Integer(title = _("Critical at"), unit = _("")), + Integer(title = _("Warning at"))), + Integer(title = _("Critical at"))), ] )), ("deferredMessages", Tuple( title = _("Number of messages in deferred state"), elements = [ - Integer(title = _("Warning at"), unit = _("")), + Integer(title = _("Warning at"))), Integer(title = _("Critical at")), ] )),

11 years, 2 months

Check_MK Git: check_mk: Fixed styling of tag filter

by Lars Michelsen

Module: check_mk Branch: master Commit: dba61f51f99b082bf5cbfc44f2481049c65247c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dba61f51f99b08… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 1 10:14:20 2013 +0200 Fixed styling of tag filter --- web/plugins/views/filters.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 308204d..62761c5 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -693,8 +693,8 @@ class FilterHostTags(Filter): def display(self): groups = [ (e[0], e[1]) for e in config.wato_host_tags ] operators = [ - ("is", _("is")), - ("isnot", _("is not")), + ("is", _("=")), + ("isnot", _("≠")), ] # replace unicode strings, before writing out as "json" @@ -714,12 +714,16 @@ class FilterHostTags(Filter): html.write('<tr><td>') html.sorted_select(prefix + '_grp', [("", "")] + groups, - onchange = 'host_tag_update_value(\'%s\', this.value)' % prefix + onchange = 'host_tag_update_value(\'%s\', this.value)' % prefix, + attrs = {'style': 'width:129px'} ) html.write('</td><td>') - html.sorted_select(prefix + '_op', [("", "")] + operators) + html.sorted_select(prefix + '_op', [("", "")] + operators, + attrs = {'style': 'width:36px'}) html.write('</td><td>') - html.sorted_select(prefix + '_val', html.var(prefix + '_grp') and grouped[html.var(prefix + '_grp')] or [("", "")]) + html.sorted_select(prefix + '_val', + html.var(prefix + '_grp') and grouped[html.var(prefix + '_grp')] or [("", "")], + attrs = {'style': 'width:129px'}) html.write('</td></tr>') html.write('</table>')

11 years, 2 months

Check_MK Git: check_mk: Added more host tag related painters;

by Lars Michelsen

Added host tag filter Message-ID: <51f91b0c.8o8G71U/yFbJb8qR%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1e2d3c1458b2e7c9bca2c31d64510d6988f46d2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e2d3c1458b2e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 31 16:10:37 2013 +0200 Added more host tag related painters; Added host tag filter --- ChangeLog | 3 +- web/htdocs/js/checkmk.js | 21 ++++++++++ web/htdocs/views.py | 23 +++++++---- web/htdocs/wato.py | 13 +----- web/plugins/config/wato.py | 17 ++++++++ web/plugins/views/filters.py | 71 ++++++++++++++++++++++++++++++++ web/plugins/views/painters.py | 91 ++++++++++++++++++++++++++++++----------- web/plugins/views/sorters.py | 33 ++++++++++++++- 8 files changed, 228 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1e2d3c1458…

11 years, 2 months

Check_MK Git: check_mk: fixed wording

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 63eec1b698d15062c4011d3f27d4467e77bfe2e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63eec1b698d150… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Jul 31 08:52:43 2013 +0200 fixed wording --- checkman/plesk_backups | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checkman/plesk_backups b/checkman/plesk_backups index b7f4b8d..7025a42 100644 --- a/checkman/plesk_backups +++ b/checkman/plesk_backups @@ -19,8 +19,8 @@ item: examples: # set up a check for a plesk backup - # warn if backup is elder than 1 day (86400 sec) - # and crit if elder than 2 days + # warn if backup is older than 1 day (86400 sec) + # and crit if older than 2 days # warn if Maximum size of all files on backup space is > 70 MB # (73400320 Bytes) and crit if > 80 MB # warn also if no backup is configured or no backup can be found @@ -47,7 +47,7 @@ inventory: is installed and working (it outputs the {<<<plesk_backups>>>} section). [parameters] -backup_age(int, int): if the age of the backup (in seconds) is elder than the first value, return {WARN} state, if elder than the second one, return {CRIT} state +backup_age(int, int): if the age of the backup (in seconds) is older than the first value, return {WARN} state, if older than the second one, return {CRIT} state total_size(int, int): if the total size of all backups on the backup space (in bytes) is larger than than the first value, return {WARN} state, if larger than the second one, return {CRIT} state no_backup_configured_state(int): the numeric state that should be returned if no backup is configured ( 0 = {OK}, 1 = {WARN}, 2 = {CRIT} ) no_backup_found_state(int): the numeric state that should be returned if no backup can be found ( 0 = {OK}, 1 = {WARN}, 2 = {CRIT} )

11 years, 2 months

Check_MK Git: check_mk: Added button to rule comment for inserting date and user

by Mathias Kettner

Module: check_mk Branch: master Commit: b085ae98a2df6b71475577c08622697bd3ffd525 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b085ae98a2df6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 31 14:40:36 2013 +0200 Added button to rule comment for inserting date and user --- web/htdocs/images/button_insertdate_hi.png | Bin 0 -> 3626 bytes web/htdocs/images/button_insertdate_lo.png | Bin 0 -> 5063 bytes web/htdocs/js/checkmk.js | 11 +++++++++++ web/htdocs/valuespec.py | 15 +++++++++++++++ web/htdocs/wato.py | 4 ++++ 5 files changed, 30 insertions(+) diff --git a/web/htdocs/images/button_insertdate_hi.png b/web/htdocs/images/button_insertdate_hi.png new file mode 100644 index 0000000..349e1ff Binary files /dev/null and b/web/htdocs/images/button_insertdate_hi.png differ diff --git a/web/htdocs/images/button_insertdate_lo.png b/web/htdocs/images/button_insertdate_lo.png new file mode 100644 index 0000000..17e760a Binary files /dev/null and b/web/htdocs/images/button_insertdate_lo.png differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 98e010c..abc32f9 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1707,6 +1707,17 @@ function valuespec_listof_fixarrows(oTbody) { } } +function vs_textascii_button(img, text, how) { + var oInput = img.previousElementSibling; + while (oInput.tagName == "A") + oInput = oInput.previousElementSibling; + if (oInput.tagName != "INPUT") + oInput = oInput.firstChild; // complain mode + oInput.value = text + oInput.value; // TODO: how + oInput.focus(); +} + + function vs_passwordspec_randomize(img) { password = ""; while (password.length < 8) { diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e28f597..082419f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -319,6 +319,8 @@ class TextAscii(ValueSpec): if type(self._regex) == str: self._regex = re.compile(self._regex) + self._prefix_buttons = kwargs.get("prefix_buttons", []) + def canonical_value(self): return "" @@ -331,6 +333,18 @@ class TextAscii(ValueSpec): html.write(" ") html.text_input(varprefix, str(value), size = self._size, read_only = self._read_only) + self.render_buttons() + + def render_buttons(self): + if self._prefix_buttons: + html.write(" ") + for icon, textfunc, help in self._prefix_buttons: + try: + text = textfunc() + except: + text = textfunc + html.icon_button("#", help, icon, onclick="vs_textascii_button(this, '%s', 'prefix');" % text) + def value_to_text(self, value): if value == None: @@ -374,6 +388,7 @@ class TextUnicode(TextAscii): def render_input(self, varprefix, value): html.text_input(varprefix, value, size = self._size) + self.render_buttons() def from_html_vars(self, varprefix): return html.var_utf8(varprefix, "").strip() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b598315..855b82d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10759,6 +10759,9 @@ def get_rule_conditions(ruleset): +def date_and_user(): + return time.strftime("%F", time.localtime()) + " " + config.user_id + ": " + def mode_edit_rule(phase, new = False): # Due to localization this cannot be defined in the global context! vs_rule_options = Dictionary( @@ -10773,6 +10776,7 @@ def mode_edit_rule(phase, new = False): "this rule"), size = 80, attrencode = True, + prefix_buttons = [ ("insertdate", date_and_user, _("Prefix date and your name to the comment")) ] ) ), ( "docu_url",

11 years, 2 months

Check_MK Git: check_mk: fixed unique alias name bug with timeperiods

by Andreas Boesl

Module: check_mk Branch: master Commit: 1eeb0b443c4fcc26220fee0f82d5bdded54d6954 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eeb0b443c4fcc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 31 13:32:44 2013 +0200 fixed unique alias name bug with timeperiods --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b598315..d25072d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13622,7 +13622,7 @@ def is_alias_used(my_group, my_name, aliasname): # Timeperiods timeperiods = load_timeperiods() for key, value in timeperiods.items(): - if value.get("alias") == aliasname and (my_group != "timeperiod" or my_name != key): + if value.get("alias") == aliasname and (my_group != "timeperiods" or my_name != key): return False, _("This alias is already used in timeperiod %s.") % key # Roles

11 years, 2 months

Check_MK Git: check_mk: Fix layout of auxiliary tag table

by Mathias Kettner

Module: check_mk Branch: master Commit: a6775bc71f9319ba48b3cb63cc31859d220a31fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6775bc71f9319… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 31 13:26:16 2013 +0200 Fix layout of auxiliary tag table --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c5cf0e6..7f328e3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9045,8 +9045,8 @@ def mode_hosttags(phase): searchable = False) if auxtags: - table.row() for nr, (tag_id, title) in enumerate(auxtags): + table.row() topic, title = parse_hosttag_title(title) edit_url = make_link([("mode", "edit_auxtag"), ("edit", nr)]) delete_url = html.makeactionuri([("_delaux", nr)])

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits