Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 84ad0a0180901060e806966fd57267a51b1645f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84ad0a01809010… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 2 12:26:50 2015 +0200 Testcommit --- agents/windows/check_mk_agent.exe | Bin 183808 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe deleted file mode 100755 index eedb2d9..0000000 Binary files a/agents/windows/check_mk_agent.exe and /dev/null differ

9 years, 2 months

Check_MK Git: check_mk: Minor code cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d2e7e420fdaf5a3ce95cdf71ce75f70ad189c51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d2e7e420fdaf5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 2 11:38:09 2015 +0200 Minor code cleanups --- web/htdocs/metrics.py | 30 +++++++++++++----------------- web/plugins/views/painters.py | 2 +- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 83c6000..ce1e29d 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -847,8 +847,7 @@ def get_graph_templates(translated_metrics): explicit_templates = get_explicit_graph_templates(translated_metrics) already_graphed_metrics = get_graphed_metrics(explicit_templates) implicit_templates = get_implicit_graph_templates(translated_metrics, already_graphed_metrics) - templates = explicit_templates + implicit_templates - return templates + return explicit_templates + implicit_templates def get_explicit_graph_templates(translated_metrics): @@ -894,7 +893,6 @@ def metrics_used_in_definition(metric_definition): def graph_possible(graph_template, translated_metrics): - for metric_definition in graph_template["metrics"]: try: evaluate(metric_definition[0], translated_metrics) @@ -932,7 +930,6 @@ def graph_without_missing_optional_metrics(graph_template, translated_metrics): return reduced_graph_template - def add_fake_metrics(translated_metrics, metric_names): with_fake = translated_metrics.copy() for metric_name in metric_names: @@ -944,6 +941,7 @@ def add_fake_metrics(translated_metrics, metric_names): } return with_fake + def generic_graph_template(metric_name): return { "metrics" : [ @@ -955,6 +953,7 @@ def generic_graph_template(metric_name): ] } + def get_graph_range(graph_template, translated_metrics): if "range" in graph_template: min_value, max_value = [ @@ -970,12 +969,9 @@ def get_graph_range(graph_template, translated_metrics): return min_value, max_value - - # Called with exactly one variable: the template ID. Example: # "check_mk-kernel.util:guest,steal,system,user,wait". def page_pnp_template(): - template_id = html.var("id") check_command, perf_var_string = template_id.split(":", 1) @@ -999,7 +995,6 @@ def page_pnp_template(): # TODO: some_value.max not yet working def render_graph_pnp(graph_template, translated_metrics): - graph_title = None vertical_label = None @@ -1203,7 +1198,6 @@ def render_graph_pnp(graph_template, translated_metrics): return graph_title + "\n" + rrdgraph_arguments + "\n" + rrdgraph_commands + "\n" - #. # .--Hover-Graph---------------------------------------------------------. # | _ _ ____ _ | @@ -1214,24 +1208,26 @@ def render_graph_pnp(graph_template, translated_metrics): # | |_| | # '----------------------------------------------------------------------' -def try_time_graph(): - # Filter cases where our graphing is not possible: - # - mobile GUI - # - for example IE < 8 - try_time_graph = not html.is_mobile() +def new_style_graphs_possible(): + return browser_supports_canvas() and not html.is_mobile() + + +def browser_supports_canvas(): user_agent = html.get_user_agent() if 'MSIE' in user_agent: matches = regex('MSIE ([0-9]{1,}[\.0-9]{0,})').search(user_agent) - try_time_graph = not matches or float(matches.group(1)) >= 9.0 - return try_time_graph + return not matches or float(matches.group(1)) >= 9.0 + else: + return True + def page_show_graph(): site = html.var('site') host_name = html.var('host_name') service = html.var('service') - if try_time_graph(): + if new_style_graphs_possible(): # FIXME HACK TODO We don't have the current perfata and check command # here, but we only need it till metrics.render_svc_time_graph() does # not need these information anymore. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1c93061..de8614f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -866,7 +866,7 @@ multisite_painters["svc_group_memberlist"] = { def paint_graph(row): import metrics - if metrics.try_time_graph(): + if metrics.new_style_graphs_possible(): try: css, htmlcode = paint_time_graph(row) if htmlcode:

9 years, 2 months

Check_MK Git: check_mk: #2322 FIX mkeventd: MIBs are now only loaded if SNMP Traps translation is activated

by Andreas Boesl

Module: check_mk Branch: master Commit: 5906923a7e38492402ccd7bc09ef2a41bb59d794 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5906923a7e3849… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 2 10:52:32 2015 +0200 #2322 FIX mkeventd: MIBs are now only loaded if SNMP Traps translation is activated Right now the mkeventd sometimes has problems loading mib files which lead to errors like "list index out of range". The error can now be bypassed by deactivating the option <i>Translate SNMP traps</i>. The error itself will get fixed in a following werk. --- .werks/2322 | 14 ++++++++++++++ ChangeLog | 3 +++ mkeventd/bin/mkeventd | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2322 b/.werks/2322 new file mode 100644 index 0000000..c549912 --- /dev/null +++ b/.werks/2322 @@ -0,0 +1,14 @@ +Title: mkeventd: MIBs are now only loaded if SNMP Traps translation is activated +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435826874 + +Right now the mkeventd sometimes has problems loading mib files which +lead to errors like "list index out of range". The error can now be bypassed +by deactivating the option <i>Translate SNMP traps</i>. + +The error itself will get fixed in a following werk. diff --git a/ChangeLog b/ChangeLog index 084f217..a6f1929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,9 @@ * 2369 FIX: Fix exception in BI availability via table "Hostname Aggregations" * 2370 FIX: Fix computation of "in downtime" and "acknownledged" of hosts in BI aggregations... + Event Console: + * 2322 FIX: mkeventd: MIBs are now only loaded if SNMP Traps translation is activated... + HW/SW-Inventory: * 2367 FIX: win_system: Fixed exception when non-UTF-8 sequences are contained agent output diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 3bc6802..6812da7 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2616,7 +2616,7 @@ class StatusServer: def handle_command_reload(self): with lock_configuration: load_configuration() - if opt_snmptrap: + if opt_snmptrap and g_config['translate_snmptraps']: g_event_server.load_mibs() g_event_server.compile_rules(g_config["rules"], g_config["rule_packs"]) g_status_server.reload_configuration()

9 years, 2 months

Check_MK Git: check_mk: Adding/Editing ldap connections is now possible

by Lars Michelsen

Module: check_mk Branch: master Commit: c80e91aa4ee6770257aaee6a3ab5a028479e722d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c80e91aa4ee677… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 24 17:29:40 2015 +0200 Adding/Editing ldap connections is now possible --- web/htdocs/userdb.py | 28 ++++++------ web/htdocs/wato.py | 103 +++++++++++++++++++++++++++++--------------- web/plugins/userdb/ldap.py | 8 ++-- 3 files changed, 87 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c80e91aa4e…

9 years, 2 months

Check_MK Git: check_mk: Intermediate step of supporting multiple ldap instances

by Lars Michelsen

Module: check_mk Branch: master Commit: 936e888eb7f78058879c50f456d2fba5b13a5ab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=936e888eb7f780… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 24 12:54:10 2015 +0200 Intermediate step of supporting multiple ldap instances --- web/htdocs/userdb.py | 60 +++- web/htdocs/wato.py | 431 +++++++++++++++++++++++++--- web/plugins/config/builtin.py | 19 +- web/plugins/userdb/htpasswd.py | 11 +- web/plugins/userdb/ldap.py | 67 ++++- web/plugins/wato/check_mk_configuration.py | 314 -------------------- 6 files changed, 500 insertions(+), 402 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=936e888eb7…

9 years, 2 months

Check_MK Git: check_mk: Intermediate step in cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: ff3cbdd3062d2df101ac5fcf823520e67d7e5caa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff3cbdd3062d2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 08:20:26 2015 +0200 Intermediate step in cleanups --- web/htdocs/userdb.py | 59 +++++++++++++++++++++++----------------- web/htdocs/wato.py | 3 +- web/plugins/userdb/htpasswd.py | 6 ++-- web/plugins/userdb/ldap.py | 8 ++---- 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index e391864..8d8647d 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -60,7 +60,7 @@ def load_plugins(): # declare & initialize global vars user_attributes = {} - multisite_user_connectors = [] + multisite_user_connectors = {} load_web_plugins("userdb", globals()) builtin_user_attribute_names = user_attributes.keys() @@ -68,7 +68,7 @@ def load_plugins(): # Connectors have the option to perform migration of configuration options # while the initial loading is performed - for connector in multisite_user_connectors: + for connector in multisite_user_connectors.values(): connector.get('migrate_config', lambda: None)() # This must be set after plugin loading to make broken plugins raise @@ -77,28 +77,37 @@ def load_plugins(): loaded_with_language = current_language -def list_user_connectors(): - return [ (c['id'], c['title']) for c in multisite_user_connectors ] - -def enabled_connectors(): - connectors = [] - for connector in multisite_user_connectors: - if connector.get('is_active', lambda: False)(): - connectors.append(connector) +# Returns a list of two part tuples where the first element is the unique +# connection id and the second element the connector specification dict +def active_connections(): + connections = [] + for connector_id, connector in multisite_user_connectors.items(): + if connector_id == 'htpasswd': + # htpasswd connector is enabled by default and always executed first + connections.insert(0, ('htpasswd', connector)) + else: + for connection in get_connection_config(): + connections.append((connection['id'], connector)) return connectors -def get_connector_id(connector_id): - if connector_id is None: - connector_id = 'htpasswd' - return connector_id + +def cleanup_connection_id(connection_id): + if connection_id is None: + connection_id = 'htpasswd' + + # Old Check_MK used a static "ldap" connector id for all LDAP users. + # Since Check_MK now supports multiple LDAP connections, the ID has + # been changed to "default" + if connection_id == 'ldap': + connection_id = 'default' + + return connection_id + # Returns the connector dictionary of the given id -def get_connector(connector_id): - connector_id = get_connector_id(connector_id) - for connector in enabled_connectors(): - if connector['id'] == connector_id: - return connector - return {} +def get_connector(connection_id): + return dict(active_connections()).get(cleanup_connection_id(connection_id), {}) + # Returns a list of locked attributes def locked_attributes(connector_id): @@ -757,7 +766,7 @@ def save_connection_config(): # This hook is called to validate the login credentials provided by a user def hook_login(username, password): - for connector in enabled_connectors(): + for connection_id, connector in active_connections(): handler = connector.get('login', None) if not handler: continue @@ -796,9 +805,9 @@ def hook_login(username, password): # c) Before activating the changes in WATO def hook_sync(connector_id = None, add_to_changelog = False, only_username = None, raise_exc = False): if connector_id: - connectors = [ get_connector(connector_id) ] + connectors = [ (connector_id, get_connector(connector_id)) ] else: - connectors = enabled_connectors() + connectors = active_connections() no_errors = True for connector in connectors: @@ -835,7 +844,7 @@ def hook_sync(connector_id = None, add_to_changelog = False, only_username = Non # Hook function can be registered here to be executed during saving of the # new user construct def hook_save(users): - for connector in enabled_connectors(): + for connection_id, connector in active_connections(): handler = connector.get('save', None) if not handler: continue @@ -876,7 +885,7 @@ def hook_page(): if 'page' not in config.userdb_automatic_sync: return - for connector in enabled_connectors(): + for connection_id, connector in active_connections(): handler = connector.get('page', None) if not handler: continue diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f3729f6..abe2034 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12338,7 +12338,8 @@ def mode_users(phase): table.cell(_("Connector"), connector['short_title']) locked_attributes = userdb.locked_attributes(user.get('connector')) else: - table.cell(_("Connector"), "%s (disabled)" % userdb.get_connector_id(user.get('connector')), css="error") + table.cell(_("Connector"), "%s (disabled)" % + userdb.cleanup_connection_id(user.get('connector')), css="error") locked_attributes = [] # Authentication diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py index 4d39c97..7c5c9bb 100644 --- a/web/plugins/userdb/htpasswd.py +++ b/web/plugins/userdb/htpasswd.py @@ -130,14 +130,12 @@ def htpasswd_save(users): if rename_file: os.rename(filename, filename[:-4]) -multisite_user_connectors.append({ - 'id' : 'htpasswd', +multisite_user_connectors['htpasswd'] = { 'title' : _('Apache Local Password File (htpasswd)'), 'short_title' : _('htpasswd'), # Register hook functions - 'is_active' : lambda: True, 'login' : htpasswd_login, 'save' : htpasswd_save, # Not registering: sync, locked_attributes, page -}) +} diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 05d2ca8..0f535c3 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1002,9 +1002,6 @@ ldap_attribute_plugins['groups_to_roles'] = { # | Hook functions used in this connector | # '----------------------------------------------------------------------' -def ldap_is_active(): - return bool([ c for c in connection_config if c['type'] == 'ldap' and not c.get('disabled') ]) - # This function only validates credentials, no locked checking or similar def ldap_login(username, password): ldap_connect() @@ -1284,12 +1281,11 @@ def ldap_migrate_config(): save_connection_config() -multisite_user_connectors.append({ +multisite_user_connectors['ldap'] = { 'id' : 'ldap', 'title' : _('LDAP (Active Directory, OpenLDAP)'), 'short_title' : _('LDAP'), - 'is_active' : ldap_is_active, 'migrate_config' : ldap_migrate_config, 'login' : ldap_login, 'sync' : ldap_sync, @@ -1302,4 +1298,4 @@ multisite_user_connectors.append({ 'locked_attributes' : ldap_locked_attributes, 'multisite_attributes' : ldap_multisite_attributes, 'non_contact_attributes' : ldap_multisite_attributes, -}) +}

9 years, 2 months

Check_MK Git: check_mk: Added check for duplicate connection ids

by Lars Michelsen

Module: check_mk Branch: master Commit: 4aebb9fa49b8189d4a49d7d2c731bde50d537bb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aebb9fa49b818… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 25 14:10:54 2015 +0200 Added check for duplicate connection ids --- web/htdocs/wato.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2baa36c..f3729f6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7304,6 +7304,12 @@ def mode_ldap_config(phase): table.end() + +def validate_ldap_connection_id(value, varprefix): + if value in [ c['id'] for c in userdb.get_connection_config() ]: + raise MKUserError(varprefix, _("This ID is already user by another connection. Please choose another one.")) + + def vs_ldap_connection(new): if new: general_elements = [ @@ -7313,6 +7319,7 @@ def vs_ldap_connection(new): "when objects refer to the connection."), allow_empty = False, size = 12, + validate = validate_ldap_connection_id, )) ] + rule_option_elements() else:

9 years, 2 months

Check_MK Git: check_mk: User list: Cleaned up connection column format

by Lars Michelsen

Module: check_mk Branch: master Commit: 8080cf1cabfe9a2fad6e73a2e27de0e1ed89a6fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8080cf1cabfe9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 15:42:16 2015 +0200 User list: Cleaned up connection column format --- web/htdocs/wato.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 90d8a28..903cfe5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12339,10 +12339,11 @@ def mode_users(phase): # Connector if connector: - table.cell(_("Connector"), '%s (%s)' % (user_connection_id, connector['short_title'])) + table.cell(_("Connector"), '%s (%s)' % (connector['short_title'], user_connection_id)) locked_attributes = userdb.locked_attributes(user_connection_id) else: - table.cell(_("Connector"), "%s (disabled)" % user_connection_id, css="error") + table.cell(_("Connector"), "%s (%s) (disabled)" % + (connector['short_title'], user_connection_id), css="error") locked_attributes = [] # Authentication

9 years, 2 months

Check_MK Git: check_mk: Using multiple LDAP connections is now working

by Lars Michelsen

Module: check_mk Branch: master Commit: e835e33eef56c1a80ddbc9c277e67325ca9e2f10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e835e33eef56c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 15:29:47 2015 +0200 Using multiple LDAP connections is now working --- web/htdocs/userdb.py | 104 ++++++++++++--------- web/htdocs/wato.py | 29 +++--- web/plugins/config/builtin.py | 2 +- web/plugins/userdb/ldap.py | 200 ++++++++++++++++++++++------------------- 4 files changed, 187 insertions(+), 148 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e835e33eef…

9 years, 2 months

Check_MK Git: check_mk: Cleaned up legacy needless .get calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 8db8c56d2d8405dbc10a45d232fe9d3f9e976f4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db8c56d2d8405… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 15:35:39 2015 +0200 Cleaned up legacy needless .get calls --- web/plugins/userdb/ldap.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index dcf7945..a831a77 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -160,7 +160,7 @@ def ldap_connect_server(server): uri = ldap_uri(server) conn = ldap.ldapobject.ReconnectLDAPObject(uri) conn.protocol_version = g_config['version'] - conn.network_timeout = g_config.get('connect_timeout', 2.0) + conn.network_timeout = g_config['connect_timeout'] conn.retry_delay = 0.5 # When using the domain top level as base-dn, the subtree search stumbles with referral objects. @@ -204,13 +204,13 @@ def ldap_connect(enforce_new = False, enforce_server = None): # Some major config var validations - if not g_config.get('server'): + if not g_config['server']: raise MKLDAPException(_('The LDAP connector is enabled in global settings, but the ' 'LDAP server to connect to is not configured. Please fix this in the ' '<a href="wato.py?mode=ldap_config">LDAP ' 'connection settings</a>.')) - if not g_config.get('user_dn'): + if not g_config['user_dn']: raise MKLDAPException(_('The distinguished name of the container object, which holds ' 'the user objects to be authenticated, is not configured. Please ' 'fix this in the <a href="wato.py?mode=ldap_config">' @@ -338,7 +338,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): if scope: config_scope = scope else: - config_scope = g_config.get('user_scope', 'sub') + config_scope = g_config['user_scope'] if config_scope == 'sub': scope = ldap.SCOPE_SUBTREE @@ -469,10 +469,10 @@ def ldap_bind_credentials_configured(): return g_config.get('bind', ('', ''))[0] != '' def ldap_user_base_dn_configured(): - return g_config.get('user_dn', '') != '' + return g_config['user_dn'] != '' def ldap_group_base_dn_configured(): - return g_config.get('group_dn', '') != '' + return g_config['group_dn'] != '' def ldap_user_base_dn_exists(): try: @@ -959,7 +959,7 @@ def ldap_list_roles_with_group_dn(): ListOf( LDAPDistinguishedName( size = 80, - enforce_suffix = ldap_replace_macros(g_config.get('group_dn', '')), + enforce_suffix = ldap_replace_macros(g_config['group_dn']), allow_empty = False, ), title = role['alias'] + ' - ' + _("Specify the Group DN"),

9 years, 2 months

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015