Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

Check_MK Git: check_mk: FIX: install missing example icons in web/htdocs/ images/icons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a79dbabacd85a7350a881a96a367e203842b4ce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a79dbabacd85a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 14:12:00 2011 +0200 FIX: install missing example icons in web/htdocs/images/icons --- ChangeLog | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f71416a..6dbf430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * --debug now implies -v Multisite: + * FIX: install missing example icons in web/htdocs/images/icons * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar * FIX: ignore case when sorting groups in ...groups snapin diff --git a/Makefile b/Makefile index 567195d..86ffc02 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ dist: mk-livestatus mkdir -p $(DISTNAME) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) - tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/*/*.{wav,jpg,png,gif,ico,js} htdocs/*.{py,css} plugins/*/*.py) + tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/images/icons/*.png htdocs/*/*.{wav,jpg,png,gif,ico,js} htdocs/*.{py,css} plugins/*/*.py) tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar czf $(DISTNAME)/pnp-rraconf.tar.gz $(TAROPTS) -C pnp-rraconf $$(cd pnp-rraconf ; ls *.rra.cfg README.rra)

13 years, 5 months

Check_MK Git: check_mk: FIX: cmk -D: drop obsolete (and always empty) Notification:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bb7c5b71deef7fd4ef39f75082750440c8a6626d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb7c5b71deef7f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:54:04 2011 +0200 FIX: cmk -D: drop obsolete (and always empty) Notification: --- ChangeLog | 1 + modules/check_mk.py | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee32a22..f71416a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: cmk -D: drop obsolete (and always empty) Notification: * FIX: better handling of broken checks returning empty services * FIX: fix computation of weight when averaging * FIX: fix detection of missing OIDs (led to empty lines) diff --git a/modules/check_mk.py b/modules/check_mk.py index aaa3b31..847a6c1 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2919,8 +2919,6 @@ def dump_host(hostname): print tty_yellow + "Parents: " + tty_normal + ", ".join(parents_list) print tty_yellow + "Host groups: " + tty_normal + ", ".join(hostgroups_of(hostname)) print tty_yellow + "Contact groups: " + tty_normal + ", ".join(host_contactgroups_of([hostname])) - notperiod = (host_extra_conf(hostname, host_notification_periods) + [""])[0] - print tty_yellow + "Notification: " + tty_normal + notperiod agenttype = "TCP (port: %d)" % agent_port if is_snmp_host(hostname): credentials = snmp_credentials_of(hostname)

13 years, 5 months

Check_MK Git: check_mk: FIX: local: fixed search for custom templates PNP template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e48fa815441715e759e918e71fb4ce5dec91094 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e48fa81544171… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:41:14 2011 +0200 FIX: local: fixed search for custom templates PNP template --- ChangeLog | 1 + pnp-templates/check_mk-local.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4833744..ee32a22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: local: fixed search for custom templates PNP template * FIX: if/if64: always generate unique items (in case ifAlias is used) * FIX: ipmi: fix ugly ouput in case of warning and error * FIX: vms_df: fix, was completely broken due to conversion to df.include diff --git a/pnp-templates/check_mk-local.php b/pnp-templates/check_mk-local.php index 1f3914f..9e55712 100644 --- a/pnp-templates/check_mk-local.php +++ b/pnp-templates/check_mk-local.php @@ -25,7 +25,7 @@ // try to find template matching a prefix of the service // description first. Slashes are replaced by underscores. -$template_dirs = array('.'); +$template_dirs = array('templates'); if (isset($this->config->conf['template_dirs'])) { $template_dirs = $this->config->conf['template_dirs']; }

13 years, 5 months

Check_MK Git: check_mk: FIX: better handling of broken checks returning empty services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: deb064d6fca7512417a5853c8c2ca8c08187da41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deb064d6fca751… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 10:40:26 2011 +0200 FIX: better handling of broken checks returning empty services --- ChangeLog | 1 + modules/check_mk.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f092ce..0994c75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: better handling of broken checks returning empty services * FIX: fix computation of weight when averaging * FIX: fix detection of missing OIDs (led to empty lines) * SNMP scan functions can now call oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") diff --git a/modules/check_mk.py b/modules/check_mk.py index 917db22..aaa3b31 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -989,7 +989,7 @@ def extra_summary_service_conf_of(hostname, description): def extra_conf_of(confdict, hostname, service): result = "" for key, conflist in confdict.items(): - if service: + if service != None: values = service_extra_conf(hostname, service, conflist) else: values = host_extra_conf(hostname, conflist) @@ -1763,6 +1763,12 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals item, comment, paramstring = entry description = service_description(checkname, item) + # make sanity check + if len(description) == 0: + sys.stderr.write("%s: Check %s returned empty service description - ignoring it.\n" % + (hostname, checkname)) + continue + # Find logical host this check belongs to. The service might belong to a cluster. hn = host_of_clustered_service(hostname, description)

13 years, 5 months

Check_MK Git: check_mk: check_default_levels: fix initializiation problem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 395778b1c096e268a7dd5a9e80c57f9185213d20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=395778b1c096e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 20:28:23 2011 +0200 check_default_levels: fix initializiation problem --- checks/brocade_fcport | 113 ++++++++++++++++++++++++------------------------- modules/check_mk.py | 8 ++++ 2 files changed, 64 insertions(+), 57 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=395778b1c0…

13 years, 5 months

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

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011