Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Allow to install MKP packages in OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27292bf35b1729817246172f112f6838f54ab86e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27292bf35b1729… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 3 15:23:10 2010 +0100 Allow to install MKP packages in OMD --- ChangeLog | 3 ++ modules/check_mk.py | 66 +++++++++++++++++++++++++++++++++++++++++-------- modules/packaging.py | 33 +++++++++++++++++------- 3 files changed, 81 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index d769641..d87eb62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ then after an error with one of those two agents checks from the other haven't been executed. This is fixed now. Inventory check is still not complete in that error condition. + * Packages (MKP): Allow to create and install packages within OMD! + Files are installed below ~/local/share/check_mk. No root permissions + are neccessary Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/modules/check_mk.py b/modules/check_mk.py index b1cd68c..7d76c07 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -43,6 +43,28 @@ else: opt_debug = False opt_config_check = False +# are we running OMD? If yes, honor local/ hierarchy +omd_root = os.getenv("OMD_ROOT", None) +if omd_root: + local_share = omd_root + "/local/share/check_mk" + local_checks_dir = local_share + "/checks" + local_check_manpages_dir = local_share + "/checkman" + local_agents_dir = local_share + "/agents" + local_web_dir = local_share + "/web" + local_pnp_templates_dir = local_share + "/pnp-templates" + local_pnp_rraconf_dir = local_share + "/pnp-rraconf" + local_doc_dir = omd_root + "/local/share/doc/check_mk" +else: + local_checks_dir = None + local_check_manpages_dir = None + local_agents_dir = None + local_web_dir = None + local_pnp_templates_dir = None + local_pnp_rraconf_dir = None + local_doc_dir = None + + + # +----------------------------------------------------------------------+ # | ____ _ _ | # | | _ \ __ _| |_| |__ _ __ __ _ _ __ ___ ___ ___ | @@ -349,7 +371,10 @@ def precompile_filesystem_levels(host, item, params): # Do not read in the checks if check_mk is called as module if __name__ == "__main__": - for f in glob.glob(checks_dir + "/*"): + filelist = glob.glob(checks_dir + "/*") + if local_checks_dir: + filelist += glob.glob(local_checks_dir + "/*") + for f in filelist: if not f.endswith("~"): # ignore emacs-like backup files try: execfile(f) @@ -1809,6 +1834,8 @@ def reread_autochecks(): # +----------------------------------------------------------------------+ def find_check_plugin(checktype): + if local_checks_dir and os.path.exists(local_checks_dir + "/" + checktype): + return local_checks_dir + "/" + checktype filename = checks_dir + "/" + checktype if os.path.exists(filename): return filename @@ -2026,20 +2053,27 @@ def get_tty_size(): return (24, 80) +def all_manuals(): + entries = dict([(fn, check_manpages_dir + "/" + fn) for fn in os.listdir(check_manpages_dir)]) + if local_check_manpages_dir and os.path.exists(local_check_manpages_dir): + entries.update(dict([(fn, local_check_manpages_dir + "/" + fn) for fn in os.listdir(local_check_manpages_dir)])) + return entries + def list_all_manuals(): table = [] - for filename in os.listdir(check_manpages_dir): + for filename, path in all_manuals().items(): if filename.endswith("~"): continue + try: - for line in file(check_manpages_dir + "/" + filename): + for line in file(path): if line.startswith("title:"): table.append((filename, line.split(":", 1)[1].strip())) except: pass table.sort() - print_table(['Check type', 'Title'], [tty_blue, tty_cyan], table) + print_table(['Check type', 'Title'], [tty_bold, tty_normal], table) def show_check_manual(checkname): bg_color = 4 @@ -2054,11 +2088,9 @@ def show_check_manual(checkname): parameters_color = tty(6,4,1) examples_color = tty(6,4,1) - filename = check_manpages_dir + "/" + checkname - try: - f = file(filename) - except: - print "No manpage for %s. Sorry." % checkname + filename = all_manuals().get(checkname) + if not filename: + sys.stdout.write("No manpage for %s. Sorry." % checkname) return sections = {} @@ -2069,7 +2101,7 @@ def show_check_manual(checkname): empty_line_count = 0 try: - for line in f: + for line in file(filename): lineno += 1 if line.startswith(' ') and line.strip() != "": # continuation line empty_line_count = 0 @@ -2100,7 +2132,6 @@ def show_check_manual(checkname): current_variable, restofline = line.split(':', 1) current_section.append((current_variable, restofline.lstrip())) except Exception, e: - print current_section sys.stderr.write("Syntax error in %s line %d (%s).\n" % (filename, lineno, e)) sys.exit(1) @@ -2633,6 +2664,7 @@ def show_paths(): conf = 2 data = 3 pipe = 4 + local = 5 dir = 1 fil = 2 @@ -2671,6 +2703,17 @@ def show_paths(): ( livestatus_unix_socket, fil, pipe, "Socket of Check_MK's livestatus module"), ] + if omd_root: + paths += [ + ( local_checks_dir, dir, local, "Locally installed checks"), + ( local_check_manpages_dir, dir, local, "Locally installed check man pages"), + ( local_agents_dir, dir, local, "Locally installed agents and plugins"), + ( local_web_dir, dir, local, "Locally installed Multisite addons"), + ( local_pnp_templates_dir, dir, local, "Locally installed PNP templates"), + ( local_pnp_rraconf_dir, dir, local, "Locally installed PNP RRA configuration"), + ( local_doc_dir, dir, local, "Locally installed documentation"), + ] + def show_paths(title, t): if t != inst: print @@ -2686,6 +2729,7 @@ def show_paths(): ( "Configuration files edited by you", conf ), ( "Data created by Nagios/Check_MK at runtime", data ), ( "Sockets and pipes", pipe ), + ( "Locally installed addons", local ), ]: show_paths(title, t) diff --git a/modules/packaging.py b/modules/packaging.py index 371a5ff..b241deb 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -34,21 +34,25 @@ class PackageException(Exception): def __str__(self): return self.reason -pac_dir = var_dir + "/packages/" +if omd_root: + pac_dir = omd_root + "/var/check_mk/packages/" +else: + pac_dir = var_dir + "/packages/" try: os.makedirs(pac_dir) except: pass -package_parts = [ - ( "checks", "Checks", checks_dir ), - ( "checkman", "Checks' man pages", check_manpages_dir ), - ( "agents", "Agents", agents_dir ), - ( "web", "Multisite extensions", web_dir ), - ( "pnp-templates", "PNP4Nagios templates", pnp_templates_dir ), - ( "pnp-rraconf", "RRA configuration for PNP", pnp_rraconf_dir ), - ( "doc", "Documentation files", doc_dir ), -] +# in case of local directories (OMD) use those instead +package_parts = [ (part, title, ldir and ldir or dir) for part, title, dir, ldir in [ + ( "checks", "Checks", checks_dir, local_checks_dir), + ( "checkman", "Checks' man pages", check_manpages_dir, local_check_manpages_dir ), + ( "agents", "Agents", agents_dir, local_agents_dir ), + ( "web", "Multisite extensions", web_dir, local_web_dir ), + ( "pnp-templates", "PNP4Nagios templates", pnp_templates_dir, local_pnp_templates_dir ), + ( "pnp-rraconf", "RRA configuration for PNP", pnp_rraconf_dir, local_pnp_rraconf_dir ), + ( "doc", "Documentation files", doc_dir, local_doc_dir ), +]] def packaging_usage(): sys.stdout.write("""Usage: check_mk [-v] -P|--package COMMAND [ARGS] @@ -140,6 +144,8 @@ def show_package(name, show_info = False): package = read_package(name) if not package: raise PackageException("No such package %s." % name) + if show_info: + sys.stdout.write("Package file: %s%s\n" % (pac_dir, name)) except PackageException: raise except Exception, e: @@ -360,6 +366,10 @@ def package_install(args): verbose(" %s%s%s:\n" % (tty_bold, title, tty_normal)) for fn in filenames: verbose(" %s\n" % fn) + # make sure target directory exists + if not os.path.exists(dir): + verbose(" Creating directory %s\n" % dir) + os.makedirs(dir) tarsource = tar.extractfile(part + ".tar") subtar = "tar xf - -C %s %s" % (dir, " ".join(filenames)) tardest = os.popen(subtar, "w") @@ -388,6 +398,9 @@ def package_install(args): def files_in_dir(part, dir, prefix = ""): + if not os.path.exists(dir): + return [] + # Handle case where one part-dir lies below another taboo_dirs = [ d for p, t, d in package_parts if p != part ] if dir in taboo_dirs:

