Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65396 discussions

Check_MK Git: check_mk: Multisite: fix module loading problem for local structure

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e860e47ab8c017f1b8f4b5badeab0526d3f447b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e860e47ab8c01… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 22:25:12 2010 +0100 Multisite: fix module loading problem for local structure --- web/htdocs/index.py | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ea6be93..9998980 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -25,9 +25,10 @@ # Boston, MA 02110-1301 USA. from mod_python import apache,util -import os, sys, livestatus +import sys, os, pprint from lib import * -import config, htmllib, defaults +import livestatus +import defaults, config, htmllib # Load page handlers pagehandlers = {} @@ -35,16 +36,17 @@ pagehandlers_dir = defaults.web_dir + "/plugins/pages" for fn in os.listdir(pagehandlers_dir): if fn.endswith(".py"): execfile(pagehandlers_dir + "/" + fn) + if defaults.omd_root: - sys.path.append(defaults.omd_root + "/local/share/check_mk/web/htdocs") - sys.path.append(defaults.web_dir + "/htdocs") + local_module_path = defaults.omd_root + "/local/share/check_mk/web/htdocs" + if local_module_path not in sys.path: + sys.path[0:0] = [ local_module_path, defaults.web_dir + "/htdocs" ] local_pagehandlers_dir = defaults.omd_root + "/local/share/check_mk/web/plugins/pages" if os.path.exists(local_pagehandlers_dir): for fn in os.listdir(local_pagehandlers_dir): if fn.endswith(".py"): execfile(local_pagehandlers_dir + "/" + fn) - def read_get_vars(req): req.vars = {} if req.args: @@ -188,6 +190,12 @@ def handler(req): html.footer() apache.log_error("Configuration error: %s" % (e,), apache.APLOG_ERR) + except MKGeneralException, e: + html.header("Error") + html.show_error("Error: %s" % (e,)) + html.footer() + apache.log_error("Error: %s" % (e,), apache.APLOG_ERR) + except livestatus.MKLivestatusNotFoundError, e: html.header("Data not found") html.show_error("The following query produced no output:\n<pre>\n%s</pre>\n" % \

14 years

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c7c5f1ac43651d00d99d0aa1bc7899a19628e7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c7c5f1ac43651… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 22:23:56 2010 +0100 Updated internal doku --- LIESMICH.zutun | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 4202b3f..ec0ce27 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -483,3 +483,16 @@ konfigurierbar machen: fake_perfdata = [ ... ] Idee: Inventurcheck könnte gleich die Checkergebnisse berechnen + +local-Struktur: Hier gibt es scheinbar einen Bug in mod_python. +index.py -> execfile(plugins/pages/...) -> import config +Jetzt bekommt man eine neue Instanz von config. In dem importierten +Modul kann man das wie folgt reparieren: +from mod_python import importer, apache +config = importer.import_module("config", + path = ["/omd/sites/webconf/share/check_mk/web/htdocs"]) +Das kann aber doch keine Lösung sein. Andererseits braucht man +dies nur wenn wenn in config was ändert oder bei livestatus +(wegen der persistenten Verbindungen). Sonst kanns einem egal +sein, wenn man ein neues Modul bekommt. +

14 years

Check_MK Git: check_mk: Fix python path for local hierarchy

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af519f643f8caac3c1bcbd8b316816c221e31618 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af519f643f8caa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 17:54:02 2010 +0100 Fix python path for local hierarchy --- web/htdocs/index.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 27c781b..ea6be93 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -37,6 +37,7 @@ for fn in os.listdir(pagehandlers_dir): execfile(pagehandlers_dir + "/" + fn) if defaults.omd_root: sys.path.append(defaults.omd_root + "/local/share/check_mk/web/htdocs") + sys.path.append(defaults.web_dir + "/htdocs") local_pagehandlers_dir = defaults.omd_root + "/local/share/check_mk/web/plugins/pages" if os.path.exists(local_pagehandlers_dir): for fn in os.listdir(local_pagehandlers_dir):

14 years

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 75a19743b3fba072aa25998fa314417fdaa10e8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75a19743b3fba0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 17:56:27 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

14 years

Check_MK Git: check_mk: validate_checks: Using helper vars with leading underscore

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a66269253132f004a69fd7f1dbb61feba7a9d0e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a66269253132f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 15:13:34 2010 +0100 validate_checks: Using helper vars with leading underscore --- validate_checks | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/validate_checks b/validate_checks index f8ab960..8058377 100755 --- a/validate_checks +++ b/validate_checks @@ -50,7 +50,7 @@ else: __name__ = 'asd' defaults_path = 'defaults' -autochecks = [] +#autochecks = [] execfile('check_mk') __name__ = '__main__' @@ -107,7 +107,7 @@ def is_valid_pnp_rra(check): def verify_pnp_rra(check): return os.path.exists('pnp-rraconf/check_mk-%s.rra.cfg' % check) -# + # 1) Perform checks # results = {} @@ -135,8 +135,8 @@ 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('%-15s' % (f+' (%d)' % WEIGHT.get(f, 1))) +for _f in TESTS.keys(): + 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: @@ -149,11 +149,11 @@ for check, (score, check_results) in results: sys.stdout.write('%s%-25s%s' % (color, check, tty_normal)) - for f in TESTS.keys(): - if check_results[f] == C_FAILED: + for _f in TESTS.keys(): + if check_results[_f] == C_FAILED: sub_color = tty_red label = ':-(' - elif check_results[f] == C_INVALID: + elif check_results[_f] == C_INVALID: sub_color = tty_normal label = '' else:

14 years

Check_MK Git: check_mk: Added leading underscore to internal helper var

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 402e4ba8f89998e8aa222d563705886e14f2d63a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=402e4ba8f89998… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 15:16:19 2010 +0100 Added leading underscore to internal helper var --- modules/check_mk.py | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 8472556..c5d424c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3395,16 +3395,16 @@ list_of_files = [ check_mk_configfile ] + glob.glob(check_mk_configdir + '/*.mk' final_mk = check_mk_basedir + "/final.mk" if os.path.exists(final_mk): list_of_files.append(final_mk) -for f in list_of_files: +for _f in list_of_files: # Hack: during parent scan mode we must not read in old version of parents.mk! - if '--scan-parents' in sys.argv and f.endswith("/parents.mk"): + if '--scan-parents' in sys.argv and _f.endswith("/parents.mk"): continue try: if opt_debug: - sys.stderr.write("Reading config file %s...\n" % f) - execfile(f) + sys.stderr.write("Reading config file %s...\n" % _f) + execfile(_f) except Exception, e: - sys.stderr.write("Cannot read in configuration file %s:\n%s\n" % (f, e)) + sys.stderr.write("Cannot read in configuration file %s:\n%s\n" % (_f, e)) if __name__ == "__main__": sys.exit(3) else: @@ -3469,8 +3469,7 @@ def read_all_autochecks(): if __name__ == "__main__": read_all_autochecks() - -checks = autochecks + checks + checks = autochecks + checks vars_after_config = all_nonfunction_vars() ignored_variables = set(['vars_before_config', 'rrdtool', 'final_mk', 'list_of_files', 'autochecks',

14 years

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c0a8f75d533a9104592913480c4be8a05990338a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0a8f75d533a91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 14:49:51 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

14 years

Check_MK Git: check_mk: New ok states for netapp_volumes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5806aa421c820cebda7246446c340240e8e2a7d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5806aa421c820c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 14:49:43 2010 +0100 New ok states for netapp_volumes --- checks/netapp_volumes | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/netapp_volumes b/checks/netapp_volumes index c56d323..7a365c1 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -95,7 +95,7 @@ def check_netapp_volumes(item, _not_used, info): if status == 'reconstructing': ret_state = 1 output += ' (WARN)' - elif status not in [ 'normal', 'raid_dp', 'raid0' ]: + elif status not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored' ]: ret_state = 2 output += ' (CRIT)'

14 years

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7a0cfead68647ed7b0227db7bc999fbf0780e7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7a0cfead68647… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 13:34:53 2010 +0100 Updated internal doku --- LIESMICH.zutun | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index da47ea0..4202b3f 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -85,6 +85,11 @@ Icons. Host- und Serviceicons (icon_image) anzeigen. +Aliasse einbauen (Wrappen in bin/): + cmk = check_mk + mkp = check_mk -P + + -------------------------------------------------------------------------------- ab 1.1.11i1 @@ -172,11 +177,6 @@ check_mk -C soll Liste von Hosts bekommen können. Bei Hosts, die kein keine Services haben, eine andere Host-Schablone nehmen, die den Hostcheck nur on-demand ausführt. -Multisite: man kann bei Comments keine Umlaute eingeben. Diese sind aktuell -verboten, weil Python sonst Exceptions wirft. Komischerweise kann man -in den Filtern problemlos Umlaute eingeben. Keine Ahnung, wo hier der -Unterschied liegt. - Multisite: ein Filter für Hosts, der dann zuschlägt, wenn ein Host einen bestimmten Service hat (geht das auch mit Substrings?)

14 years

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7f2eb70f10c04d48585b0996c08948e3ca0ab6ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f2eb70f10c04d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 13:24:31 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

14 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits