Module: check_mk
Branch: master
Commit: fb7a12e3c4b1c14a0acb4aaa5ff5e6bfac0c6952
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb7a12e3c4b1c1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 12 15:20:57 2014 +0100
Cleaned up yesterdays change
---
modules/check_mk.py | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index f23d85f..9726d22 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -218,18 +218,6 @@ else:
# | for all variables. The user can easily override them. |
# '----------------------------------------------------------------------'
-def set_use_cachefile():
- global opt_use_cachefile, check_max_cachefile_age, inventory_max_cachefile_age
- opt_use_cachefile = True
- check_max_cachefile_age = 1000000000
- inventory_max_cachefile_age = 1000000000
-
-def no_use_cachefile():
- global opt_use_cachefile, check_max_cachefile_age, inventory_max_cachefile_age
- opt_use_cachefile = False
- check_max_cachefile_age = 0 # per default do not use cache files when checking
- inventory_max_cachefile_age = 120 # seconds
-
# define magic keys for use in host extraconf lists
PHYSICAL_HOSTS = [ '@physical' ] # all hosts but not clusters
CLUSTER_HOSTS = [ '@cluster' ] # all cluster hosts
@@ -249,6 +237,7 @@ restart_locking = "abort" # also
possible: "wait", None
check_submission = "file" # alternative: "pipe"
aggr_summary_hostname = "%s-s"
agent_min_version = 0 # warn, if plugin has not at least version
+check_max_cachefile_age = 0 # per default do not use cache files when
checking
cluster_max_cachefile_age = 90 # secs.
piggyback_max_cachefile_age = 3600 # secs
piggyback_translation = [] # Ruleset for translating piggyback host names
@@ -274,11 +263,10 @@ explicit_snmp_communities = {} # override the rule based
configuration
inventory_check_interval = None # Nagios intervals (4h = 240)
inventory_check_severity = 1 # warning
inventory_check_do_scan = True # include SNMP scan for SNMP devices
+inventory_max_cachefile_age = 120 # seconds
inventory_check_autotrigger = True # Automatically trigger inv-check after
automation-inventory
always_cleanup_autochecks = None # For compatiblity with old configuration
-no_use_cachefile()
-
# Nagios templates and other settings concerning generation
# of Nagios configuration files. No need to change these values.
# Better adopt the content of the templates
@@ -5570,7 +5558,7 @@ def restart_myself(keepalive_fd):
def do_check_keepalive():
- global g_initial_times, g_timeout
+ global g_initial_times, g_timeout, check_max_cachefile_age,
inventory_max_cachefile_age
def check_timeout(signum, frame):
raise MKCheckTimeout()
@@ -5593,6 +5581,9 @@ def do_check_keepalive():
num_checks = 0 # count total number of check cycles
+ orig_check_max_cachefile_age = check_max_cachefile_age
+ orig_inventory_max_cachefile_age = inventory_max_cachefile_age
+
global total_check_output
total_check_output = ""
if opt_debug:
@@ -5626,9 +5617,12 @@ def do_check_keepalive():
# The other arguments might be different parameters to configure the
actions to
# be done
args = cmdline.split(' ')
- no_use_cachefile()
if '--cache' in args:
- set_use_cachefile()
+ check_max_cachefile_age = 1000000000
+ inventory_max_cachefile_age = 1000000000
+ else:
+ check_max_cachefile_age = orig_check_max_cachefile_age
+ inventory_max_cachefile_age = orig_inventory_max_cachefile_age
hostname, ipaddress = args[-2:]
else:
# This case is used when calling keepalive mode manually only with a
hostname
@@ -6123,7 +6117,9 @@ if __name__ == "__main__":
sys.stderr.write("Please use the option -c separated by the other
options.\n")
sys.exit(1)
elif o == '--cache':
- set_use_cachefile()
+ opt_use_cachefile = True
+ check_max_cachefile_age = 1000000000
+ inventory_max_cachefile_age = 1000000000
elif o == '--no-tcp':
opt_no_tcp = True
elif o == '--no-cache':