Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64140 discussions

Check_MK Git: check_mk: add new check - brocade_fcport

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 173746ba92413910d2ed84148e225b5dde89f5ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=173746ba924139… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Apr 19 19:45:27 2011 +0200 add new check - brocade_fcport --- .bugs/231 | 12 ++ .bugs/232 | 12 ++ .bugs/233 | 11 ++ checks/brocade_fcport | 295 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 330 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=173746ba92…

13 years, 5 months

Check_MK Git: check_mk: BI: reimplement host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c1187fd4a60bcb2641172e40e98678172b3ae32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c1187fd4a60bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 17:59:38 2011 +0200 BI: reimplement host tags --- web/htdocs/bi.py | 97 +++++++++++++++++++------------------------------- web/htdocs/config.py | 5 ++- 2 files changed, 40 insertions(+), 62 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 81a43bd..8c99898 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -140,7 +140,7 @@ def compile_forest(user): for entry in new_entries: remove_empty_nodes(entry) - new_entries = [ e for e in new_entries if len(e[-3]) > 0 ] + new_entries = [ e for e in new_entries if len(e[3]) > 0 ] # enter new aggregations into dictionary for that group entries = cache["forest"].get(group, []) @@ -191,8 +191,8 @@ def compile_rule_node(calllist, lvl): # Execute FOREACH: iterate over matching hosts/services and # for each hit create an argument list where $1$, $2$, ... are # substituted with matched strings. - if calllist[0] == config.FOREACH: - matches = find_matching_services(calllist[1:]) + if calllist[0] in [ config.FOREACH_HOST, config.FOREACH_SERVICE ]: + matches = find_matching_services(calllist[0], calllist[1:]) new_elements = [] for match in matches: args = [ substitute_matches(a, match) for a in arglist ] @@ -203,47 +203,45 @@ def compile_rule_node(calllist, lvl): return compile_aggregation_rule(rule, arglist, lvl) -def find_matching_services(calllist): +def find_matching_services(what, calllist): + # honor list of host tags preceding the host_re + if type(calllist[0]) == list: + required_tags = calllist[0] + calllist = calllist[1:] + else: + required_tags = [] + host_re = calllist[0] - service_re = calllist[1] + if what == config.FOREACH_HOST: + service_re = config.HOST_STATE + else: + service_re = calllist[1] + honor_site = SITE_SEP in host_re matches = set([]) for (site, hostname), (tags, services) in g_user_cache["services"].items(): host_matches = None + if not match_host_tags(tags, required_tags): + continue - # If host ends with '|@all', we need to check host tags instead - # of regexes. - if host_re.endswith('|@all'): - if not match_host_tags(host_re[:-5], tags): - continue - host_matches = [] - elif host_re.endswith('|@all)'): - if not match_host_tags(host_re[1:-6], tags): - continue - host_matches = ( hostname, ) - elif host_re == '@all': - host_matches = [] - elif host_re == '(@all)': - host_matches = ( hostname, ) + # For regex to have '$' anchor for end. Users might be surprised + # to get a prefix match on host names. This is almost never what + # they want. For services this is useful, however. + if host_re.endswith("$"): + anchored = host_re else: - # For regex to have '$' anchor for end. Users might be surprised - # to get a prefix match on host names. This is almost never what - # they want. For services this is useful, however. - if host_re.endswith("$"): - anchored = host_re - else: - anchored = host_re + "$" - - # In order to distinguish hosts with the same name on different - # sites we prepend the site to the host name. If the host specification - # does not contain the site separator - though - we ignore the site - # an match the rule for all sites. - if honor_site: - host_matches = do_match(anchored, "%s%s%s" % (site, SITE_SEP, hostname)) - else: - host_matches = do_match(anchored, hostname) + anchored = host_re + "$" + + # In order to distinguish hosts with the same name on different + # sites we prepend the site to the host name. If the host specification + # does not contain the site separator - though - we ignore the site + # an match the rule for all sites. + if honor_site: + host_matches = do_match(anchored, "%s%s%s" % (site, SITE_SEP, hostname)) + else: + host_matches = do_match(anchored, hostname) if host_matches != None: if config.HOST_STATE in service_re: @@ -277,8 +275,7 @@ def render_forest(): for group, trees in g_user_cache["forest"].items(): html.write("<h2>%s</h2>" % group) for tree in trees: - instargs, node = tree - ascii = render_tree(node) + ascii = render_tree(tree) html.write("<pre>\n" + ascii + "<pre>\n") # Debugging function @@ -438,25 +435,6 @@ def find_remaining_services(hostspec, aggregation): return [ ( [hostspec], hostspec, service ) for service in remaining ] -# Reduce [ [ 'linux', 'test' ], ALL_HOSTS, ... ] to [ 'linux|test|@all', ... ] -# Reduce [ [ 'xsrvab1', 'xsrvab2' ], ... ] to [ 'xsrvab1|xsrvab2', ... ] -# Reduce [ [ ALL_HOSTS, ... ] ] to [ '.*', ... ] -def compile_args(args): - newargs = [] - while len(args) > 0: - if args[0] == config.ALL_HOSTS: - newargs.append('.*') - elif type(args[0]) == list and len(args) >= 2 and args[1] == config.ALL_HOSTS: - newargs.append('|'.join(args[0] + config.ALL_HOSTS)) - args = args[1:] - elif type(args[0]) == list: - newargs.append('|'.join(args[0])) - else: - newargs.append(args[0]) - args = args[1:] - return newargs - - # Helper function that finds all occurrances of a variable # enclosed with $ and $. Returns a list of positions. def find_variables(pattern, varname): @@ -477,15 +455,14 @@ def subst_vars(pattern, arginfo): pattern = pattern.replace('$'+name+'$', value) return pattern -def match_host_tags(host, tags): - required_tags = host.split('|') +def match_host_tags(have_tags, required_tags): for tag in required_tags: if tag.startswith('!'): negate = True tag = tag[1:] else: negate = False - has_it = tag in tags + has_it = tag in have_tags if has_it == negate: return False return True diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 7a1eec2..5421c35 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -456,9 +456,10 @@ host_tags = [] # |____/___| # -ALL_HOSTS = ['@all'] +ALL_HOSTS = '(.*)' HOST_STATE = '__HOST_STATE__' -class FOREACH: pass +class FOREACH_HOST: pass +class FOREACH_SERVICE: pass class REMAINING: pass aggregation_rules = {} aggregations = []

13 years, 5 months

Check_MK Git: check_mk: Do not longer exit on syntax error in autochecks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c7d3c11e51e4a568e3b003c2e26982e108b0bbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c7d3c11e51e4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 16:45:24 2011 +0200 Do not longer exit on syntax error in autochecks Errors are silently ignored. -v will output them. --debug will exit on errors in autochecks files. --- modules/check_mk.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index ab9c142..72c552d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3925,11 +3925,15 @@ def read_all_autochecks(): try: autochecks += eval(file(f).read()) except SyntaxError,e: - sys.stderr.write("Syntax error in file %s: %s\n" % (f, e)) - sys.exit(3) + if opt_verbose: + sys.stderr.write("Syntax error in file %s: %s\n" % (f, e)) + if opt_debug: + sys.exit(3) except Exception, e: - sys.stderr.write("Error in file %s:\n%s\n" % (f, e)) - sys.exit(3) + if opt_verbose: + sys.stderr.write("Error in file %s:\n%s\n" % (f, e)) + if opt_debug: + sys.exit(3) # Exchange inventorized check parameters with those configured by # the user. Also merge with default levels for modern dictionary based checks.

13 years, 5 months

Check_MK Git: check_mk: --debug now automatically implies -v

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e162b9fab2391b3d849de259150d4ad4cd50b375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e162b9fab2391b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 16:44:28 2011 +0200 --debug now automatically implies -v --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 122baf9..5f092ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Call snmp(bulk)walk always with the option -Cc (fixes problems in some cases where OIDs are missing) * Allow merging of dictionary based check parameters + * --debug now implies -v Multisite: * FIX: Nagios-Snapin: avoid duplicate slash in URL diff --git a/modules/check_mk.py b/modules/check_mk.py index c057f92..ab9c142 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -35,8 +35,8 @@ check_mk_version = '(inofficial)' # Some things have to be done before option parsing and might # want to output some verbose messages. if __name__ == "__main__": - opt_verbose = '-v' in sys.argv[1:] or '--verbose' in sys.argv[1:] opt_debug = '--debug' in sys.argv[1:] + opt_verbose = opt_debug or '-v' in sys.argv[1:] or '--verbose' in sys.argv[1:] else: opt_verbose = False opt_debug = False

