Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

Added missing guitest - should fix builds now

by Mathias Kettner

Module: check_mk Branch: master Commit: ef4674bcc260787ed28566b859018f847e2308dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef4674bcc26078… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 11 09:35:47 2015 +0100 Added missing guitest - should fix builds now --- doc/helpers/{cmk-guitest => guitest} | 187 ++++++++++++++++++++++++++-------- 1 file changed, 144 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ef4674bcc2…

8 years, 9 months

Cleaned up keepalive mode handling code a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: d0e6f04848a29793f6359161fb4aaa710739f182 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0e6f04848a297… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 11 09:28:13 2015 +0100 Cleaned up keepalive mode handling code a bit --- modules/check_mk.py | 2 ++ modules/check_mk_base.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 50f39c6..0c5007f 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4436,6 +4436,8 @@ ignore_changed_global_variables = [ 'all_clusters_untagged', ] +vars_before_config = set([]) + # Now - at last - we can read in the user's configuration files def all_nonfunction_vars(): return set([ name for name,value in globals().items() diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 41ac1ed..569f615 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1263,9 +1263,11 @@ def do_check(hostname, ipaddress, only_check_types = None): run_time = time.time() - start_time if check_mk_perfdata_with_times: - times = os.times() if opt_keepalive: - times = map(lambda a: a[0]-a[1], zip(times, g_initial_times)) + times = get_keepalive_times() + else: + times = os.times() + output += "execution time %.1f sec|execution_time=%.3f user_time=%.3f "\ "system_time=%.3f children_user_time=%.3f children_system_time=%.3f\n" %\ (run_time, run_time, times[0], times[1], times[2], times[3])

8 years, 9 months

Moved keepalive code to cmc codebase where it belongs to

by Lars Michelsen

Module: check_mk Branch: master Commit: eb468fd7fc32d4a9e7ef7d14218eb67a9c5d7d09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb468fd7fc32d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 11 08:16:55 2015 +0100 Moved keepalive code to cmc codebase where it belongs to --- modules/check_mk.py | 247 +-------------------------------------------------- 1 file changed, 1 insertion(+), 246 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eb468fd7fc…

8 years, 9 months

windows agent: initial support for real-time checks

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8bfba48ffa3ad6f3da3b398d9fd583f503bfdfc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bfba48ffa3ad6… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 10 17:04:24 2015 +0100 windows agent: initial support for real-time checks to make this work, some refactorings were necessary to make code thread-safe. A wrapper for WinCrypto was implemented that sets things up to be openssl compatible. --- agents/windows/Configuration.cc | 97 ++- agents/windows/Configuration.h | 12 +- agents/windows/Crypto.cc | 310 +++++++++ agents/windows/Crypto.h | 73 +++ agents/windows/Environment.cc | 25 +- agents/windows/Environment.h | 8 + agents/windows/ListenSocket.cc | 41 +- agents/windows/ListenSocket.h | 5 +- agents/windows/Makefile | 8 +- agents/windows/OutputProxy.cc | 214 +++++++ agents/windows/OutputProxy.h | 120 ++++ agents/windows/PerfCounter.cc | 5 +- agents/windows/Thread.cc | 80 +++ agents/windows/Thread.h | 79 +++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 858624 -> 878592 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 858624 -> 878592 bytes agents/windows/check_mk_agent.cc | 747 ++++++++++------------ agents/windows/check_mk_agent.exe | Bin 776192 -> 798208 bytes agents/windows/check_mk_agent.msi | Bin 1893376 -> 1935872 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 776192 -> 798208 bytes agents/windows/install_agent-64.exe | Bin 393401 -> 401627 bytes agents/windows/install_agent.exe | Bin 383537 -> 392384 bytes agents/windows/logging.cc | 163 +++++ agents/windows/logging.h | 37 ++ agents/windows/stringutil.cc | 39 +- agents/windows/stringutil.h | 3 - agents/windows/types.h | 71 +- 28 files changed, 1620 insertions(+), 519 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8bfba48ffa…

8 years, 9 months

Fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: f0ed9a8999298d980e934cb8813d1458fcbe90da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0ed9a8999298d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 10 13:53:14 2015 +0100 Fixed typo --- .werks/1313 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1313 b/.werks/1313 index 3348063..2f5f7ef 100644 --- a/.werks/1313 +++ b/.werks/1313 @@ -1,4 +1,4 @@ -Title: apc_sts_inputs: New Check for APC Static Transfer Swichtes: Input Phases +Title: apc_sts_inputs: New Check for APC Static Transfer Switches: Input Phases Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 6f21a63..06a123e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,7 +56,7 @@ * 2874 netstat_an.bat: Restrict output of connections to TCP, safes performance * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... * 2884 mssql_blocked_sessions: the state of the blocked sessions is now configurable - * 1313 apc_sts_inputs: New Check for APC Static Transfer Swichtes: Input Phases + * 1313 apc_sts_inputs: New Check for APC Static Transfer Switches: Input Phases * 1314 apc_sts_source: New Check to monitor if the input source changes on APC STS devices * 1315 check_mk_agent.linux: The ps section of the agent now supports long usernames... * 2869 ibm_storage_ts, ibm_storage_ts.drive, ibm_storage_ts_library, ibm_storage_ts.status: new checks for IBM TS3100 Tape Library

8 years, 9 months

Fixed mismatched new[]/delete.

by Sven Panne

Module: check_mk Branch: master Commit: 317e0f638579c0f00a47fdfee5ccb9aee5da131d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=317e0f638579c0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 10 13:24:16 2015 +0100 Fixed mismatched new[]/delete. --- livestatus/src/Query.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 57b5896..6c05e35 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -958,7 +958,7 @@ void Query::finish() delete aggr[i]; // not needed any more } outputDatasetEnd(); - delete aggr; + delete[] aggr; } }

8 years, 9 months

#2810 FIX esx_vsphere_counters, winperf_phydisk: fixed exception on pnpgraph overview page

by Andreas Boesl

Module: check_mk Branch: master Commit: ac9ab2ca08992e6c3fa9b8b65c4986d73b9980d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac9ab2ca08992e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 10 11:21:22 2015 +0100 #2810 FIX esx_vsphere_counters, winperf_phydisk: fixed exception on pnpgraph overview page These checks were using an incorrect template. This has been fixed. --- .werks/2810 | 10 ++++++++++ ChangeLog | 1 + pnp-templates/check_mk-esx_vsphere_counters.diskio.php | 1 - pnp-templates/check_mk-winperf_phydisk.php | 1 - 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/2810 b/.werks/2810 new file mode 100644 index 0000000..334276f --- /dev/null +++ b/.werks/2810 @@ -0,0 +1,10 @@ +Title: esx_vsphere_counters, winperf_phydisk: fixed exception on pnpgraph overview page +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1449742812 +Class: fix + +These checks were using an incorrect template. This has been fixed. + diff --git a/ChangeLog b/ChangeLog index 9c34e85..6f21a63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,7 @@ * 2781 FIX: Fix role handling of "Custom Links" snapin in case of adapted roles... * 2804 FIX: Avoid redeclaration errors in graphs when using pnp basket... * 2877 FIX: Do not reopen search form when doing actions via Host/Service search + * 2810 FIX: esx_vsphere_counters, winperf_phydisk: fixed exception on pnpgraph overview page... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/pnp-templates/check_mk-esx_vsphere_counters.diskio.php b/pnp-templates/check_mk-esx_vsphere_counters.diskio.php deleted file mode 120000 index 62bad04..0000000 --- a/pnp-templates/check_mk-esx_vsphere_counters.diskio.php +++ /dev/null @@ -1 +0,0 @@ -template-diskstat.php \ No newline at end of file diff --git a/pnp-templates/check_mk-winperf_phydisk.php b/pnp-templates/check_mk-winperf_phydisk.php deleted file mode 120000 index 62bad04..0000000 --- a/pnp-templates/check_mk-winperf_phydisk.php +++ /dev/null @@ -1 +0,0 @@ -template-diskstat.php \ No newline at end of file

8 years, 9 months

Real time checks: added protocol version to output

by Lars Michelsen

Module: check_mk Branch: master Commit: a56ebf4a06ec77b73010899bbf536bff0b402298 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a56ebf4a06ec77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 10 10:57:50 2015 +0100 Real time checks: added protocol version to output --- agents/check_mk_agent.linux | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 7a8750a..e3a1183 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -164,8 +164,9 @@ function run_real_time_checks() for SECTION in $RTC_SECTIONS; do # Be aware of maximum packet size. Maybe we need to check the size of the section - # output and do some kind of nicer error handling - (date +%s ; + # output and do some kind of nicer error handling. + # 2 bytes: protocol version, 10 bytes: timestamp, rest: encrypted data + (echo -e 00 ; date +%s ; export RTC_SECRET=$RTC_SECRET ; section_$SECTION | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt) >/dev/udp/$REMOTE/$RTC_PORT done

8 years, 9 months

Added encryption and some error reporting to Real Time Check agent code

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c5750abe79d27a72b086d96802f3b2c007bfdb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5750abe79d27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 25 14:18:21 2015 +0100 Added encryption and some error reporting to Real Time Check agent code --- agents/check_mk_agent.linux | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index dfd39fb..7a8750a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -165,11 +165,9 @@ function run_real_time_checks() for SECTION in $RTC_SECTIONS; do # Be aware of maximum packet size. Maybe we need to check the size of the section # output and do some kind of nicer error handling - # - # Example for encryption: - # export RTC_SECRET=xxx ; echo xxx | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt > x - # export RTC_SECRET=xxx ; cat x | openssl enc -aes-256-cbc -d -pass env:RTC_SECRET -nosalt - section_$SECTION >/dev/udp/$REMOTE/$RTC_PORT + (date +%s ; + export RTC_SECRET=$RTC_SECRET ; + section_$SECTION | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt) >/dev/udp/$REMOTE/$RTC_PORT done sleep 1 @@ -706,8 +704,14 @@ fi # Start new liveupdate process in background on each agent execution. Starting # a new live update process will terminate the old one automatically after # max. 1 sec. -if [ -e $MK_CONFDIR/real_time_checks.cfg -a -n $REMOTE ]; then - run_real_time_checks & +if [ -e $MK_CONFDIR/real_time_checks.cfg ]; then + if [ -z $REMOTE ]; then + echo "ERROR: \$REMOTE not specified. Not starting Real-Time Checks." >&2 + elif ! type openssl >/dev/null; then + echo "ERROR: openssl command is missing. Not starting Real-Time Checks." >&2 + else + run_real_time_checks & + fi fi # MK's Remote Plugin Executor

8 years, 9 months

Initial steps for Real-Time Checks

by Lars Michelsen

Module: check_mk Branch: master Commit: e2152aefd782e53bd17f08e35c107ec121584e0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2152aefd782e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 25 13:59:37 2015 +0100 Initial steps for Real-Time Checks --- agents/check_mk_agent.linux | 70 +++++++++++++++++++++++++++++++++++++------ checks/cpu | 12 ++++---- checks/mem | 4 +++ modules/automation.py | 22 ++++++++++++++ modules/check_mk_base.py | 2 ++ 5 files changed, 96 insertions(+), 14 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f0f9f15..dfd39fb 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -75,6 +75,27 @@ if type timeout >/dev/null 2>&1 ; then export -f waitmax fi +# +# CHECK SECTIONS +# + +function section_mem() +{ + echo '<<<mem>>>' + egrep -v '^Swap:|^Mem:|total:' < /proc/meminfo +} + +function section_cpu() +{ + echo '<<<cpu>>>' + if [ $(uname -m) = "armv7l" ]; then + CPU_REGEX='^processor' + else + CPU_REGEX='^CPU|^processor' + fi + echo "$(cat /proc/loadavg) $(grep -E $CPU_REGEX < /proc/cpuinfo | wc -l)" +} + # Runs a command asynchronous by use of a cache file. Usage: # run_cached [-s] NAME MAXAGE @@ -125,6 +146,37 @@ function run_cached () { # Make run_cached available for subshells (plugins, local checks, etc.) export -f run_cached +# Implements Real-Time Check feature of the Check_MK agent which can send +# some section data in 1 second resolution. Useful for fast notifications and +# detailed graphing (if you configure your RRDs to this resolution). +function run_real_time_checks() +{ + PIDFILE=$MK_VARDIR/real_time_checks.pid + echo $$ > $PIDFILE + + . $MK_CONFDIR/real_time_checks.cfg + + while true; do + # terminate when pidfile is gone or other Real-Time Check process started or configured timeout + if [ ! -e $PIDFILE ] || [ $(<$PIDFILE) -ne $$ ] || [ $RTC_TIMEOUT -eq 0 ]; then + exit 1 + fi + + for SECTION in $RTC_SECTIONS; do + # Be aware of maximum packet size. Maybe we need to check the size of the section + # output and do some kind of nicer error handling + # + # Example for encryption: + # export RTC_SECRET=xxx ; echo xxx | openssl enc -aes-256-cbc -pass env:RTC_SECRET -nosalt > x + # export RTC_SECRET=xxx ; cat x | openssl enc -aes-256-cbc -d -pass env:RTC_SECRET -nosalt + section_$SECTION >/dev/udp/$REMOTE/$RTC_PORT + done + + sleep 1 + RTC_TIMEOUT=$((RTC_TIMEOUT-1)) + done +} + echo '<<<check_mk>>>' echo Version: 1.2.7i4 echo AgentOS: linux @@ -217,17 +269,10 @@ echo '<<<ps>>>' ps ax -o user:32,vsz,rss,cputime,etime,pid,command --columns 10000 | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4\/\5,\6) /' # Memory usage -echo '<<<mem>>>' -egrep -v '^Swap:|^Mem:|total:' < /proc/meminfo +section_mem # Load and number of processes -echo '<<<cpu>>>' -if [ $(uname -m) = "armv7l" ]; then - CPU_REGEX='^processor' -else - CPU_REGEX='^CPU|^processor' -fi -echo "$(cat /proc/loadavg) $(grep -E $CPU_REGEX < /proc/cpuinfo | wc -l)" +section_cpu # Uptime echo '<<<uptime>>>' @@ -658,6 +703,13 @@ if type trd >/dev/null; then trd -s fi +# Start new liveupdate process in background on each agent execution. Starting +# a new live update process will terminate the old one automatically after +# max. 1 sec. +if [ -e $MK_CONFDIR/real_time_checks.cfg -a -n $REMOTE ]; then + run_real_time_checks & +fi + # MK's Remote Plugin Executor if [ -e "$MK_CONFDIR/mrpe.cfg" ] then diff --git a/checks/cpu b/checks/cpu index 8a822d4..0d67753 100644 --- a/checks/cpu +++ b/checks/cpu @@ -62,6 +62,7 @@ check_info["cpu.loads"] = { "has_perfdata" : True, "group" : "cpu_load", "includes" : ["cpu_load.include"], + "handle_real_time_checks" : True, } @@ -97,10 +98,11 @@ def check_cpu_threads(item, params, info): check_info["cpu.threads"] = { - "check_function" : check_cpu_threads, - "inventory_function" : inventory_cpu_threads, - "service_description" : "Number of threads", - "has_perfdata" : True, - "group" : "threads", + "check_function" : check_cpu_threads, + "inventory_function" : inventory_cpu_threads, + "service_description" : "Number of threads", + "has_perfdata" : True, + "group" : "threads", + "handle_real_time_checks" : True, } diff --git a/checks/mem b/checks/mem index 6df525f..cb35047 100644 --- a/checks/mem +++ b/checks/mem @@ -365,6 +365,7 @@ check_info["mem.linux"] = { 'default_levels_variable': 'mem_linux_default_levels', 'has_perfdata': True, 'group': 'memory_linux', + "handle_real_time_checks" : True, } #. @@ -406,6 +407,7 @@ check_info['mem.used'] = { "group" : "memory", "default_levels_variable" : "memory_default_levels", "includes" : [ "mem.include" ], + "handle_real_time_checks" : True, } #. @@ -515,6 +517,7 @@ check_info["mem.win"] = { 'has_perfdata': True, 'group': 'memory_pagefile_win', 'default_levels_variable': 'memory_win_default_levels', + "handle_real_time_checks" : True, } #. @@ -592,4 +595,5 @@ check_info["mem.vmalloc"] = { 'check_function': check_mem_vmalloc, 'service_description': 'Vmalloc address space', 'has_perfdata': True, + "handle_real_time_checks" : True, } diff --git a/modules/automation.py b/modules/automation.py index d43c575..c335d6b 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -38,6 +38,8 @@ def do_automation(cmd, args): result = automation_get_configuration() elif cmd == "get-check-information": result = automation_get_check_information() + elif cmd == "get-real-time-checks": + result = automation_get_real_time_checks() elif cmd == "get-check-manpage": result = automation_get_check_manpage(args) elif cmd == "get-check-catalog": @@ -543,6 +545,26 @@ def automation_get_check_information(): return checks +def automation_get_real_time_checks(): + manuals = all_manuals() + + checks = [] + for check_type, check in check_info.items(): + if check["handle_real_time_checks"]: + title = check_type + try: + manfile = manuals.get(check_type) + if manfile: + title = file(manfile).readline().strip().split(":", 1)[1].strip() + except Exception, e: + if opt_debug: + raise + + checks.append((check_type, "%s - %s" % (check_type, title))) + + return checks + + def automation_get_check_manpage(args): if len(args) != 1: raise MKAutomationError("Need exactly one argument.") diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 0fb0f06..41ac1ed 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1642,6 +1642,7 @@ def convert_check_info(): snmp_scan_functions.get(check_type, snmp_scan_functions.get(basename)), "handle_empty_info" : False, + "handle_real_time_checks" : False, "default_levels_variable" : check_default_levels.get(check_type), "node_info" : False, "parse_function" : None, @@ -1656,6 +1657,7 @@ def convert_check_info(): info.setdefault("snmp_info", None) info.setdefault("snmp_scan_function", None) info.setdefault("handle_empty_info", False) + info.setdefault("handle_real_time_checks", False) info.setdefault("default_levels_variable", None) info.setdefault("node_info", False) info.setdefault("extra_sections", [])

8 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015