13 years, 10 months

Check_MK Git: check_mk: Updated check verify script

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96f61036fce85656a631e24c9fd1e26bbfca77b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96f61036fce856… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 29 13:18:02 2010 +0200 Updated check verify script --- validate_checks | 62 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/validate_checks b/validate_checks index 1afe527..e0e46c0 100755 --- a/validate_checks +++ b/validate_checks @@ -76,7 +76,36 @@ SCORE_START = 10 C_OK = 1 C_FAILED = 2 C_INVALID = 3 -TESTS = { 'manpage': C_OK, 'pnp_tmpl': C_OK, 'pnp_rra': C_OK, 'snmp_scan': C_OK } +TESTS = { 'manpage': C_OK, 'snmp_scan': C_OK, 'pnp_tmpl': C_OK, 'pnp_rra': C_OK, 'snmp_scan': C_OK } +WEIGHT = { 'manpage': 2 } + +# +# Check definitions +# + +def is_valid_manpage(check): + return True + +def verify_manpage(check): + return os.path.exists('checkman/%s' % check) + +def is_valid_snmp_scan(check): + return is_snmp_check(check) + +def verify_snmp_scan(check): + return check in snmp_scan_functions + +def is_valid_pnp_tmpl(check): + return check_has_perfdata(check) + +def verify_pnp_tmpl(check): + return os.path.exists('pnp-templates/check_mk-%s.php' % check) + +def is_valid_pnp_rra(check): + return check_has_perfdata(check) + +def verify_pnp_rra(check): + return os.path.exists('pnp-rraconf/check_mk-%s.rra.php' % check) # # 1) Perform checks @@ -86,26 +115,13 @@ for check in get_all_checks(): score = SCORE_START check_results = TESTS.copy() - if not os.path.exists('checkman/%s' % check): - check_results['manpage'] = C_FAILED - score -= 1 - - if check_has_perfdata(check): - if not os.path.exists('pnp-templates/check_mk-%s.php' % check): - check_results['pnp_tmpl'] = C_FAILED - score -= 1 - if not os.path.exists('pnp-rraconf/check_mk-%s.rra.php' % check): - check_results['pnp_rra'] = C_FAILED - score -= 1 - else: - check_results['pnp_tmpl'] = C_INVALID - - if is_snmp_check(check): - if not check in snmp_scan_functions: - check_results['snmp_scan'] = C_FAILED - score -= 1 - else: - check_results['snmp_scan'] = C_INVALID + for test in TESTS.keys(): + if eval('is_valid_%s(\'%s\')' % (test, check)): + if not eval('verify_%s(\'%s\')' % (test, check)): + check_results[test] = C_FAILED + score -= WEIGHT.get(test, 1) + else: + check_results[test] = C_INVALID results[check] = (score, check_results) @@ -120,7 +136,7 @@ results = sorted(results.iteritems(), key=operator.itemgetter(1)) # sys.stdout.write('%-25s' % 'Check') for f in TESTS.keys(): - sys.stdout.write('%-10s' % f) + sys.stdout.write('%-15s' % (f+' (%d)' % WEIGHT.get(f, 1))) sys.stdout.write('%-8s' % 'Score') sys.stdout.write("\n") for check, (score, check_results) in results: @@ -144,7 +160,7 @@ for check, (score, check_results) in results: sub_color = tty_green label = ':-)' - sys.stdout.write('%s%-10s%s' % (sub_color, label, tty_normal)) + sys.stdout.write('%s%-15s%s' % (sub_color, label, tty_normal)) sys.stdout.write('%s%-8s%s' % (color, score, tty_normal)) sys.stdout.write("\n")