13 years, 5 months

Check_MK Git: check_mk: Merge dictionary based check parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 629c4360a1530757354a087c76101e41ecb04884 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=629c4360a15307… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 16:37:22 2011 +0200 Merge dictionary based check parameters Currently this works only for filesystem based checks (those using filesystem_default_levels) --- ChangeLog | 6 +++- checks/.f12 | 2 +- checks/df | 3 +- checks/df.include | 8 +----- checks/df_netapp | 2 + checks/df_netapp.include | 2 +- checks/df_netapp32 | 2 + checks/hr_fs | 4 ++- checks/vms_df | 3 +- modules/.f12 | 2 +- modules/check_mk.py | 56 ++++++++++++++++++++++++++++++++------------- 11 files changed, 60 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=629c4360a1…

13 years, 5 months

Check_MK Git: check_mk: BI: new permission for seeing all objects

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf87fb4fe366ad8f74114f0aceeae004e0ffec3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf87fb4fe366ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 15:24:19 2011 +0200 BI: new permission for seeing all objects --- web/htdocs/bi.py | 117 +++++++++++++++++++++++++------------------- web/htdocs/config.py | 5 +- web/htdocs/index.py | 6 ++- web/htdocs/wato.py | 3 +- web/plugins/sidebar/bi.py | 4 +- web/plugins/views/bi.py | 2 +- 6 files changed, 79 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf87fb4fe3…

13 years, 5 months

Check_MK Git: check_mk: BI: fix index of affected services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36301cd23d5de79a0e84e02ff9b89dee55450d30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36301cd23d5de7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 14:05:23 2011 +0200 BI: fix index of affected services --- web/htdocs/bi.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index e3cd2d1..e892544 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -137,21 +137,24 @@ def compile_forest(): for aggr in new_entries: req_hosts = aggr[0] + # All single-host aggregations looked up per host if len(req_hosts) == 1: host = req_hosts[0] # pair of (site, host) entries = g_host_aggregations.get(host, []) entries.append((group, aggr)) g_host_aggregations[host] = entries + # All aggregations containing a specific host for h in req_hosts: entries = g_affected_hosts.get(h, []) entries.append((group, aggr)) g_affected_hosts[h] = entries + # All aggregations containing a specific service services = find_all_leaves(aggr) for s in services: # triples of site, host, service entries = g_affected_services.get(s, []) - entries.append((group, entry)) + entries.append((group, aggr)) g_affected_services[s] = entries # Remember successful compile in cache

13 years, 5 months

