Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: Fixed distributed WATO site login

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f988a190ece9d50c3e1e044e1ba6847288d280b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f988a190ece9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 1 14:08:48 2013 +0200 Fixed distributed WATO site login --- web/htdocs/wato.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8763e3f..c0da639 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7097,7 +7097,7 @@ def do_site_login(site_id, name, password): # Trying basic auth AND form based auth to ensure the site login works. # Adding _ajaxid makes the web service fail silently with an HTTP code and # not output HTML code for an error screen. - url = site["multisiteurl"] + 'automation_login.py?_login=1' \ + url = site["multisiteurl"] + 'login.py?_login=1' \ '&_username=%s&_password=%s&_origtarget=automation_login.py&_plain_error=1' % \ (name, password) response = get_url(url, site.get('insecure', False), name, password).strip() @@ -7128,7 +7128,9 @@ def get_url(url, insecure, user=None, password=None, params = '', post_data = No # -s: silent # -S: show errors # -w '%{http_code}': add the http status code to the end of the output - command = 'curl -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % ( + # -L: follow redirects + # -b /dev/null: handle cookies, but do not persist them + command = 'curl -b /dev/null -L -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % ( insecure, cred, params, url) tmp_file = None if post_data != None:

11 years, 2 months

Check_MK Git: check_mk: windows_agent: increased maximum local/

by Andreas Boesl

plugin script output length to 512kB Message-ID: <51fa4f84.idH2x7POOf2udWwr%ab(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: 8ca183b0d9f08a9420550b38759aa43094269f4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ca183b0d9f08a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 1 14:07:29 2013 +0200 windows_agent: increased maximum local/plugin script output length to 512kB --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 42 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index a179514..2bb1839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * windows_agent: now starts local/plugin scripts in separate threads/processes new script parameters cache_age, retry_count, timeout new script caching options "off", "async", "sync" + * windows_agent: increased maximum local/plugin script output length to 512kB Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 16773bf..d585675 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -103,7 +103,7 @@ // Maximum heap buffer for a single local/plugin script // This buffer contains the check output -#define SCRIPT_BUFFER_HEAP 524288 +#define SCRIPT_BUFFER_HEAP 524288L // Maximum timeout for a single local/plugin script #define DEFAULT_PLUGIN_TIMEOUT 60 @@ -2211,8 +2211,7 @@ int launch_program(script_container* cont) { int exit_code = 0; int out_offset = 0; - char buf[1024]; // i/o buffer - unsigned int buf_size = sizeof(buf); + char buf[16635]; // i/o buffer STARTUPINFO si; SECURITY_ATTRIBUTES sa; @@ -2265,37 +2264,38 @@ int launch_program(script_container* cont) memset(buf, 0, sizeof(buf)); time_t process_start = time(0); + bool buffer_full = false; + for(;;) { if (cont->should_terminate || time(0) - process_start > cont->timeout){ exit_code = 2; break; } - GetExitCodeProcess(pi.hProcess,&exit); // while the process is running - PeekNamedPipe(read_stdout,buf,buf_size - 1,&bread,&avail,NULL); - // check to see if there is any data to read from stdout - if (bread != 0) { - memset(buf, 0, sizeof(buf)); - if (avail > buf_size - 1) { - while (bread >= buf_size - 1) { - ReadFile(read_stdout,buf,buf_size - 1,&bread,NULL); // read the stdout pipe - out_offset += snprintf(cont->buffer_work + out_offset, SCRIPT_BUFFER_HEAP - out_offset, buf); - memset(buf, 0, sizeof(buf)); - } + GetExitCodeProcess(pi.hProcess, &exit); // while the process is running + while (!buffer_full) { + PeekNamedPipe(read_stdout, buf, sizeof(buf), &bread, &avail, NULL); + if (avail == 0) + break; + + if (out_offset + bread > SCRIPT_BUFFER_HEAP) { + buffer_full = true; + break; } - else { - ReadFile(read_stdout,buf,buf_size - 1,&bread,NULL); + + if (bread > 0) { + memset(buf, 0, sizeof(buf)); + ReadFile(read_stdout, buf, sizeof(buf), &bread, NULL); out_offset += snprintf(cont->buffer_work + out_offset, SCRIPT_BUFFER_HEAP - out_offset, buf); } } - - if (out_offset >= SCRIPT_BUFFER_HEAP) + if (buffer_full) break; if (exit != STILL_ACTIVE) break; - Sleep(50); + Sleep(10); } TerminateJobObject(cont->job_object, exit_code); @@ -2312,7 +2312,7 @@ int launch_program(script_container* cont) DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) { script_container* cont = (script_container*) lpParam; - cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP + 1); + cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP + 1 ); // Execute script int result = launch_program(cont); @@ -3574,7 +3574,7 @@ void listen_tcp_loop() void output(SOCKET &out, const char *format, ...) { - static char outbuffer[16384]; + static char outbuffer[SCRIPT_BUFFER_HEAP]; static int len = 0; va_list ap; va_start(ap, format);

11 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013