13 years, 10 months

Check_MK Git: check_mk: Created script for validating Check_MK checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6f8b7b7ecddb975129eb9a522aa74eabbc253d13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f8b7b7ecddb97… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 29 12:56:09 2010 +0200 Created script for validating Check_MK checks --- validate_checks | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 150 insertions(+), 0 deletions(-) diff --git a/validate_checks b/validate_checks new file mode 100755 index 0000000..1afe527 --- /dev/null +++ b/validate_checks @@ -0,0 +1,150 @@ +#!/usr/bin/python + +import os, sys + +on_tty = sys.stdout.isatty() + +if on_tty: + tty_black = '\033[30m' + tty_red = '\033[31m' + tty_green = '\033[32m' + tty_yellow = '\033[33m' + tty_blue = '\033[34m' + tty_magenta = '\033[35m' + tty_cyan = '\033[36m' + tty_white = '\033[37m' + tty_bgred = '\033[41m' + tty_bggreen = '\033[42m' + tty_bgyellow = '\033[43m' + tty_bgblue = '\033[44m' + tty_bgmagenta = '\033[45m' + tty_bgcyan = '\033[46m' + tty_bgwhite = '\033[47m' + tty_bold = '\033[1m' + tty_underline = '\033[4m' + tty_normal = '\033[0m' + tty_ok = tty_green + tty_bold + 'OK' + tty_normal + tty_error = tty_red + tty_bold + 'ERROR' + tty_normal +else: + tty_black = '' + tty_red = '' + tty_green = '' + tty_yellow = '' + tty_blue = '' + tty_magenta = '' + tty_cyan = '' + tty_white = '' + tty_bgred = '' + tty_bggreen = '' + tty_bgyellow = '' + tty_bgblue = '' + tty_bgmagenta = '' + tty_bgcyan = '' + tty_bold = '' + tty_underline = '' + tty_normal = '' + tty_ok = 'OK' + tty_error = 'ERROR' + + + +__name__ = 'asd' +defaults_path = 'defaults' +autochecks = [] +execfile('check_mk') +__name__ = '__main__' + +def get_checks(): + return [ l for l in os.listdir('checks') if not l.startswith('.') ] + +def check_has_perfdata(check): + return check_info[check][2] == 1 + +def get_all_checks(): + k = check_info.keys() + k.sort() + return k + +def is_snmp_check(check): + return check in snmp_info or check in snmp_info_single + +# Load all checks +for check in get_checks(): + execfile('checks/%s' % check) + +SCORE_START = 10 +C_OK = 1 +C_FAILED = 2 +C_INVALID = 3 +TESTS = { 'manpage': C_OK, 'pnp_tmpl': C_OK, 'pnp_rra': C_OK, 'snmp_scan': C_OK } + +# +# 1) Perform checks +# +results = {} +for check in get_all_checks(): + score = SCORE_START + check_results = TESTS.copy() + + if not os.path.exists('checkman/%s' % check): + check_results['manpage'] = C_FAILED + score -= 1 + + if check_has_perfdata(check): + if not os.path.exists('pnp-templates/check_mk-%s.php' % check): + check_results['pnp_tmpl'] = C_FAILED + score -= 1 + if not os.path.exists('pnp-rraconf/check_mk-%s.rra.php' % check): + check_results['pnp_rra'] = C_FAILED + score -= 1 + else: + check_results['pnp_tmpl'] = C_INVALID + + if is_snmp_check(check): + if not check in snmp_scan_functions: + check_results['snmp_scan'] = C_FAILED + score -= 1 + else: + check_results['snmp_scan'] = C_INVALID + + results[check] = (score, check_results) + +# +# 2) Sort by score +# +import operator +results = sorted(results.iteritems(), key=operator.itemgetter(1)) + +# +# 3) Output the results +# +sys.stdout.write('%-25s' % 'Check') +for f in TESTS.keys(): + sys.stdout.write('%-10s' % f) +sys.stdout.write('%-8s' % 'Score') +sys.stdout.write("\n") +for check, (score, check_results) in results: + if score == SCORE_START: + color = tty_green + elif score == 9: + color = tty_yellow + else: + color = tty_red + + sys.stdout.write('%s%-25s%s' % (color, check, tty_normal)) + + for f in TESTS.keys(): + if check_results[f] == C_FAILED: + sub_color = tty_red + label = ':-(' + elif check_results[f] == C_INVALID: + sub_color = tty_normal + label = '' + else: + sub_color = tty_green + label = ':-)' + + sys.stdout.write('%s%-10s%s' % (sub_color, label, tty_normal)) + + sys.stdout.write('%s%-8s%s' % (color, score, tty_normal)) + sys.stdout.write("\n")

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk into 1.1.9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 613ddb562dc0580c90f5fa22a1e8611e4feaffc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=613ddb562dc058… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 31 17:19:59 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk into 1.1.9 ---

13 years, 10 months

Check_MK Git: check_mk: Merge branch '1.1.9'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 894d1de1de22fe4ee6030359393e5fcb2dd2cc03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=894d1de1de22fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 3 14:03:40 2010 +0100 Merge branch '1.1.9' ---

13 years, 10 months

Check_MK Git: check_mk: Merge branch '1.1.9'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ab099e52a93311920392bc3f0f60a66d8639fc03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab099e52a93311… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 3 14:03:12 2010 +0100 Merge branch '1.1.9' Conflicts: checks/cisco_fan ---

13 years, 10 months

Check_MK Git: check_mk: Merge branch '1.1.9' of git@mathias-kettner.de: check_mk into 1.1.9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 49af743b164b5697c0aa1986546c19e7c0b9f17d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49af743b164b56… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 29 08:47:16 2010 +0200 Merge branch '1.1.9' of git@mathias-kettner.de:check_mk into 1.1.9 Conflicts: ChangeLog ---

13 years, 10 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d6bc7feb327415ba1176997e9bb7acff8e9324e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6bc7feb327415… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 29 08:35:55 2010 +0200 Merge branch '1.1.9' of ssh://mathias-kettner.de/check_mk into 1.1.9 ---

13 years, 10 months

Check_MK Git: check_mk: Restored check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5d53e496fdf1a75cbcbfe7e7e7bbc271e6998ba1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d53e496fdf1a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 29 08:50:51 2010 +0200 Restored check --- checks/cisco_fan | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/checks/cisco_fan b/checks/cisco_fan index b2f522b..04f824c 100644 --- a/checks/cisco_fan +++ b/checks/cisco_fan @@ -24,17 +24,22 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +cisco_fan_states = ('', 'normal', 'warning', 'critical', + 'shutdown', 'notPresent', 'notFunctioning') def inventory_cisco_fan(checkname, info): - return [ (line[0], None) for line in info ] + return [ (line[0], None) for line in info if line[1] != '5' ] def check_cisco_fan(item, params, info): for line in info: if line[0] == item: - if line[1] == "1": - return (0, "OK") + state = saveint(line[1]) + if state == 1: + return (0, "OK (State is: %s (%d))" % (cisco_fan_states[state], state)) + elif state == 2: + return (1, "WARNING (state is %s (%d))" % (cisco_fan_states[state], state)) else: - return (2, "CRITICAL (state is %s)" % line[1]) + return (2, "CRITICAL (state is %s (%d))" % (cisco_fan_states[state], state)) return (3, "UNKNOWN - item not found in snmp data") check_info['cisco_fan'] = (check_cisco_fan, "FAN %s", 0, inventory_cisco_fan)

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk into 1.1.9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a3884bae98756bb3e9359cb4263cbe7bed011e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a3884bae98756… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 29 08:49:16 2010 +0200 Merge branch 'master' of git@mathias-kettner.de:check_mk into 1.1.9 Conflicts: checks/cisco_fan ---

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits