Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

Check_MK Git: check_mk: Update compile helper .f12

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2f3d961104a6898b561108358544ffe19d5ea98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2f3d961104a68… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 15:16:31 2011 +0100 Update compile helper .f12 --- web/.f12 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/.f12 b/web/.f12 index 0151a6c..f60f424 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,3 @@ sudo cp -prv * /omd/versions/default/share/check_mk/web/ -sudo su - -c 'omd restart bi apache' +SITE=$(omd sites --bare | head -n 1) +sudo su - -c "omd restart $SITE apache"

13 years, 8 months

Check_MK Git: check_mk: Updated .f12 helper file

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b2a7f9731c5397dc51af76df848ad6096c79ad9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b2a7f9731c539… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 15:50:27 2011 +0100 Updated .f12 helper file --- livestatus/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index c869c87..a622b74 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -10,4 +10,4 @@ fi make -j 8 -sudo cp src/livestatus.o /omd/versions/default/lib/mk-livestatus/livestatus.o +install cp src/livestatus.o /omd/versions/default/lib/mk-livestatus/livestatus.o

13 years, 8 months

Check_MK Git: check_mk: agent simulator: new function sinus()

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 13f4cbae7b4d838dc0f0cdd939052efabe043136 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13f4cbae7b4d83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 13:32:47 2011 +0100 agent simulator: new function sinus() --- modules/agent_simulator.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/agent_simulator.py b/modules/agent_simulator.py index ad27303..8ecffbc 100644 --- a/modules/agent_simulator.py +++ b/modules/agent_simulator.py @@ -1,5 +1,7 @@ #!/usr/bin/python +import math + def our_uptime(): return int(float((file("/proc/uptime").read().split()[0]))) @@ -27,3 +29,10 @@ def agentsim_uptime(factor = 1.0): def agentsim_enum(values, period = 1): # period is in seconds hit = our_uptime() / period % len(values) return values[hit] + +# rate: average rate counter is raised per second +# period: period of sinus wave added to this (in seconds) +def agentsim_sinus(rate = 1, period = 360): + a = (rate * period) / (2.0 * math.pi) + u = our_uptime() + return u * rate + int(a * math.sin(u / (2.0 * math.pi * period)))

13 years, 8 months

Check_MK Git: check_mk: Rescale Perf-O-Meter for snmp_uptime

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5262cee05a1b75551b7ca09bffbd19c55617ad06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5262cee05a1b75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 13:32:36 2011 +0100 Rescale Perf-O-Meter for snmp_uptime --- web/plugins/perfometer/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 0f750da..f7be5aa 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -267,7 +267,7 @@ def perfometer_check_mk_uptime(row, check_command, perf_data): hours, rest = divmod(rest, 60*60) minutes, seconds = divmod(rest, 60) - return "%02dd %02dh %02dm" % (days, hours, minutes), perfometer_logarithmic(perf_data[0][1], 400, 2, '#80F000') + return "%02dd %02dh %02dm" % (days, hours, minutes), perfometer_logarithmic(perf_data[0][1], 2592000, 2, '#80F000') perfometers["check_mk-uptime"] = perfometer_check_mk_uptime perfometers["check_mk-snmp_uptime"] = perfometer_check_mk_uptime

13 years, 8 months

Check_MK Git: check_mk: fix agent simulator file reference

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8d101b58d1a1a3eab828037f8d4f61f743d67c4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d101b58d1a1a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 13:01:17 2011 +0100 fix agent simulator file reference --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 46b1d50..a3a4686 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2042,7 +2042,7 @@ no_inventory_possible = None output.write(stripped_python_file(modules_dir + "/snmp.py")) if agent_simulator: - output.write(stripped_python_file(modules_dir + "/simulator.py")) + output.write(stripped_python_file(modules_dir + "/agent_simulator.py")) # check info table # We need to include all those plugins that are referenced in the host's

13 years, 8 months

Check_MK Git: check_mk: Fixed scanfunction of cisco_*

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45cd77069609e2753d532b4696ccd8ddac59f458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45cd77069609e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 12:47:33 2011 +0100 Fixed scanfunction of cisco_* --- checks/cisco_locif | 2 +- checks/cisco_qos | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_locif b/checks/cisco_locif index a8be78a..2a47554 100644 --- a/checks/cisco_locif +++ b/checks/cisco_locif @@ -40,4 +40,4 @@ snmp_info['cisco_locif'] = ( ".1.3.6.1.4.1.9", "2.2.1.1.28", # OLD-CISCO-INTERFACES-MIB::locIfDescr OID_END ] ) -snmp_scan_functions['cisco_locif'] = False +snmp_scan_functions['cisco_locif'] = lambda oid: False diff --git a/checks/cisco_qos b/checks/cisco_qos index 65c5055..eb17dd6 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -223,4 +223,4 @@ snmp_info['cisco_qos'] = [ ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '1.1.1.4' ( '.1.3.6.1.2.1.2.2.1', [ OID_END, '5' ]), # ifSpeeds ] snmp_scan_functions['cisco_qos'] = lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - not oid(".1.3.6.1.4.1.9.9.166.1.1.1.1.4.*") + oid(".1.3.6.1.4.1.9.9.166.1.1.1.1.4.*")

13 years, 8 months

Check_MK Git: check_mk: new agent_simulation mode

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82e4393e8e7191b16a786fcad675f86afacfbbbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82e4393e8e7191… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 11:03:36 2011 +0100 new agent_simulation mode --- ChangeLog | 1 + modules/agent_simulator.py | 29 +++++++++++++++++++++++++++++ modules/check_mk.py | 15 ++++++++++++--- modules/check_mk_base.py | 4 +++- modules/snmp.py | 2 ++ 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49f4f1f..642f167 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * New config option: Set check_submission = "file" in order to write check result files instead of using Nagios command pipe (safes CPU ressources) + * Agent simulation mode (for internal use and check development) Multisite: * Added snmp_uptime and uptime perfometers diff --git a/modules/agent_simulator.py b/modules/agent_simulator.py new file mode 100644 index 0000000..ad27303 --- /dev/null +++ b/modules/agent_simulator.py @@ -0,0 +1,29 @@ +#!/usr/bin/python + +def our_uptime(): + return int(float((file("/proc/uptime").read().split()[0]))) + +# replace simulator tags in output +def agent_simulator_process(output): + try: + while True: + i = output.find('%{') + if i == -1: + break + e = output.find('}', i) + if e == -1: + break + simfunc = output[i+2 : e] + replacement = str(eval("agentsim_" + simfunc)) + output = output[:i] + replacement + output[e+1:] + except: + pass + + return output + +def agentsim_uptime(factor = 1.0): + return our_uptime() * factor + +def agentsim_enum(values, period = 1): # period is in seconds + hit = our_uptime() / period % len(values) + return values[hit] diff --git a/modules/check_mk.py b/modules/check_mk.py index 9bd86ee..46b1d50 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -207,6 +207,7 @@ agent_min_version = 0 # warn, if plugin has not at least versio check_max_cachefile_age = 0 # per default do not use cache files when checking cluster_max_cachefile_age = 90 # secs. simulation_mode = False +agent_simulator = False perfdata_format = "pnp" # also possible: "standard" debug_log = None monitoring_host = "localhost" # your Nagios host @@ -305,7 +306,8 @@ snmp_scan_functions = {} # SNMP autodetection # Now include the other modules. They contain everything that is needed # at check time (and many of that is also needed at administration time). try: - for module in [ 'check_mk_base', 'snmp' ]: + modules = [ 'check_mk_base', 'snmp' ] + for module in modules: filename = modules_dir + "/" + module + ".py" execfile(filename) @@ -2014,7 +2016,7 @@ no_inventory_possible = None 'var_dir', 'counters_directory', 'tcp_cache_dir', 'snmpwalks_dir', 'check_mk_basedir', 'nagios_user', 'www_group', 'cluster_max_cachefile_age', 'check_max_cachefile_age', - 'simulation_mode', 'aggregate_check_mk', 'debug_log', + 'simulation_mode', 'agent_simulator', 'aggregate_check_mk', 'debug_log', ]: output.write("%s = %r\n" % (var, globals()[var])) @@ -2039,6 +2041,9 @@ no_inventory_possible = None if need_snmp_module: output.write(stripped_python_file(modules_dir + "/snmp.py")) + if agent_simulator: + output.write(stripped_python_file(modules_dir + "/simulator.py")) + # check info table # We need to include all those plugins that are referenced in the host's # check table @@ -3863,11 +3868,15 @@ if do_rrd_update: try: import rrdtool except: - sys.stdout.write("ERROR: Cannot do direct rrd updates since the Python module\n"+ + sys.stderr.write("ERROR: Cannot do direct rrd updates since the Python module\n"+ "'rrdtool' could not be loaded. Please install python-rrdtool\n"+ "or set do_rrd_update to False in main.mk.\n") sys.exit(3) +# Load agent simulator if enabled +if agent_simulator: + execfile(modules_dir + "/agent_simulator.py") + # read automatically generated checks. They are prepended to the check # table: explicit user defined checks override automatically generated # ones. Do not read in autochecks, if check_mk is called as module. diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index cbcab5b..0cdfa75 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -33,7 +33,6 @@ try: except NameError: from sets import Set as set - # colored output, if stdout is a tty if sys.stdout.isatty(): tty_red = '\033[31m' @@ -359,6 +358,9 @@ def get_realhost_info(hostname, ipaddress, checkname, max_cache_age): elif len(output) < 16: raise MKAgentError("Too short output from agent: '%s'" % output) + if agent_simulator: + output = agent_simulator_process(output) + lines = [ l.strip() for l in output.split('\n') ] info = parse_info(lines) store_cached_hostinfo(hostname, info) diff --git a/modules/snmp.py b/modules/snmp.py index f6bc49a..227f9f7 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -362,6 +362,8 @@ def get_stored_snmpwalk(hostname, oid): if o == oid or o.startswith(oid_prefix + "."): if len(parts) > 1: value = parts[1] + if agent_simulator: + value = agent_simulator_process(value) else: value = "" rowinfo.append((o, strip_snmp_value(value))) # return pair of OID and value

13 years, 8 months

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

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8fcf13648d79cd3752d48291ea53da5ea0bf5dca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fcf13648d79cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 12:42:34 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 8 months

Check_MK Git: check_mk: Improved cisco_qos inventory - using dynamic inidice now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1a46b597596b509251830fbb0b7fe2f985f6db9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1a46b597596b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 12:04:42 2011 +0100 Improved cisco_qos inventory - using dynamic inidice now --- checks/cisco_qos | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/cisco_qos b/checks/cisco_qos index 20a46ac..65c5055 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -222,4 +222,5 @@ snmp_info['cisco_qos'] = [ ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '1.1.1.4' ( '.1.3.6.1.2.1.2.2.1', [ OID_END, '2' ]), # ifNames ( '.1.3.6.1.2.1.2.2.1', [ OID_END, '5' ]), # ifSpeeds ] -snmp_scan_functions['cisco_qos'] = lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() +snmp_scan_functions['cisco_qos'] = lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ + not oid(".1.3.6.1.4.1.9.9.166.1.1.1.1.4.*")

13 years, 8 months

Check_MK Git: check_mk: Fixed typo

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7fa6e8b5ff0c1499f61dd49f9f0036093164430 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7fa6e8b5ff0c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 11:58:52 2011 +0100 Fixed typo --- checks/cisco_locif | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/cisco_locif b/checks/cisco_locif index df08937..a8be78a 100644 --- a/checks/cisco_locif +++ b/checks/cisco_locif @@ -40,4 +40,4 @@ snmp_info['cisco_locif'] = ( ".1.3.6.1.4.1.9", "2.2.1.1.28", # OLD-CISCO-INTERFACES-MIB::locIfDescr OID_END ] ) -snmp_scan_functions['cisco_fan'] = False +snmp_scan_functions['cisco_locif'] = False

13 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2011