Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

CME: Filtering LDAP connections now correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 3119cfa562d3a3eee4a1936d9930c19b1620b0bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3119cfa562d3a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 13:29:32 2017 +0200 CME: Filtering LDAP connections now correctly Change-Id: Ife4e6c2f417bf0c17fcf2f43114af7b0a511b687 --- web/htdocs/userdb.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 699f977..9bad29c 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -1094,12 +1094,15 @@ def load_connection_config(): return user_connections -def save_connection_config(connections): +def save_connection_config(connections, base_dir=None): + if not base_dir: + base_dir = multisite_dir + output = "# Written by Multisite UserDB\n# encoding: utf-8\n\n" output += "user_connections = \\\n%s\n\n" % pprint.pformat(connections) - make_nagios_directory(multisite_dir) - store.save_file(multisite_dir + "user_connections.mk", output) + make_nagios_directory(base_dir) + store.save_file(os.path.join(base_dir, "user_connections.mk"), output) #. # .--ConnectorAPI--------------------------------------------------------.

7 years, 5 months

Fixed broken saving of groups

by Lars Michelsen

Module: check_mk Branch: master Commit: 6de471fda3ca4423a21ce450802cbfaf1e8f57a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6de471fda3ca44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 12:28:33 2017 +0200 Fixed broken saving of groups Change-Id: Ibd096de0d4255493b018d4ff0a9110a70f114efb --- web/htdocs/watolib.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 24e1f7a..36ac0b0 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7376,19 +7376,18 @@ def save_group_information(all_groups, custom_default_config_dir = None): make_nagios_directory(check_mk_config_dir) output = wato_fileheader() for what in [ "host", "service", "contact" ]: - if what in check_mk_groups and len(check_mk_groups[what]) > 0: + if check_mk_groups.get(what): output += "if type(define_%sgroups) != dict:\n define_%sgroups = {}\n" % (what, what) output += "define_%sgroups.update(%s)\n\n" % (what, pprint.pformat(check_mk_groups[what])) - cmk.store.save_file("%s/conf.d/wato/groups.mk" % cmk.paths.default_config_dir, output) + cmk.store.save_file("%s/groups.mk" % check_mk_config_dir, output) # Users with passwords for Multisite - filename = "%s/%s" % (multisite_config_dir, "groups.mk.new") make_nagios_directory(multisite_config_dir) output = wato_fileheader() for what in [ "host", "service", "contact" ]: - if what in multisite_groups and len(multisite_groups[what]) > 0: + if multisite_groups.get(what): output += "multisite_%sgroups = \\\n%s\n\n" % (what, pprint.pformat(multisite_groups[what])) - cmk.store.save_file("%s/multisite.d/wato/groups.mk" % cmk.paths.default_config_dir, output) + cmk.store.save_file("%s/groups.mk" % multisite_config_dir, output) def find_usages_of_group(name, group_type):

7 years, 5 months

Removed useless global

by Lars Michelsen

Module: check_mk Branch: master Commit: 4cdfa8427f539293a15fc46dddd4877569b6749a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cdfa8427f5392… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 12:08:14 2017 +0200 Removed useless global Change-Id: I9fd20cf72bbb39767afd62b005ebcea7ce0794a2 --- web/htdocs/watolib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 17a3304..24e1f7a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -127,7 +127,6 @@ def initialize_before_loading_plugins(): replication_paths.append(("dir", "mkeventd", mkeventd_config_dir, ["sitespecific.mk"])) backup_paths.append(("dir", "mkeventd", mkeventd_config_dir)) - global backup_domains backup_domains.clear() def init_watolib_datastructures():

7 years, 5 months

replication_paths, backup_paths and backup_domains can now be added in WATO plugins again

by Lars Michelsen

