Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: job check: better handling of unexpected agent output

by Lars Michelsen

Module: check_mk Branch: master Commit: da0ec72f0cb658064e3832c27fc39bf74eaf49a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da0ec72f0cb658… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 19 10:05:10 2013 +0200 job check: better handling of unexpected agent output --- ChangeLog | 1 + checks/job | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e5498b3..efa5c6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * fileinfo: no longer inventorize missing files(reported by windows agent) * cluster hosts: removed agent version output from Check_MK service (this was misleading for different agent versions on multiple nodes) + * job check: better handling of unexpected agent output Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/checks/job b/checks/job index 1082dbc..3a75bff 100644 --- a/checks/job +++ b/checks/job @@ -70,7 +70,7 @@ def job_parse(item, info): elif found and line[0] == '==>': break # Stop at next section - elif found: + elif found and len(line) == 2: key, val = line # Convert several keys/values if key == 'real_time':

11 years

Check_MK Git: check_mk: Updated bug entries #0931

by Andreas Boesl

Module: check_mk Branch: master Commit: 76b27ee50117d069b1dcb3b95f8bea1b2c6524e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76b27ee50117d0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 19 09:51:23 2013 +0200 Updated bug entries #0931 --- .bugs/931 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/931 b/.bugs/931 new file mode 100644 index 0000000..169eb1d --- /dev/null +++ b/.bugs/931 @@ -0,0 +1,13 @@ +Title: Cluster requires same agent type as cluster node +Component: core +State: open +Date: 2013-06-19 09:46:28 +Targetversion: future +Class: bug + +If the agent type attribute of a cluster and its notes differs +the check_mk agent will fail + +This is caused by the various is_tcp_host is_snmp_host precompiled functions +which return fixed values. The nodes receive the value of the cluster - +thus leading to the checks downfall.

11 years

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d00acb4c9a9b5f9c2bfa55584da8eedd2cc615a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d00acb4c9a9b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 18 16:41:21 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years

Check_MK Git: check_mk: FIX: LDAP: Disabling use of referrals in active directory configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: a501b97dfaffbede700b82ba663bba0eabcf9740 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a501b97dfaffbe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 18 16:40:38 2013 +0200 FIX: LDAP: Disabling use of referrals in active directory configuration Conflicts: ChangeLog --- ChangeLog | 2 ++ web/plugins/userdb/ldap.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 72512ce..e5498b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -188,6 +188,8 @@ Checks & Agents: * FIX: winperf_processor: fix case where CPU percent is exactly 100% + Multisite: + * FIX: LDAP: Disabling use of referrals in active directory configuration 1.2.2p2: Core: diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index eeb94f2..ae51e41 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -130,6 +130,11 @@ def ldap_connect(): ldap_connection.protocol_version = config.ldap_connection['version'] ldap_connection.network_timeout = config.ldap_connection.get('connect_timeout', 2.0) + # When using the domain top level as base-dn, the subtree search stumbles with referral objects. + # whatever. We simply disable them here when using active directory. Hope this fixes all problems. + if config.ldap_connection['type'] == 'ad': + ldap_connection.set_option(ldap.OPT_REFERRALS, 0) + ldap_default_bind() # on success, store the connection options the connection has been made with

11 years

Check_MK Git: check_mk: liveproxyd: disable status dump per default

by Mathias Kettner

Module: check_mk Branch: master Commit: af089052e8d6cfc4dbf7c5133d5fe011c782d3ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af089052e8d6cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 18 13:36:01 2013 +0200 liveproxyd: disable status dump per default --- doc/treasures/liveproxy/liveproxyd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index a87cf10..11e9001 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -6,7 +6,7 @@ import os, sys, getopt, signal, time, socket, select VERSION="1.2.3i1" sites = {} -dump_interval = 1 +dump_interval = None # .--Proxy---------------------------------------------------------------. # | ____ | @@ -85,7 +85,7 @@ def liveproxyd_run(): garbage_collect_sockets() now = time.time() - if now - last_dump > dump_interval: + if dump_interval != None and now - last_dump > dump_interval: dump_state() last_dump = now

11 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 744a7feba354a0796fc7e5df6a678fcc5c108c47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=744a7feba354a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 18 13:36:02 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: snmp retries can now be set to 0 via WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: d59165f0ff08d4fd6c00a75086b20e9ef9c22140 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d59165f0ff08d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 18 11:43:54 2013 +0200 snmp retries can now be set to 0 via WATO --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8ef77b0..df44668 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1706,7 +1706,7 @@ register_rule(group, title = _("Number of retries"), help = _("The default is 5."), default_value = 5, - minvalue = 1, + minvalue = 0, maxvalue = 50, ) ),

11 years

Check_MK Git: check_mk: Fixed initialization of new ip lookup cache

by Lars Michelsen

