Module: check_mk
Branch: master
Commit: 35344031ccd4f5b45da24a0e225f1ad2654a834f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35344031ccd4f5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Feb 16 15:34:11 2012 +0100
Some cleanup in check validator
---
doc/helpers/validate_checks | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks
index 49fcc41..e29eebd 100755
--- a/doc/helpers/validate_checks
+++ b/doc/helpers/validate_checks
@@ -74,7 +74,7 @@ def get_perfometer_files():
return [ f for f in files if f.endswith(".py") and not
f.startswith('.') ]
def check_has_perfdata(check):
- return check_info[check][2] == 1
+ return check_info[check]["has_perfdata"]
def get_all_checks():
k = check_info.keys()
@@ -168,12 +168,12 @@ TESTS = {
'manpage': C_OK,
'snmp_scan': C_OK,
'pnp_tmpl': C_OK,
- 'pnp_rra': C_OK,
'perfometer': C_OK,
'snmp_scan': C_OK,
'reindent': C_OK,
'global_vars': C_OK,
'linelength': C_OK,
+ 'group': C_OK,
'debug': C_OK,
}
@@ -240,6 +240,7 @@ def verify_reindent(check):
f.close()
return not r.run()
+
# Debug:
# - are there 'print' statements in the code?
# - are there 'sys.*.write' statements?
@@ -300,15 +301,6 @@ def is_valid_pnp_tmpl(check):
def verify_pnp_tmpl(check):
return os.path.exists('pnp-templates/check_mk-%s.php' % check)
-# PNP-Template:
-# Does the chekc which produces perfdata have a rra config?
-
-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.cfg' % check)
-
# Perfometer:
# Checks with perfdata should provide a perfometer
@@ -318,6 +310,13 @@ def is_valid_perfometer(check):
def verify_perfometer(check):
return 'check_mk-' + check in perfometers
+# Has this check a group assigned to?
+def is_valid_group(check):
+ return True
+
+def verify_group(check):
+ return not not check_info[check]["group"]
+
# #############################################################################
# MAIN
# #############################################################################
@@ -359,6 +358,8 @@ for o, a in opts:
else:
usage('Unhandled parameter: %s' % str(o))
+convert_check_info()
+
# 1) Perform checks
#
results = {}