Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f029c2b75ae24ddb16143c61eace34fc4acb8e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f029c2b75ae24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 15:27:13 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years

Check_MK Git: check_mk: FIX: Removing distributed wato file when local site could not be determined

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5dce5d71ac9fbb338f5479bb37192de1e2df0579 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dce5d71ac9fbb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 14:48:25 2012 +0200 FIX: Removing distributed wato file when local site could not be determined --- web/htdocs/wato.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e078419..ea70a48 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6773,12 +6773,18 @@ def update_distributed_wato_file(sites): # are currently in the process of saving the new # site configuration. distributed = False + found_local = False for siteid, site in sites.items(): if site.get("replication"): distributed = True if site_is_local(siteid): + found_local = True create_distributed_wato_file(siteid, site.get("replication")) - if not distributed: + + # Remove the distributed wato file + # a) If there is no distributed WATO setup + # b) If the local site could not be gathered + if not distributed or not found_local: delete_distributed_wato_file() #.

12 years

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2ebae85e4aea112e9ff658473db71f7313ec9d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2ebae85e4aea1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 15:15:27 2012 +0200 Updated changelog --- ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79654a4..708233c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,8 @@ * FIX: User list shows names of contactgroups when no alias given * FIX: Reflecting alternative mode of check_http (check ssl certificate age) in WATO rule editor + * FIX: Fixed monitoring of slave hosts in master site in case of special + distributed wato configurations BI: * Great speed up of rule compilation in large environments @@ -91,6 +93,7 @@ * FIX: fixed bug showing only sidebar after re-login in multisite * FIX: fixed logwatch loosing the master_url parameter in distributed setups * FIX: Fixed doubled var "site" in view editor (site and siteopt filter) + * FIX: Don't crash on requests without User-Agent HTTP header Livecheck: * FIX: Compile livecheck also if diet libc is missing @@ -148,7 +151,6 @@ folder attributes * FIX: fix exception on unknown value in DropdownChoice * FIX: add service specification to ruleset Delay service notifications -<<<<<<< Updated upstream * FIX: fixed problem with disabled sites in WATO * FIX: massive speedup when changing roles/users and activing changes (especially when you have a larger number of users and folders) @@ -156,9 +158,7 @@ * FIX: fixed default setting if "Hide names of configuration variables" in WATO * FIX: ListOfString Textboxes (e.g. parents of folders) do now extend in IE -======= * FIX: fixed duplicated sections of permissions in rule editor ->>>>>>> Stashed changes BI: * New iterators FOREACH_CHILD and FOREACH_PARENT

12 years

Check_MK Git: check_mk: BI: add test comments

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f9433767382fb2aecce810805f5fd7d4a4d49ca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9433767382fb2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 15:05:23 2012 +0200 BI: add test comments --- web/htdocs/bi.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 6df9a41..79870d2 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -198,6 +198,8 @@ def compile_forest(user): } g_user_cache = cache + # before = time.time() + for entry in config.aggregations: if len(entry) < 3: raise MKConfigError("<h1>Invalid aggregation <tt>%s</tt></h1>" @@ -240,6 +242,9 @@ def compile_forest(user): # Remember successful compile in cache g_cache[user] = cache + # after = time.time() + # file("/tmp/bi.perf", "a").write("Dauer: %.3f sec\n" % (after - before)) + # Execute an aggregation rule, but prepare arguments # and iterate FOREACH first @@ -672,6 +677,15 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): "host" : (site, hostname)}) else: + # found.append({"type" : NT_LEAF, + # "reqhosts" : [(site, hostname)], + # "host" : (site, hostname), + # "service" : "FOO", + # "title" : "Foo bar", + # }) + # continue + + for service in services: mo = (service_re, service) if mo in service_nomatch_cache:

12 years

Check_MK Git: check_mk: BI: common cache for all users with bi.see_all

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5aedf26d9ddd354d8a06d6ab4a6459785f1833c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5aedf26d9ddd35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 15:04:26 2012 +0200 BI: common cache for all users with bi.see_all --- web/htdocs/bi.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 3be9a56..7daee3d 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -167,6 +167,11 @@ def compile_forest(user): global g_config_information g_config_information = new_config_information + # OPTIMIZE: All users that have the permissing bi.see_all + # can use the same cache. + if config.may("bi.see_all"): + user = '<<<see_all>>>' + # Try to get data from per-user cache: cache = g_cache.get(user) if cache:

12 years

Check_MK Git: check_mk: BI: Remove invalid False

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a7a0f72cf0e1c934cc666119d895917b302c4afe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7a0f72cf0e1c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 15:05:02 2012 +0200 BI: Remove invalid False --- web/htdocs/bi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 7daee3d..6df9a41 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -638,7 +638,7 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): for (site, hostname), (tags, services, childs, parents) in entries: # If host ends with '|@all', we need to check host tags instead # of regexes. - if False and host_re.endswith('|@all'): + if host_re.endswith('|@all'): if not match_host_tags(host_re[:-5], tags): continue elif host_re != '@all':

12 years

Check_MK Git: check_mk: BI: cosmetic code cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: efdf363a7089cfea063632af783c9830b0239094 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efdf363a7089cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 14:00:20 2012 +0200 BI: cosmetic code cleanup --- web/htdocs/bi.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index d293ab3..c772a73 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -178,14 +178,14 @@ def compile_forest(user): services, services_by_hostname = load_services() cache = { - "forest" : {}, + "forest" : {}, "aggregations_by_hostname" : {}, - "host_aggregations" : {}, - "affected_hosts" : {}, - "affected_services": {}, - "services" : services, - "services_by_hostname" : services_by_hostname, - "see_all" : config.may("bi.see_all"), + "host_aggregations" : {}, + "affected_hosts" : {}, + "affected_services": {}, + "services" : services, + "services_by_hostname" : services_by_hostname, + "see_all" : config.may("bi.see_all"), } g_user_cache = cache

12 years

Check_MK Git: check_mk: BI: Inline docu update

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4e46f33af3f51520d0be7eeb94eda301f7cc4c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4e46f33af3f51… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 15:04:03 2012 +0200 BI: Inline docu update --- web/htdocs/bi.py | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c772a73..3be9a56 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -83,14 +83,18 @@ SITE_SEP = '#' # format of a node # { -# "type" : NT_LEAF, NT_RULE, NT_REMAINING, +# "type" : NT_LEAF, NT_RULE, NT_REMAINING, # "reqhosts" : [ list of required hosts ], -# "host" : host spec for leaf node, -# "service" : service name for leaf node, missing if HOST_STATE -# "title" : title in case of rule nodes -# "hidden" : True if hidden -# "func" : Name of aggregation function for rule nodes -# "nodes" : List of subnodes for rule nodes +# "hidden" : True if hidden +# +# SPECIAL KEYS FOR NT_LEAF: +# "host" : host specification, +# "service" : service name, missing for leaf type HOST_STATE +# +# SPECIAL KEYS FOR NT_RULE: +# "title" : title +# "func" : Name of aggregation function, e.g. "count!2!1" +# "nodes" : List of subnodes # } NT_LEAF = 1

12 years

Check_MK Git: check_mk: Fixed syntax of zypper check output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 718b409871dfa13a8d283139157b362010c3e7de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=718b409871dfa1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 13:57:10 2012 +0200 Fixed syntax of zypper check output --- checks/zypper | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/checks/zypper b/checks/zypper index f5cb3c4..ae27d81 100644 --- a/checks/zypper +++ b/checks/zypper @@ -56,7 +56,7 @@ def check_zypper(_no_item, _no_params, info): state = 0 - infotext = nagios_state_names[state] + " - %d updates" % updates + infotext = " - %d updates" % updates if updates: patch_items = patch_types.items() patch_items.sort() @@ -77,12 +77,9 @@ def check_zypper(_no_item, _no_params, info): state = max(1, state) infotext += ", %d locks(!)" % len(locks) - return state, infotext + return state, nagios_state_names[state] + infotext - - return 3, "Hirni" - check_info['zypper'] = { "check_function" : check_zypper, "inventory_function" : inventory_zypper,

12 years

Check_MK Git: check_mk: FIX: zypper: deal with output with only 5 columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24cb171473ec0a2238503072e5cf4135f40fff58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24cb171473ec0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 13:54:36 2012 +0200 FIX: zypper: deal with output with only 5 columns --- checks/zypper | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/checks/zypper b/checks/zypper index 49a6a4c..f5cb3c4 100644 --- a/checks/zypper +++ b/checks/zypper @@ -46,7 +46,7 @@ def check_zypper(_no_item, _no_params, info): locks = [] for line in info: # 5 patches needed (2 security patches) - if len(line) >= 6 and line[4].strip() == 'needed': + if len(line) >= 5 and line[4].strip() == 'needed': patch_type = line[3].strip() patch_types.setdefault(patch_type, 0) patch_types[patch_type] += 1 @@ -54,12 +54,7 @@ def check_zypper(_no_item, _no_params, info): elif len(line) == 4: locks.append(line[1]) - if patch_types.get('security'): - state = 2 - elif updates: - state = 1 - else: - state = 0 + state = 0 infotext = nagios_state_names[state] + " - %d updates" % updates if updates: @@ -67,7 +62,15 @@ def check_zypper(_no_item, _no_params, info): patch_items.sort() infos = [] for t,c in patch_items: - infos.append("%s: %d(%s)" % (t, c, t == "security" and '!!' or '!')) + if t == "security": + marker = '(!!)' + state = 2 + elif t == "recommended": + marker = '(!)' + state = max(state, 1) + else: + marker = '' + infos.append("%s: %d%s" % (t, c, marker)) infotext += " (" + ", ".join(infos) + ")" if locks:

12 years

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012