Check_MK Git: check_mk: BI: Implement new rule type "REMAINING"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b00a53def9fcf002d467ec26779c41037ea7d24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b00a53def9fcf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 18 17:48:59 2011 +0200 BI: Implement new rule type "REMAINING" --- doc/bi-example.mk | 23 +++++++++++++- web/htdocs/bi.py | 82 ++++++++++++++++++++++++++++++++++++++++++++----- web/htdocs/config.py | 2 +- 3 files changed, 96 insertions(+), 11 deletions(-) diff --git a/doc/bi-example.mk b/doc/bi-example.mk index e8c2d91..4ac9d6e 100644 --- a/doc/bi-example.mk +++ b/doc/bi-example.mk @@ -13,6 +13,8 @@ aggregation_rules["host"] = ( ( "checkmk", [ "$HOST$" ] ), ( "applications", [ "$HOST$" ] ), ( "logfiles", [ "$HOST$" ] ), + ( "hardware", [ "$HOST$" ] ), + ( "other", [ "$HOST$" ] ), ] ) @@ -41,7 +43,16 @@ aggregation_rules["cpuandmem"] = ( [ "HOST" ], "worst", [ - ( "$HOST$", "CPU|Memory|Kernel" ), + ( "$HOST$", "CPU|Memory|Kernel|Number of threads" ), + ] +) + +aggregation_rules["hardware"] = ( + "Hardware", + [ "HOST" ], + "worst", + [ + ( "$HOST$", "IPMI|RAID" ), ] ) @@ -50,6 +61,7 @@ aggregation_rules["networking"] = ( [ "HOST" ], "worst", [ + ( "$HOST$", "NFS" ), ( FOREACH, "$HOST$", "NIC ([a-z]*).* counters", "nic", [ "$HOST$", "$1$" ] ), ] ) @@ -89,6 +101,15 @@ aggregation_rules["applications"] = ( ] ) +aggregation_rules["other"] = ( + "Other", + [ "HOST" ], + "worst", + [ + ( "$HOST$", REMAINING ), + ] +) + aggregations += [ ( "Hosts", FOREACH, "(.*)", "Check_MK$", "host", ["$1$"] ), ] diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 10932f0..e3cd2d1 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -123,6 +123,11 @@ def compile_forest(): group = entry[0] new_entries = compile_rule_node(entry[1:], 0) + for entry in new_entries: + remove_empty_nodes(entry) + + new_entries = [ e for e in new_entries if len(e[-3]) > 0 ] + # enter new aggregations into dictionary for that group entries = g_aggregation_forest.get(group, []) entries += new_entries @@ -305,10 +310,34 @@ def find_all_leaves(node): entries += find_all_leaves(n) return entries +def remove_empty_nodes(node): + if len(node) == 3: # leaf node + return node + else: + subnodes = node[3] + for i in range(0, len(subnodes)): + remove_empty_nodes(subnodes[i]) + for i in range(0, len(subnodes))[::-1]: + if node_is_empty(subnodes[i]): + del subnodes[i] + +def node_is_empty(node): + if len(node) == 3: + return False # leaf node + else: + return len(node[3]) == 0 + # Precompile one aggregation rule. This outputs a list of trees. # The length of this list is current either 0 or 1 def compile_aggregation_rule(rule, args, lvl = 0): + # When compiling root nodes we essentially create + # complete top-level aggregations. In that case we + # need to deal with REMAINING-entries + if lvl == 0: + global g_remaining_refs + g_remaining_refs = [] + if len(rule) != 4: raise MKConfigError("<h3>Invalid aggregation rule</h1>" "Aggregation rules must contain four elements: description, argument list, " @@ -339,8 +368,21 @@ def compile_aggregation_rule(rule, args, lvl = 0): # Each node can return more than one incarnation (due to regexes in # leaf nodes and FOREACH in rule nodes) - if node[1] == config.HOST_STATE: - new_elements = compile_leaf_node(subst_vars(node[0], arginfo)) + if node[1] in [ config.HOST_STATE, config.REMAINING ]: + new_elements = compile_leaf_node(subst_vars(node[0], arginfo), node[1]) + new_new_elements = [] + for entry in new_elements: + # Postpone: remember reference to list where we need to add + # remaining services of host + if entry[0] == config.REMAINING: + # create unique pointer which we find later + placeholder = ([], (None, None), str(len(g_remaining_refs))) + g_remaining_refs.append((entry[1], elements, placeholder)) + new_new_elements.append(placeholder) + else: + new_new_elements.append(entry) + new_elements = new_new_elements + elif type(node[-1]) != list: new_elements = compile_leaf_node(subst_vars(node[0], arginfo), subst_vars(node[1], arginfo)) else: @@ -351,13 +393,31 @@ def compile_aggregation_rule(rule, args, lvl = 0): elements += new_elements - if len(elements) == 0: - return [] # this aggregation is empty - needed_hosts = set([]) for element in elements: needed_hosts.update(element[0]) - return [ (list(needed_hosts), inst_description, funcname, elements) ] + + aggregation = (list(needed_hosts), inst_description, funcname, elements) + + # Handle REMAINING references, if we are a root node + if lvl == 0: + for hostspec, ref, placeholder in g_remaining_refs: + new_entries = find_remaining_services(hostspec, aggregation) + where_to_put = ref.index(placeholder) + ref[where_to_put:where_to_put+1] = new_entries + + return [ aggregation ] + + +def find_remaining_services(hostspec, aggregation): + tags, all_services = g_services[hostspec] + all_services = set(all_services) + for site, host, service in find_all_leaves(aggregation): + if (site, host) == hostspec: + all_services.discard(service) + remaining = list(all_services) + remaining.sort() + return [ ( [hostspec], hostspec, service ) for service in remaining ] # Reduce [ [ 'linux', 'test' ], ALL_HOSTS, ... ] to [ 'linux|test|@all', ... ] @@ -446,9 +506,13 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): if service_re == config.HOST_STATE: found.append(([(site, hostname)], (site, hostname), config.HOST_STATE)) - for service in services: - if regex(service_re).match(service): - found.append(([(site, hostname)], (site, hostname), service)) + elif service_re == config.REMAINING: + found.append((config.REMAINING, (site, hostname))) + + else: + for service in services: + if regex(service_re).match(service): + found.append(([(site, hostname)], (site, hostname), service)) found.sort() return found diff --git a/web/htdocs/config.py b/web/htdocs/config.py index de72f87..ed5a284 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -457,8 +457,8 @@ host_tags = [] ALL_HOSTS = ['@all'] HOST_STATE = '__HOST_STATE__' -class NEED: pass class FOREACH: pass +class REMAINING: pass aggregation_rules = {} aggregations = [] aggregation_functions = {}

