Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: ibm_svc_host: minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 07ff63d7540b62a6c7c1bd72051847efd94aec13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07ff63d7540b62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 12 15:56:15 2014 +0100 ibm_svc_host: minor code cleanup --- checks/ibm_svc_host | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/checks/ibm_svc_host b/checks/ibm_svc_host index ece741d..84ef906 100644 --- a/checks/ibm_svc_host +++ b/checks/ibm_svc_host @@ -31,14 +31,13 @@ # 2:host105:2:2:online # 3:host106:2:2:online +factory_settings['ibm_svc_host_default_levels'] = { + 'always_ok' : False +} def inventory_ibm_svc_host(info): return [(None, None)] -factory_settings['ibm_svc_host_default_levels'] = { - 'always_ok' : False - -} def check_ibm_svc_host_state(state, aw_ok): if aw_ok: @@ -47,12 +46,12 @@ def check_ibm_svc_host_state(state, aw_ok): return state def check_ibm_svc_host(item, params, info): - degraded=0 - offline=0 - active=0 - inactive=0 - other=0 - status=0 + degraded = 0 + offline = 0 + active = 0 + inactive = 0 + other = 0 + status = 0 for line in info: if line[4] == 'degraded': degraded += 1

9 years, 9 months

Check_MK Git: check_mk: #1756 FIX agent_ibmsvc: do not abort execution if one of the sections fail

by Mathias Kettner

Module: check_mk Branch: master Commit: 8e53bf53d0bf4ae79c5f9919245d20a04e9bd24e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e53bf53d0bf4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 12 15:45:19 2014 +0100 #1756 FIX agent_ibmsvc: do not abort execution if one of the sections fail --- .werks/1756 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/1756 b/.werks/1756 new file mode 100644 index 0000000..8785356 --- /dev/null +++ b/.werks/1756 @@ -0,0 +1,10 @@ +Title: agent_ibmsvc: do not abort execution if one of the sections fail +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418395490 + + diff --git a/ChangeLog b/ChangeLog index cfb6439..bc69ab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... * 1763 FIX: diskstat: Fixed error in config example of manpage * 1755 FIX: cisco_vpn_tunnel: fix exception in case tunnel is not OK + * 1756 FIX: agent_ibmsvc: do not abort execution if one of the sections fail Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc old mode 100755 new mode 100644 index 30a4815..a12926b --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -1,3 +1,4 @@ +OMD[iptv]:~/local/share/check_mk/agents/special$ cat agent_ibmsvc #!/usr/bin/python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ @@ -177,7 +178,7 @@ cmd = "ssh -o ConnectTimeout=%s %s %s@%s '" % (opt_timeout, opt_any_hostkey, use for module in command_options.keys(): if command_options[module]["active"] == True: cmd += "echo \<\<\<%s:sep$58$\>\>\>;" % command_options[module]["section_header"] - cmd += "%s;" % command_options[module]["command"] + cmd += "%s || true;" % command_options[module]["command"] cmd += "'" if opt_debug: @@ -189,7 +190,7 @@ stdout, stderr = result.communicate() exit_code = result.wait() if exit_code not in [ 0, 1 ]: - sys.stderr.write("Error connecting via ssh") + sys.stderr.write("Error connecting via ssh: %s\n" % stderr) sys.exit(2) lines = stdout.split('\n') @@ -219,4 +220,3 @@ def output_profile(): if g_profile: output_profile() -

9 years, 9 months

Check_MK Git: check_mk: sample logwatch config: ignore "

by Lars Michelsen

registered panic notifier" messages in syslog/kern.log Message-ID: <548afd75.i9Zsr66NLItppwIr%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1f6e212af881a4f7ff1cf109f6c0d92f0eb52a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f6e212af881a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 15:36:13 2014 +0100 sample logwatch config: ignore "registered panic notifier" messages in syslog/kern.log --- agents/cfg_examples/logwatch.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/cfg_examples/logwatch.cfg b/agents/cfg_examples/logwatch.cfg index 8fec948..960eaf7 100644 --- a/agents/cfg_examples/logwatch.cfg +++ b/agents/cfg_examples/logwatch.cfg @@ -48,6 +48,7 @@ W sshd.*Corrupted MAC on input /var/log/syslog /var/log/kern.log + I registered panic notifier C panic C Oops W generic protection rip

9 years, 9 months

Check_MK Git: check_mk: kemp_loadmaster_realserver: remove bodus saveint()

by Mathias Kettner

Module: check_mk Branch: master Commit: 72fe79313735511542ed409ce6178211b8e263ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72fe7931373551… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 12 15:35:35 2014 +0100 kemp_loadmaster_realserver: remove bodus saveint() That handles an empty state field like state 0. None nice. --- checks/kemp_loadmaster_realserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/kemp_loadmaster_realserver b/checks/kemp_loadmaster_realserver index 42cba11..98e144a 100644 --- a/checks/kemp_loadmaster_realserver +++ b/checks/kemp_loadmaster_realserver @@ -40,7 +40,7 @@ def check_kemp_loadmaster_realserver(item, _no_params, info): for line in info: if line[0] == item: - state = saveint(line[1]) + state = int(line[1]) message = "State: %s" % (states[state]) if state == 1: return 0, message

9 years, 9 months

Check_MK Git: check_mk: #1755 FIX cisco_vpn_tunnel: fix exception in case tunnel is not OK

by Mathias Kettner

Module: check_mk Branch: master Commit: e66849b8e906ad88d84a917220e1c3d0a24c6ec5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e66849b8e906ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 12 15:31:32 2014 +0100 #1755 FIX cisco_vpn_tunnel: fix exception in case tunnel is not OK --- .werks/1755 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_vpn_tunnel | 23 +++++++++++++---------- web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.werks/1755 b/.werks/1755 new file mode 100644 index 0000000..c2bca7c --- /dev/null +++ b/.werks/1755 @@ -0,0 +1,10 @@ +Title: cisco_vpn_tunnel: fix exception in case tunnel is not OK +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418394229 + + diff --git a/ChangeLog b/ChangeLog index 66d5929..cfb6439 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... * 1763 FIX: diskstat: Fixed error in config example of manpage + * 1755 FIX: cisco_vpn_tunnel: fix exception in case tunnel is not OK Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/cisco_vpn_tunnel b/checks/cisco_vpn_tunnel index fb551b9..ce3e997 100644 --- a/checks/cisco_vpn_tunnel +++ b/checks/cisco_vpn_tunnel @@ -34,27 +34,30 @@ # this is the host name used to identify the # remote peer." +def inventory_cisco_vpn_tunnel(info): + return [(item[0], {}) for item in info] + + def check_cisco_vpn_tunnel(item, params, info): tunnel_not_found_state = params.get('state', 2) # default error state # Try to find individual error states by tunnel IP/name - tunnel_alias = "" - for tunnel in params.get('tunnels', []): - if item == tunnel[0]: - if tunnel[1]: - tunnel_alias = "[%s] " % tunnel[1] - tunnel_not_found_state = tunnel[2] + alias = "" + for tunnel_ip, tunnel_alias, not_found_state in params.get('tunnels', []): + if item == tunnel_ip: + alias = "[%s] " % tunnel_alias + tunnel_not_found_state = not_found_state if [item] not in info: - return tunnel_not_found_state, "%sTunnel is missing" % tunnel_alias + return tunnel_not_found_state, "%sTunnel is missing" % alias else: - return state, "%sTunnel is OK" % tunnel_alias + return 0, "%sTunnel is OK" % alias + check_info["cisco_vpn_tunnel"] = { "check_function" : check_cisco_vpn_tunnel, - "inventory_function" : lambda info: [(item[0], {}) for item in info], + "inventory_function" : inventory_cisco_vpn_tunnel, "service_description" : "VPN Tunnel %s", - "has_perfdata" : False, "group" : "vpn_tunnel", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security") \ or "vpn 3000 concentrator" in oid(".1.3.6.1.2.1.1.1.0").lower(), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ce93a8d..23585cd 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1602,7 +1602,7 @@ register_check_parameters( "device."), allow_empty = False, ), - TextAscii( + TextUnicode( title = _("Tunnel Alias"), help = _("You can configure an individual alias here for the tunnel matching " "the IP-Address or Name configured in the field above."),

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2282

by Lars Michelsen

Module: check_mk Branch: master Commit: 1290d2526036c816c2d39990db214c46ca62623d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1290d2526036c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 15:31:06 2014 +0100 Updated bug entries #2282 --- .bugs/2282 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.bugs/2282 b/.bugs/2282 new file mode 100644 index 0000000..96f82cd --- /dev/null +++ b/.bugs/2282 @@ -0,0 +1,17 @@ +Title: Make cmk --keepalive reload possible without execv +Component: core +State: open +Date: 2014-12-12 15:30:47 +Targetversion: 1.2.5i1 +Class: nastiness + +The complete restart of the keepalive processes creates a lot of load when +multiple ones are performing the restart at the same time. + +We should rewrite the "reload config" mechanism to a real reload using a +dedicated function within Check_MK. To make this possible, we need to +know which variables are config values and which are not. Then we need +to precompile the whole config incl. hard coded and user config in a +dedicated file. +This file is being created during "activate changes" and read during +each start of the keepalive processes.

9 years, 9 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 5592e0c6859be4a29e55192ff8ff2eef0d426d16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5592e0c6859be4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 15:27:49 2014 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index faf7b61..fa6d7f0 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2282 +2292

9 years, 9 months

Check_MK Git: check_mk: #1763 FIX diskstat: Fixed error in config example of manpage

by Lars Michelsen

Module: check_mk Branch: master Commit: ce996edd735abca2e9c59cab156c5f8a11764388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce996edd735abc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 15:22:25 2014 +0100 #1763 FIX diskstat: Fixed error in config example of manpage --- .werks/1763 | 10 ++++++++++ ChangeLog | 1 + checkman/diskstat | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/1763 b/.werks/1763 new file mode 100644 index 0000000..44794df --- /dev/null +++ b/.werks/1763 @@ -0,0 +1,10 @@ +Title: diskstat: Fixed error in config example of manpage +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418394125 + + diff --git a/ChangeLog b/ChangeLog index ef8d08a..66d5929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... + * 1763 FIX: diskstat: Fixed error in config example of manpage Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checkman/diskstat b/checkman/diskstat index 4d47693..292d5b3 100644 --- a/checkman/diskstat +++ b/checkman/diskstat @@ -83,6 +83,7 @@ examples: # Then configure levels for 50/90MB/s read IO over 10 Minutes and a bit less for # writes. Next put levels on IO latency exceeding 80ms / 160ms. + checkgroup_parameters.setdefault('disk_io', []) checkgroup_parameters['disk_io'] += [ ( {'read': (50.0, 90.0), 'write': (40.0, 60.0), 'average': 10, 'latency_perfdata': True, 'latency': (80.0, 160.0)}, [], ALL_HOSTS, ALL_SERVICES ), ]

9 years, 9 months

Check_MK Git: check_mk: Cleaned up yesterdays change

by Lars Michelsen

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

9 years, 9 months

Check_MK Git: check_mk: agent_vsphere: removed object count

by Bastian Kuhn

Module: check_mk Branch: master Commit: 171440431a741cb7eec46700e505118978d1d282 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=171440431a741c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 12 14:35:08 2014 +0100 agent_vsphere: removed object count --- agents/special/agent_vsphere | 3 --- 1 file changed, 3 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 6a04ec7..ea61a51 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -994,9 +994,6 @@ if not error: print "<<<<>>>>" - print "<<<esx_vsphere_objects_count>>>" - print "Virtualmachines " + str(len(vms.keys())) - print "<<<esx_vsphere_objects:sep(9)>>>" # the piggybacked data is printed later on, because it looks quite messy...

9 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014