Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: reverted feature: table with no headers

by Andreas Boesl

Module: check_mk Branch: master Commit: aab3ee912ee56ddfe8ae4ba8d0da7b7e5d850db3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aab3ee912ee56d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 15:41:33 2013 +0100 reverted feature: table with no headers --- web/htdocs/table.py | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index e6aadae..94dada3 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -172,33 +172,30 @@ def end(): html.write(" %s" % table["css"]) html.write('">\n') - - use_headers = [ header for header in table["headers"] if header[0] != "" ] - if use_headers or actions_enabled: - html.write(" <tr>") - first_col = True - for header, help in table["headers"]: - if help: - header = '%s' % (html.attrencode(help), header) - html.write(" <th>") - - # Add the table action link - if first_col: - if actions_enabled: - if actions_visible: - state = '0' - help = _('Hide table actions') - img = 'table_actions_on' - else: - state = '1' - help = _('Display table actions') - img = 'table_actions_off' - html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), - help, img, cssclass = 'toggle_actions') - first_col = False - - html.write("%s</th>\n" % header) - html.write(" </tr>\n") + html.write(" <tr>") + first_col = True + for header, help in table["headers"]: + if help: + header = '%s' % (html.attrencode(help), header) + html.write(" <th>") + + # Add the table action link + if first_col: + if actions_enabled: + if actions_visible: + state = '0' + help = _('Hide table actions') + img = 'table_actions_on' + else: + state = '1' + help = _('Display table actions') + img = 'table_actions_off' + html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), + help, img, cssclass = 'toggle_actions') + first_col = False + + html.write("%s</th>\n" % header) + html.write(" </tr>\n") if actions_enabled and actions_visible: html.write('<tr class="data even0 actions"><td colspan=%d>' % num_cols)

10 years, 9 months

Check_MK Git: check_mk: html.attrencode now tries to convert non - str/ unicode values (e.g Exception messages) into a str

by Andreas Boesl

Module: check_mk Branch: master Commit: 41e3b36aa2969889d719afe13a0d7a0d05feafff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41e3b36aa29698… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 15:18:30 2013 +0100 html.attrencode now tries to convert non - str/unicode values (e.g Exception messages) into a str --- web/htdocs/htmllib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c3884a3..16f2c8c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1076,6 +1076,9 @@ class html: def attrencode(self, value): if type(value) == int: return str(value) + elif type(value) not in [str, unicode]: + value = str(value) + new = "" for c in value: if c == '"':

10 years, 9 months

Check_MK Git: check_mk: Added new checks for Brocade NetIron MLX switching / routing devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 52a6fdd257456ef3bed6a62b9bbd085ba356bc5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52a6fdd257456e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Nov 22 15:04:58 2013 +0100 Added new checks for Brocade NetIron MLX switching / routing devices Checked are by SNMP: the status of Power supplies and Fans the overall status of modules memory usage and cpu utilization of NI-MLX modules temperature measured by different temperature sensors --- .werks/80 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/80 b/.werks/80 index b1b5552..066eaca 100644 --- a/.werks/80 +++ b/.werks/80 @@ -5,7 +5,7 @@ Version: 1.2.3i7 Date: 1383827175 Class: feature -It checks by SNMP +Checked are by SNMP: the status of Power supplies and Fans the overall status of modules memory usage and cpu utilization of NI-MLX modules

10 years, 9 months

Check_MK Git: check_mk: Easier debugging for help switch ( added feedback message)

by Lars Michelsen

Module: check_mk Branch: master Commit: 7975154db0e3dc2128f2cd97e604606e0f7690fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7975154db0e3dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 14:27:46 2013 +0100 Easier debugging for help switch (added feedback message) --- web/htdocs/help.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/help.py b/web/htdocs/help.py index 03bea37..f7afddf 100644 --- a/web/htdocs/help.py +++ b/web/htdocs/help.py @@ -27,4 +27,6 @@ import config def ajax_switch_help(): - config.save_user_file("help", html.var("enabled", "") != "") + state = html.var("enabled", "") != "" + config.save_user_file("help", state) + html.write("%r" % state)

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #1073

by Lars Michelsen