Module: check_mk Branch: master Commit: b4e0bd984fd23584fb93b6ca9300956643800dd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4e0bd984fd235… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 10:47:01 2017 +0200 replication_paths, backup_paths and backup_domains can now be added in WATO plugins again Change-Id: I7d967e52fcaf44c0bad4bd15324cfaeb99c9220e --- web/htdocs/watolib.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 60a8ff7..fe11289 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -95,7 +95,8 @@ def initialize_before_loading_plugins(): # Directories and files to synchronize during replication global replication_paths - replication_paths = [ + del replication_paths[:] + replication_paths += [ ( "dir", "check_mk", wato_root_dir, ["sitespecific.mk"]), ( "dir", "multisite", multisite_dir, ["sitespecific.mk"] ), ( "file", "htpasswd", cmk.paths.htpasswd_file ), @@ -111,6 +112,7 @@ def initialize_before_loading_plugins(): # Directories and files for backup & restore global backup_paths + del backup_paths[:] backup_paths = replication_paths + [ ( "file", "sites", sites_mk) ] @@ -124,7 +126,7 @@ def initialize_before_loading_plugins(): backup_paths.append(("dir", "mkeventd", mkeventd_config_dir)) global backup_domains - backup_domains = {} + backup_domains.clear() def init_watolib_datastructures(): if config.wato_use_git:

7 years, 5 months

CME: Fixed syncing of site specific global files

by Lars Michelsen

Module: check_mk Branch: master Commit: ba398bb02df99bf58abdd273fa33f50bd900c19c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba398bb02df99b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 11:58:07 2017 +0200 CME: Fixed syncing of site specific global files Change-Id: Idcef938426f29acc7263215a8cdf6ba8d5ef7687 --- web/htdocs/watolib.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index c823266..17a3304 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -74,6 +74,8 @@ backup_domains = {} automation_commands = {} g_rulespecs = None g_rulegroups = {} +builtin_host_tags = [] +builtin_aux_tags = [] # Global datastructure holding all attributes (in a defined order) # as pairs of (attr, topic). Topic is the title under which the @@ -4407,9 +4409,9 @@ class ActivateChangesManager(ActivateChanges): snapshot_path = self._site_snapshot_file(site_id) - # Add site-specific global settings. site_tmp_dir = cmk.paths.tmp_dir + "/sync-%s-specific-%s" % (site_id, id(html)) - paths = replication_paths + [("dir", "sitespecific", site_tmp_dir)] + + paths = replication_paths[:] # Remove Event Console settings, if this site does not want it (might # be removed in some future day) @@ -4426,16 +4428,25 @@ class ActivateChangesManager(ActivateChanges): replicate_components.add("mkps") if cmk.is_managed_edition(): - managed_snapshots.CMESnapshot(site_id, site_tmp_dir, replicate_components).create_site_snapshot() - new_paths = [] + snapshot = managed_snapshots.CMESnapshot(site_id, site_tmp_dir, replicate_components) + snapshot.create_site_snapshot() + + site_specific_globals_tmp_path = snapshot.get_site_globals_tmp_dir() + # Change all replication paths to be in the site specific temporary directory + # These paths are then packed into the sync snapshot + new_paths = [] for entry in map(list, paths): entry[2] = entry[2].replace(cmk.paths.omd_root, site_tmp_dir) new_paths.append(tuple(entry)) paths = new_paths else: + site_specific_globals_tmp_path = site_tmp_dir self.create_site_globals_file(site_id, site_tmp_dir) + # Add site-specific global settings + paths.append(("dir", "sitespecific", site_specific_globals_tmp_path)) + multitar.create(snapshot_path, paths) shutil.rmtree(site_tmp_dir) @@ -5358,7 +5369,8 @@ def group_hosttags_by_topic(hosttags): def register_builtin_host_tags(): global builtin_host_tags, builtin_aux_tags - builtin_host_tags = [ + del builtin_host_tags[:] + builtin_host_tags += [ ('address_family', u'/IP Address Family', [ ('ip-v4-only', u'IPv4 only', ['ip-v4']), @@ -5368,7 +5380,8 @@ def register_builtin_host_tags(): ), ] - builtin_aux_tags = [ + del builtin_aux_tags[:] + builtin_aux_tags += [ ('ip-v4', u'IPv4'), ('ip-v6', u'IPv6') ]

7 years, 5 months

Fixed color of bare text in sidebar snapins

by Lars Michelsen