Module: check_mk Branch: master Commit: 31c3e1312f5919f4d691bb6e5d118ca98c5c4ad3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31c3e1312f5919… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 18 10:25:22 2013 +0200 Fixed initialization of new ip lookup cache --- modules/check_mk.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b259b55..1dcdc0c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -330,7 +330,7 @@ snmp_check_interval = [] # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None # in memory cache, contains permanently cached ipaddresses from ipaddresses.cache during runtime -g_ip_lookup_cache = {} +g_ip_lookup_cache = None # The following data structures will be filled by the various checks # found in the checks/ directory. @@ -1067,6 +1067,8 @@ def lookup_ipaddress(hostname): if hostname in g_dns_cache: return g_dns_cache[hostname] + init_ip_lookup_cache() + # Now do the actual DNS lookup try: ipa = socket.gethostbyname(hostname) @@ -1075,9 +1077,8 @@ def lookup_ipaddress(hostname): if ipa != g_ip_lookup_cache.get(hostname): g_ip_lookup_cache[hostname] = ipa write_ip_lookup_cache() - except Exception, e: + except: # Initialize the lookup cache when called for the first time - init_ip_lookup_cache() if hostname in g_ip_lookup_cache: ipa = g_ip_lookup_cache[hostname] else: @@ -1088,7 +1089,11 @@ def lookup_ipaddress(hostname): def init_ip_lookup_cache(): global g_ip_lookup_cache - g_ip_lookup_cache = eval(file(var_dir + '/ipaddresses.cache').read()) + if g_ip_lookup_cache is None: + try: + g_ip_lookup_cache = eval(file(var_dir + '/ipaddresses.cache').read()) + except: + g_ip_lookup_cache = {} def write_ip_lookup_cache(): file(var_dir + '/ipaddresses.cache', 'w').write(repr(g_ip_lookup_cache))

11 years

Check_MK Git: check_mk: Introduced permanent host address resolver cache

by Lars Michelsen

Module: check_mk Branch: master Commit: b452beb777e858283eaa35b48f5cd88907a1d2a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b452beb777e858… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 18 10:19:58 2013 +0200 Introduced permanent host address resolver cache --- ChangeLog | 2 ++ modules/check_mk.py | 29 +++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0e0ed5..72512ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.2.3i2: Core: * New option -B for just generating the configuration + * Introduced persistent host address lookup cache to prevent issues + loading an unchanged configuration after a single address is not resolvable anymore Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths diff --git a/modules/check_mk.py b/modules/check_mk.py index 947b4f0..b259b55 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -72,8 +72,6 @@ else: local_doc_dir = None local_locale_dir = None - - # +----------------------------------------------------------------------+ # | ____ _ _ | # | | _ \ __ _| |_| |__ _ __ __ _ _ __ ___ ___ ___ | @@ -331,6 +329,8 @@ snmp_check_interval = [] # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None +# in memory cache, contains permanently cached ipaddresses from ipaddresses.cache during runtime +g_ip_lookup_cache = {} # The following data structures will be filled by the various checks # found in the checks/ directory. @@ -1067,15 +1067,32 @@ def lookup_ipaddress(hostname): if hostname in g_dns_cache: return g_dns_cache[hostname] - # No do the actual DNS lookup + # Now do the actual DNS lookup try: ipa = socket.gethostbyname(hostname) - except: - g_dns_cache[hostname] = None - raise + + # Cache the result (persistant) when resolving succeeded + if ipa != g_ip_lookup_cache.get(hostname): + g_ip_lookup_cache[hostname] = ipa + write_ip_lookup_cache() + except Exception, e: + # Initialize the lookup cache when called for the first time + init_ip_lookup_cache() + if hostname in g_ip_lookup_cache: + ipa = g_ip_lookup_cache[hostname] + else: + g_dns_cache[hostname] = None + raise g_dns_cache[hostname] = ipa return ipa +def init_ip_lookup_cache(): + global g_ip_lookup_cache + g_ip_lookup_cache = eval(file(var_dir + '/ipaddresses.cache').read()) + +def write_ip_lookup_cache(): + file(var_dir + '/ipaddresses.cache', 'w').write(repr(g_ip_lookup_cache)) + def agent_port_of(hostname): ports = host_extra_conf(hostname, agent_ports) if len(ports) == 0:

11 years

Check_MK Git: check_mk: Fixed issues with lowercase transformation of username in ldap auth

by Lars Michelsen

Module: check_mk Branch: master Commit: efd2e00db4c4eeb930c72e90dcd9410b8e0fc98b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efd2e00db4c4ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 18 09:36:24 2013 +0200 Fixed issues with lowercase transformation of username in ldap auth --- web/htdocs/login.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index f6f1451..35cb19c 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -183,10 +183,14 @@ def do_login(): # False -> failed result = userdb.hook_login(username, password) if result: + # use the username provided by the successful login function, this function + # might have transformed the username provided by the user. e.g. switched + # from mixed case to lower case. + username = result + # reset failed login counts userdb.on_succeeded_login(username) - username = result # The login succeeded! Now: # a) Set the auth cookie # b) Unset the login vars in further processing

11 years

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013