Module: check_mk Branch: master Commit: 64c2e5537614982dd87a67829e9ad800e8c99d11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64c2e553761498… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 14:42:17 2013 +0100 Updated bug entries #1073 --- .bugs/1073 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1073 b/.bugs/1073 index fb7d8e8..030992b 100644 --- a/.bugs/1073 +++ b/.bugs/1073 @@ -1,12 +1,15 @@ Title: Chrome: help switches on randomly Component: multisite -State: open +Class: bug +State: done Date: 2013-10-15 23:42:57 Targetversion: 1.2.3i5 -Class: bug The online help sometimes randomly switches on on Chrome on Windows. Never seen this on Firefox. Seems like the help.mk in the user profile correctly corresponds to the settings, so there it is no javascript problem? This seems hard to reproduce. We can use Chrome for a while... + +2013-11-22 14:42:11: changed state open -> done +It was caused by setting the option before having the user context.

10 years, 9 months

Check_MK Git: check_mk: ldap: added some more explainaition /

by Lars Michelsen

examples to LDAP config help Message-ID: <528f61c2.ZP6xgHBxSx6CZDFS%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: be1348cd0da84ae94edbfe1c217539845dbb1e66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be1348cd0da84a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 14:17:19 2013 +0100 ldap: added some more explainaition / examples to LDAP config help --- web/plugins/wato/check_mk_configuration.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 654d535..09ac8b9 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -658,13 +658,17 @@ register_configvar(group, title = _("Search Filter"), help = _("Using this option you can define an optional LDAP filter which is used during " "LDAP searches. It can be used to only handle a subset of the users below the given " - "base DN."), + "base DN. Some common examples: " + "All user objects in LDAP: " + "<code>(&(objectclass=user)(objectcategory=person))</code> " + "Members of a group: " + "<code>(&(objectclass=user)(objectcategory=person)(memberof=CN=cmk-users,OU=Groups,DC=corp,DC=de))</code> "), size = 80, default_value = lambda: userdb.ldap_filter('users', False), attrencode = True, )), ("filter_group", LDAPDistinguishedName( - title = _("Filter Group"), + title = _("Filter Group (Only use in special situations)"), 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 " @@ -673,7 +677,8 @@ register_configvar(group, "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."), + "neccessary. Finally you can say, you should not use this option when using Active Directory. " + "This option is neccessary in OpenLDAP directories when you like to filter by group membership."), size = 80, )), ("user_id", TextAscii(

10 years, 9 months

Check_MK Git: check_mk: FIX Context help toggled on/off randomly

by Lars Michelsen

Module: check_mk Branch: master Commit: ff13548ef4f4462feecb7e3b83c3c106a8cf68f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff13548ef4f446… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 14:53:00 2013 +0100 FIX Context help toggled on/off randomly During browsing different multisite pages, it could happen that the help switched on/off randomly. The setting was loaded before having the correct user context loaded. Now setting that option after the user has been logged in. --- .werks/284 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 2 ++ web/htdocs/index.py | 1 + 4 files changed, 17 insertions(+) diff --git a/.werks/284 b/.werks/284 new file mode 100644 index 0000000..0a92370 --- /dev/null +++ b/.werks/284 @@ -0,0 +1,13 @@ +Title: Context help toggled on/off randomly +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1385127740 +Class: fix + +During browsing different multisite pages, it could happen +that the help switched on/off randomly. + +The setting was loaded before having the correct user +context loaded. Now setting that option after the user has +been logged in. diff --git a/ChangeLog b/ChangeLog index 81fc4eb..e952bc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 0210 FIX: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN * 0035 FIX: http[s] links are display again in the plugin output... * 0006 FIX: Checkboxes for hosts/services were missing on modified views... + * 0284 FIX: Context help toggled on/off randomly... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 401b9bc..e104bb3 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -17,6 +17,8 @@ class html_mod_python(htmllib.html): self.user = req.user self.read_get_vars() self.read_cookies() + + def load_help_visible(self): try: self.help_visible = config.load_user_file("help", False) # cache for later usage except: diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 162d62f..7c080a8 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -300,6 +300,7 @@ def handler(req, profiling = True): # Set all permissions, read site config, and similar stuff config.login(html.user) + html.load_help_visible() # Initialize the multiste i18n. This will be replaced by # language settings stored in the user profile after the user

10 years, 9 months

Check_MK Git: check_mk: rewrite text of werk 235

by Andreas Boesl

Module: check_mk Branch: master Commit: 58098b041f674f15af8cd32089b9deacd7456bfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58098b041f674f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 22 14:13:26 2013 +0100 rewrite text of werk 235 --- .werks/235 | 19 ++++++++++++++++++- ChangeLog | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/235 b/.werks/235 index 547cd21..56617ff 100644 --- a/.werks/235 +++ b/.werks/235 @@ -1,8 +1,25 @@ -Title: table headers are now omitted if all fields are empty and no table action is set +Title: module table.py: table headers are omitted if all header fields are empty Level: 1 Component: wato Version: 1.2.3i7 Date: 1385120851 Class: feature +Html tables rendered with the help of the table module always displayed the <th> fields, +even if none if this fields were filled. For example: +C+: +table.begin(searchable = False) +# Firma +table.row() +table.cell("", "Company") +table.cell("", "Yummifood") +# Adresse +table.row() +table.cell("", "Address") +table.cell("", "Yummistreet 7, 12345 Yummiville") +table.end() +C-: + +This created a table with empty headers. +The new feature omits this headerline if it's not used otherwise, e.g. by a table action. diff --git a/ChangeLog b/ChangeLog index 81fc4eb..4f88397 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,7 @@ WATO: * 0053 New rule for configuring the display_name of a service... * 0216 Supporting float values as SNMP timeout value now... - * 0235 table headers are now omitted if all fields are empty and no table action is set + * 0235 module table.py: table headers are omitted if all header fields are empty... * 0048 FIX: Tests on host diagnose page are executed parallel now... * 0033 FIX: Fixed problem when saving settings in WATOs host diagnostic page... * 0205 FIX: NagVis related permissions of roles can be edited again...

10 years, 9 months

Check_MK Git: check_mk: Updated help text of use_inline_snmp option in WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 60f0e0a2cb0c6bae0579d43377f7ac1f135e44ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60f0e0a2cb0c6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 14:01:49 2013 +0100 Updated help text of use_inline_snmp option in WATO --- web/plugins/wato/check_mk_configuration.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 0c758c0..654d535 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1001,15 +1001,15 @@ register_configvar(group, register_configvar(group, "use_inline_snmp", Checkbox( - title = _("Use Inline SNMP (EXPERIMENTAL)"), + title = _("Use Inline SNMP"), label = _("Enable inline SNMP (directly use net-snmp libraries)"), - help = _("In older versions Check_MK used command line calls of net-snmp " - "tools like snmpget or snmpwalk. For each request a new command line " - "program had to be executed. The new default is the inline SNMP implementation " + help = _("By default Check_MK uses command line calls of Net-SNMP tools like snmpget or " + "snmpwalk to gather SNMP information. For each request a new command line " + "program is being executed. It is now possible to use the inline SNMP implementation " "which calls the net-snmp libraries directly via its python bindings. This " - "should increase the performance of SNMP checks in a significant way. " - "For compatibility the classic SNMP integration is still available and can be " - "enabled here."), + "should increase the performance of SNMP checks in a significant way. The inline " + "SNMP mode is a feature which improves the performance for large installations and " + "only available via our subscription."), default_value = False ), need_restart = True

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #1026

by Lars Michelsen

Module: check_mk Branch: master Commit: c20ef4c0ccb0bf91cbe6fc5ade7c64520f9ace91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c20ef4c0ccb0bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 22 13:17:54 2013 +0100 Updated bug entries #1026 --- .bugs/1026 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1026 b/.bugs/1026 new file mode 100644 index 0000000..4e63e8a --- /dev/null +++ b/.bugs/1026 @@ -0,0 +1,11 @@ +Title: Postfix mailqueue check should use more flexible thresholds +Component: checks +State: open +Date: 2013-11-22 13:15:25 +Targetversion: 1.2.3i6 +Class: nastiness + +The check is currently only using absolute levels, which is OK for the first moment, but +in fact it is not really a problem when having several hundret mails in the queue, as long +as all mails are processed after a short time. Only a queue which remains filled is +a problem. Some kind of dynamic calculation should be better, a rate or similar.

10 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013