Module: check_mk Branch: master Commit: 9a1b28d2296e9ff4e1f877d23508e4d0a44a8c05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a1b28d2296e9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 11:59:24 2017 +0200 Fixed color of bare text in sidebar snapins Change-Id: Ib20456b24468795b82a264058b76733d61079c97 --- web/htdocs/sidebar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index fa94229..9583dd5 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -253,6 +253,7 @@ div.snapin div.minisnapin img { div.snapin div.content { padding: 10px; width: 228px; + color: #fff; } div.snapin select {

7 years, 5 months

CME: Also setting replication_paths for customer.mk files on slave sites ( for extraction)

by Lars Michelsen

Module: check_mk Branch: master Commit: 5af3a5035590b34c4c5a3cfc39ac1ff8376a278d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5af3a5035590b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 10:47:32 2017 +0200 CME: Also setting replication_paths for customer.mk files on slave sites (for extraction) Change-Id: I6164126e1464a1e382f8e69d18ad8c05ec65c159 --- web/htdocs/watolib.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fe11289..c823266 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4427,13 +4427,9 @@ class ActivateChangesManager(ActivateChanges): if cmk.is_managed_edition(): managed_snapshots.CMESnapshot(site_id, site_tmp_dir, replicate_components).create_site_snapshot() - customer_components = [ - ( "file", "customer_multisite", "%s/multisite.d/customer.mk" % cmk.paths.default_config_dir), - ( "file", "customer_check_mk", "%s/conf.d/customer.mk" % cmk.paths.default_config_dir), - ] new_paths = [] - for entry in map(list, paths + customer_components): + for entry in map(list, paths): entry[2] = entry[2].replace(cmk.paths.omd_root, site_tmp_dir) new_paths.append(tuple(entry)) paths = new_paths

7 years, 5 months

Improved auth debug logging

by Lars Michelsen

Module: check_mk Branch: master Commit: 93373eddcb943ca6784871cba7c7e14d451c63e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93373eddcb943c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 19 10:23:43 2017 +0200 Improved auth debug logging Change-Id: If0df09eac17c7d56e4b6509eff8db505d6bd1379 --- web/htdocs/login.py | 2 +- web/htdocs/userdb.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index af6a88e..2c47fc6 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -273,7 +273,7 @@ def check_auth(mod_python_req): if user_id and not userdb.is_customer_user_allowed_to_login(user_id): # A CME not assigned with the current sites customer # is not allowed to login - auth_logger.debug("User '%s' is not allowed to login: Invalid customer" % user_id) + auth_logger.debug("User '%s' is not allowed to authenticate: Invalid customer" % user_id) return None return user_id diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 8e33867..699f977 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -1215,6 +1215,7 @@ def hook_login(username, password): if not is_customer_user_allowed_to_login(username): # A CME not assigned with the current sites customer # is not allowed to login + auth_logger.debug("User '%s' is not allowed to login: Invalid customer" % username) return False # Now, after successfull login (and optional user account @@ -1224,6 +1225,7 @@ def hook_login(username, password): # a "!". But when using other conectors it might be neccessary # to validate the user "locked" attribute. if connection.is_locked(username): + auth_logger.debug("User '%s' is not allowed to login: Account locked" % username) return False # The account is locked return result

7 years, 5 months

big upgrade of examples for oracle plugin configuration

by Marcel Arentz

Module: check_mk Branch: master Commit: 534ad1299a363d1c81dff35db843af43e21805d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=534ad1299a363d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Apr 19 11:36:42 2017 +0200 big upgrade of examples for oracle plugin configuration Change-Id: I17cc62efaf6079b089b568e6cc86aace0c286ce3 --- agents/cfg_examples/mk_oracle.cfg | 74 +++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/agents/cfg_examples/mk_oracle.cfg b/agents/cfg_examples/mk_oracle.cfg index 41a81b3..2be78ae 100644 --- a/agents/cfg_examples/mk_oracle.cfg +++ b/agents/cfg_examples/mk_oracle.cfg @@ -1,19 +1,73 @@ -DBUSER=CHECK_MK:<Passwort> +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. -export TNS_ADMIN=/u00/app/oracle/network/admin -### kein ASM bei uns im Einsatz: Skip diese Sections: +### Configuration examples for the mk_oracle plugin -SYNC_ASM_SECTIONS="" -ASYNC_ASM_SECTIONS="" +### set environment for TNS_ADMIN +# export TNS_ADMIN=/u00/app/oracle/network/admin -### Exclude bestimmte Datenbanken bei Bedarf: +### regular credentials for authentication with several +### options for configuration verbosity +# DBUSER='check_mk:myPassword' +# DBUSER='check_mk:myPassword:SYSDBA:localhost:1521' +# DBUSER='check_mk:myPassword::localhost:1521' +# DBUSER='check_mk:myPassword::localhost' -##EXCLUDE_AIMCOND3="ALL" +### Credentials for a specific Schema (CMKD) +# DBUSER_CMKD='check_mk:myPassword:' -##EXCLUDE_AIMCONM0="ALL" +### Credentials for ASM +# ASMUSER='asm_user:asmPassword::localhost' +# ASMUSER='asm_user:asmPassword:SYSASM:localhost' -##EXCLUDE_AIMSTGM1="ALL" +### Only get some SIDs +# ONLY_SIDS='TES CMKD THIS' -##EXCLUDE_AIMDWHM1="ALL" +### Excluding a schema partially or completely +# EXCLUDE_TES='longactivesessions logswitches' +# EXCLUDE_THIS='ALL' + +### Define sections to catch synchroniously or asynchroniously. The first +### example is the default if nothing is specified. Omitted sections will not +### be retrieved. ASM Sections must be specified seperately. The first example +### is also the default. +# SYNC_SECTIONS='instance dataguard_stats logswitches longactivesessions performance processes recovery_area recovery_status sessions undostat' +# SYNC_SECTIONS='instance dataguard_stats processes sessions' +# ASYNC_SECTIONS='jobs locks resumable rman tablespaces ts_quotas' +# ASYNC_SECTIONS='tablespaces locks undostat performance' +# SYNC_ASM_SECTIONS='instance processes' +# SYNC_ASM_SECTIONS='' # retrieve nothing if ASM is not available +# ASYNC_ASM_SECTIONS='asm_diskgroup' + +### Specifies how long asynchronious retrieved data is valid. The Example +### is the default. +# CACHE_MAXAGE=600 + +### If the database is not located on the host with the plugin running you +### can still get monitoring information. The data will be piggybacked to a host +### of your choice in check_mk by added the name at the end of the option: +# REMOTE_INSTANCE_myRemoteHost='remoteUser:remotePassword::myRemoteHost:1521:CMKD:11.2' +# REMOTE_ORACLE_HOME='/u01/app/oracle/product/11.2.0/db_1'

7 years, 5 months

4469 BI aggregations: Views containing multiple aggregations now render faster

by Andreas Boesl

Module: check_mk Branch: master Commit: 999098659845ca6c83ff104fa5f1c5581b091b43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=999098659845ca… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 6 15:28:35 2017 +0200 4469 BI aggregations: Views containing multiple aggregations now render faster Change-Id: I25d0db2968e58eeeec6baf5c6874a2065f1d6e94 --- .werks/4469 | 10 ++++++++++ web/htdocs/bi.py | 29 +++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.werks/4469 b/.werks/4469 new file mode 100644 index 0000000..4c83ce4 --- /dev/null +++ b/.werks/4469 @@ -0,0 +1,10 @@ +Title: BI aggregations: Views containing multiple aggregations now render faster +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1491485215 +Class: feature + + diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index bfd28a6..5253730 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -3123,19 +3123,36 @@ def table(columns, add_headers, only_sites, limit, filters): online_sites = set(map(lambda x: x[0], get_current_sitestats()["online_sites"])) + + # Prefetch data for later usage - this saves lots of redundant livestatus queries + def is_tree_required(tree): + if only_aggr_name and only_aggr_name != tree.get("title"): + return False + + aggr_sites = set(x[0] for x in tree.get("reqhosts")) + if not aggr_sites.intersection(online_sites): + return False + return True + + + required_hosts = set() + for group, trees in items: + for tree in trees: + if not is_tree_required(tree): + continue + required_hosts.update(tree.get("reqhosts")) + status_info = get_status_info(required_hosts) + + for group, trees in items: if only_group not in [ None, group ]: continue for tree in trees: - if only_aggr_name and only_aggr_name != tree.get("title"): + if not is_tree_required(tree): continue - aggr_sites = set(x[0] for x in tree.get("reqhosts")) - if not aggr_sites.intersection(online_sites): - continue - - row = create_aggregation_row(tree) + row = create_aggregation_row(tree, status_info) if row["aggr_state"]["state"] == None: continue # Not yet monitored, aggregation is not displayed

7 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017