13 years, 5 months

Check_MK Git: check_mk: BI: reengineered rule compilation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85fd729ed271bb316c45bb9800cc98359959be3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85fd729ed271bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 17 18:58:14 2011 +0200 BI: reengineered rule compilation Note: old rule definitions are sligthly incompatible. As soon as the new way is fixed, we will update the documentation. The new way is much clearer and avoid several subtle problems while keeping all possibilities of the old method. --- doc/bi-example-oracle.mk | 85 +++++++++ doc/bi-example.mk | 95 ++++++++++ doc/bi.example | 69 ------- web/htdocs/bi.py | 465 +++++++++++++++------------------------------- web/htdocs/config.py | 1 + 5 files changed, 335 insertions(+), 380 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=85fd729ed2…

13 years, 5 months

Check_MK Git: check_mk: smart-plugins: speed up by avoiding three processes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee5d9926047375cb49f6efc399ea7c99c6302c7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee5d9926047375… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 17 10:01:31 2011 +0200 smart-plugins: speed up by avoiding three processes --- agents/plugins/smart | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart index eda9307..220fef6 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -5,8 +5,8 @@ if which smartctl > /dev/null 2>&1 ; then echo '<<<smart>>>' for D in /dev/[sh]d[a-z] /dev/[sh]d[a-z][a-z]; do N=${D##*/} - VEND=$(cat /sys/block/$N/device/vendor | tr -d ' ') - MODEL=$(cat /sys/block/$N/device/model | tr ' ' _ | sed 's/_*$//g') + VEND=$(tr -d ' ' < /sys/block/$N/device/vendor) + MODEL=$(sed -e 's/ /_/g' -e 's/_*$//g' < /sys/block/$N/device/model) smartctl -A $D | grep Always | sed "s|^|$D $VEND $MODEL |" - done + done 2>/dev/null fi

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits