Checkmk git commits November 2010

checkmk-commits@lists.checkmk.com

2 participants
180 discussions

Check_MK Git: check_mk: Added more ideas for the validate checks script

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de3a43e1af4e34c42ae4984b07e0baea6be0d628 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de3a43e1af4e34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 10 10:49:32 2010 +0100 Added more ideas for the validate checks script --- validate_checks | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/validate_checks b/validate_checks index 8058377..7e1f4dd 100755 --- a/validate_checks +++ b/validate_checks @@ -1,5 +1,13 @@ #!/usr/bin/python +# Ideen: +# - Reindent +# - Header +# - Copyright drin? +# - Globale Variablen +# - Zu viele? +# - Check Namen in der Variable? + import os, sys on_tty = sys.stdout.isatty() @@ -107,7 +115,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 = {}

13 years, 7 months

Check_MK Git: check_mk: Changed check/ function names of imm_health to have a valid name

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8f368db3e5347382bbec94358865694d6e3d96a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8f368db3e5347… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 10 11:06:31 2010 +0100 Changed check/function names of imm_health to have a valid name --- ChangeLog | 3 +++ checks/imm_health | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcb06bf..b83d75d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ * Configuration check (-X) is now always done. It is now impossible to call any Check_MK action with an invalid configuration. This saves you agains mistyped variables. + * Renamed check functions of imm_health check from test_imm to imm_health + to have valid function and check names. Please remove remove from + inventory and re-inventory those checks. Core, Setup, etc.: * Improve error handling: if hosts are monitored with SNMP *and* TCP, diff --git a/checks/imm_health b/checks/imm_health index 41fbc3b..40a7ffa 100644 --- a/checks/imm_health +++ b/checks/imm_health @@ -26,11 +26,11 @@ # Author: Michael Nieporte <micha.nieporte(a)gmail.com> - Based on rsa_health by Mathias Kettner -def inventory_test_imm(checkname, info): +def inventory_imm_health(checkname, info): if len(info) > 0: return [(None, None)] -def check_test_imm(_no_item, _no_params, info): +def check_imm_health(_no_item, _no_params, info): num_alerts = (len(info) - 1) / 3 infotext = "" for i in range(0, num_alerts): @@ -52,7 +52,7 @@ def check_test_imm(_no_item, _no_params, info): else: return (3, "UNKNOWN - " + infotext) -check_info['test_imm'] = ( check_test_imm, "System health", 0, inventory_test_imm) -snmp_info['test_imm'] = ( ".1.3.6.1.4.1.2.3.51.3.1", ["4"] ) -snmp_scan_functions['test_imm'] = \ +check_info['imm_health'] = ( check_imm_health, "System health", 0, inventory_imm_health) +snmp_info['imm_health'] = ( ".1.3.6.1.4.1.2.3.51.3.1", ["4"] ) +snmp_scan_functions['imm_health'] = \ lambda oid: "IMM" in oid(".1.3.6.1.2.1.1.1.0")

13 years, 7 months

Check_MK Git: check_mk: Added reindent validation check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4aa739d4df96d021db6749179b3f5c1560fd919 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4aa739d4df96d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 10 11:08:26 2010 +0100 Added reindent validation check --- validate_checks => doc/helpers/validate_checks | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/validate_checks b/doc/helpers/validate_checks similarity index 93% rename from validate_checks rename to doc/helpers/validate_checks index 7e1f4dd..1108402 100755 --- a/validate_checks +++ b/doc/helpers/validate_checks @@ -9,6 +9,7 @@ # - Check Namen in der Variable? import os, sys +import reindent on_tty = sys.stdout.isatty() @@ -57,6 +58,7 @@ else: __name__ = 'asd' +os.chdir('../../') defaults_path = 'defaults' #autochecks = [] execfile('check_mk') @@ -84,13 +86,22 @@ SCORE_START = 10 C_OK = 1 C_FAILED = 2 C_INVALID = 3 -TESTS = { 'manpage': C_OK, 'snmp_scan': 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, 'reindent': C_OK } WEIGHT = { 'manpage': 2 } # # Check definitions # +def is_valid_reindent(check): + return True + +def verify_reindent(check): + f = open('checks/%s' % check.split('.')[0]) + r = reindent.Reindenter(f) + f.close() + return not r.run() + def is_valid_manpage(check): return True

13 years, 7 months

Check_MK Git: check_mk: Reindent checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a16d731513af50ce7ea341fd75fdccea9d045fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a16d731513af5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 10 11:09:48 2010 +0100 Reindent checks --- checks/3ware_disks | 6 ++-- checks/3ware_info | 30 ++++++++++++------------ checks/3ware_units | 8 +++--- checks/akcp_sensor_humidity | 6 ++-- checks/akcp_sensor_temp | 6 ++-- checks/if | 4 +- checks/imm_health | 38 +++++++++++++++--------------- checks/multipath | 6 ++-- checks/tcp_conn_stats | 54 +++++++++++++++++++++--------------------- checks/zpool_status | 45 +++++++++++++++++------------------ 10 files changed, 101 insertions(+), 102 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2a16d73151…

13 years, 7 months

Check_MK Git: check_mk: heartbeat_rscstatus: Allowing a list as expected state to expect multiple OK states

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4b84dbf2eeec40aa0538149b929658e3569dcb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4b84dbf2eeec4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 8 11:18:29 2010 +0100 heartbeat_rscstatus: Allowing a list as expected state to expect multiple OK states --- ChangeLog | 1 + checkman/heartbeat_rscstatus | 5 +++++ checks/heartbeat_rscstatus | 9 +++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 815e857..bcb06bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * heartbeat_nodes: fix Linux agent for hostname with upper case letters (thanks to Thorsten Robers) * heartbeat_rscstatus: Catching empty output from agent correctly + * heartbeat_rscstatus: Allowing a list as expected state to expect multiple OK states * win_dhcp_pools agent plugin: Filtering additional error message on systems without dhcp server diff --git a/checkman/heartbeat_rscstatus b/checkman/heartbeat_rscstatus index da8fdaa..84c383e 100644 --- a/checkman/heartbeat_rscstatus +++ b/checkman/heartbeat_rscstatus @@ -16,5 +16,10 @@ description: The resource status can be "all", "foreign", "local" or "none. +[parameters] +expected_state (string/list): The expected resource status. This can be one expected + state as string or multiple expected states given as list. The parameter defaults to + the resource status during inventory. + inventory: Each node will get one service from this check. diff --git a/checks/heartbeat_rscstatus b/checks/heartbeat_rscstatus index 03a127e..67fe3ee 100644 --- a/checks/heartbeat_rscstatus +++ b/checks/heartbeat_rscstatus @@ -35,13 +35,10 @@ def inventory_heartbeat_rscstatus(checktype, info): return [ (None, '"%s"' % line[0]) for line in info if line[0] != '' ] -def check_heartbeat_rscstatus(item, expectedState, info): - if len(info) == 0 or len(info[0]) == 0: - return (3, "UNKNOWN - Got no data from agent") - - if info[0][0] == expectedState: +def check_heartbeat_rscstatus(item, expected_state, info): + if (type(expected_state) == list and info[0][0] in expected_state) or info[0][0] == expected_state: return (0, "OK - Current state: %s" % (info[0][0])) else: - return (2, "CRITICAL - Current state: %s (Expected: %s)" % (info[0][0], expectedState)) + return (2, "CRITICAL - Current state: %s (Expected: %s)" % (info[0][0], expected_state)) check_info['heartbeat_rscstatus'] = (check_heartbeat_rscstatus, "Heartbeat Ressource Status", 0, inventory_heartbeat_rscstatus)

13 years, 7 months

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: 5337bbc3c008d48b247bad1050a5667cd4558676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5337bbc3c008d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 8 19:30:51 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 7 months

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" % \

13 years, 7 months

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. +

13 years, 7 months

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):

13 years, 7 months

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 ---

13 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2010