Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 894a22ce3b1da7eab945b0792aaedb6d9c954bae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=894a22ce3b1da7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 5 16:13:20 2016 +0200 update for WK3111 --- agents/windows/plugins/citrix_farm.ps1 | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/agents/windows/plugins/citrix_farm.ps1 b/agents/windows/plugins/citrix_farm.ps1 index a3da4c1..28771e6 100644 --- a/agents/windows/plugins/citrix_farm.ps1 +++ b/agents/windows/plugins/citrix_farm.ps1 @@ -89,6 +89,7 @@ foreach ($Controller in $Controllers) { if (!$totalinactive_sessions) {$totalinactive_sessions = 0} $totalinactive_sessions = $totalinactive_sessions | Measure-Object -Sum | %{ $_.Sum } "TotalFarmInactiveSessions $totalinactive_sessions" + "<<<<>>>>" } foreach ($XAmachine in $XAmachines) { @@ -142,8 +143,10 @@ foreach ($Controller in $Controllers) { # Column Serverload / Gets machines by their current load index. $Serverload = $XAmachine | %{ $_.LoadIndex } - "<<<citrix_serverload>>>" - "$Serverload" + if(-NOT ([string]::IsNullOrEmpty($Serverload))) { + "<<<citrix_serverload>>>" + "$Serverload" + } # Column SessionCount / Count of number of active / inactive sessions on the machine. $Sessions = $XAmachine | %{ $_.SessionCount } @@ -164,16 +167,18 @@ foreach ($Controller in $Controllers) { "inactive_sessions 0" } + "<<<<>>>>" if ($HostingServerName) { + $HostingServerName = $HostingServerName.Replace($DNSdomain,$null) - $HostingServerName = $HostingServerName.Replace($DNSdomain,$null) - "<<<<$HostingServerName>>>>" - "<<<citrix_hostsystem>>>" - "VMName $HostedMachineName" + "<<<<$HostingServerName>>>>" + "<<<citrix_hostsystem>>>" + "VMName $HostedMachineName" - # Column HypervisorConnectionName / Gets machines with a specific Citrix Virtual Delivery Agent version. - $HypervisorConnectionName = $XAmachine | %{ $_.HypervisorConnectionName } - "CitrixPoolName $HypervisorConnectionName" - } + # Column HypervisorConnectionName / Gets machines with a specific Citrix Virtual Delivery Agent version. + $HypervisorConnectionName = $XAmachine | %{ $_.HypervisorConnectionName } + "CitrixPoolName $HypervisorConnectionName" + "<<<<>>>>" + } } "<<<<>>>>"

8 years, 5 months

Cleaned up yesterdays sigint handling change

by Lars Michelsen

Module: check_mk Branch: master Commit: 6015b3af993ab59a9ed568a13ab33ca8e13101bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6015b3af993ab5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 15:57:23 2016 +0200 Cleaned up yesterdays sigint handling change --- modules/check_mk_base.py | 12 +++++++++++- modules/notify.py | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 89f3ff3..913445e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2521,7 +2521,7 @@ def submit_check_mk_aggregation(hostname, status, output): # '----------------------------------------------------------------------' # register SIGINT handler for consistent CTRL+C handling -# TODO: use MKTermiante() signal instead and handle output and exit code in check_mk.py +# TODO: use MKTerminate() signal instead and handle output and exit code in check_mk.py def interrupt_handler(signum, frame): sys.stderr.write('<Interrupted>\n') sys.exit(1) @@ -2529,3 +2529,13 @@ def interrupt_handler(signum, frame): def register_sigint_handler(): signal.signal(signal.SIGINT, interrupt_handler) + + + +# register SIGINT handler for consistent CTRL+C handling +def handle_keepalive_interrupt(signum, frame): + raise MKTerminate() + + +def register_keepalive_sigint_handler(): + signal.signal(signal.SIGINT, handle_keepalive_interrupt) diff --git a/modules/notify.py b/modules/notify.py index 7da20d0..224a29d 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -340,7 +340,6 @@ def notification_analyse_backlog(nr): # TODO: Make use of the generic do_keepalive() mechanism? def notify_keepalive(): - load_module("keepalive") register_keepalive_sigint_handler() event_keepalive( event_function = notify_notify,

8 years, 5 months

Synched headrify with reality.

by Sven Panne

Module: check_mk Branch: master Commit: c90556c74e17f2e1882a2f2a01a2a7996aa07fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c90556c74e17f2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 5 14:57:47 2016 +0200 Synched headrify with reality. --- doc/helpers/headrify | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index a5438c9..6c39ca9 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -18,20 +18,18 @@ header () cat <<EOF This file is part of Check_MK. -Copyright by Mathias Kettner and Mathias Kettner GmbH. All rights reserved. +The official homepage is at http://mathias-kettner.de/check_mk. -Check_MK is free software; you can redistribute it and/or modify it +check_mk is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation in version 2. - -Check_MK is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public -License along with Check_MK. If not, email to mk(a)mathias-kettner.de -or write to the postal address provided at www.mathias-kettner.de +the Free Software Foundation in version 2. check_mk is distributed +in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more de- +ails. You should have received a copy of the GNU General Public +License along with GNU Make; see the file COPYING. If not, write +to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301 USA. EOF if [ -n "$lastline" ] ; then echo

8 years, 5 months

3359 FIX Fixed exception when trying to edit non existant host

by Lars Michelsen

Module: check_mk Branch: master Commit: be32161cc5faebbe63431f74cb7ba8a8557c53a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be32161cc5faeb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 12:40:41 2016 +0200 3359 FIX Fixed exception when trying to edit non existant host Fixed the exception "local variable 'folder' referenced before assignment". --- .werks/3359 | 10 ++++++++++ ChangeLog | 2 +- web/htdocs/watolib.py | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/3359 b/.werks/3359 new file mode 100644 index 0000000..e0c0f15 --- /dev/null +++ b/.werks/3359 @@ -0,0 +1,10 @@ +Title: Fixed exception when trying to edit non existant host +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459852710 + +Fixed the exception "local variable 'folder' referenced before assignment". diff --git a/ChangeLog b/ChangeLog index 4163396..ff40508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,6 @@ * 3343 FIX: MKP: Verifying minimal version of packages during installation... * 3349 FIX: Added rule to disable Inline-SNMP per host... - Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux @@ -210,6 +209,7 @@ * 3353 FIX: Displaying disabled/offline host state in WATO host list now * 3354 FIX: Added missing option to exclude IP addresses by regex * 3357 FIX: Fixed service conditions of Disk IO related rulesets + * 3359 FIX: Fixed exception when trying to edit non existant host... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 277a1a3..5b091ff 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -640,12 +640,11 @@ class Folder(BaseFolder): folder = Folder.folder(html.var("folder")) else: host_name = html.var("host") + folder = Folder.root_folder() if host_name: # find host with full scan. Expensive operation host = Host.host(host_name) if host: folder = host.folder() - else: - folder = Folder.root_folder() Folder.set_current(folder) return folder

8 years, 5 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: ef1bbb131b5c2d4cd6f6d9b78c14d59d844e9d37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef1bbb131b5c2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 11:19:23 2016 +0200 Testcommit --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ad20d98..4163396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 3343 FIX: MKP: Verifying minimal version of packages during installation... * 3349 FIX: Added rule to disable Inline-SNMP per host... + Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux

8 years, 5 months

fixed recently introduced nagios pnp graph bug

by Andreas Boesl

Module: check_mk Branch: master Commit: e8482ab901e7e475b2fd50e8d42f569bc04ba68e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8482ab901e7e4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 5 11:11:39 2016 +0200 fixed recently introduced nagios pnp graph bug --- web/htdocs/metrics.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index a6403d8..d92b21c 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1177,7 +1177,10 @@ def render_graph_pnp(graph_template, translated_metrics): # TODO: beware of division by zero. All metrics are set to 1 here. value, unit, color = evaluate(metric_name, translated_metrics) - expression, explicit_unit_name = metric_name.split("@", 1) # isolate expression + if "@" in metric_name: + expression, explicit_unit_name = metric_name.rsplit("@", 1) # isolate expression + else: + expression = metric_name # Choose a unique name for the derived variable and compute it commands += "CDEF:DERIVED%d=%s " % (nr , expression)

8 years, 5 months

3113 FIX windows agent: fixed process handle weren' t freed when using wmi-based ps check

by Sebastian Herbord

Module: check_mk Branch: master Commit: 797ced14d212c9350508f99ea0944d0daecf6cda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=797ced14d212c9… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 5 11:04:20 2016 +0200 3113 FIX windows agent: fixed process handle weren't freed when using wmi-based ps check --- .werks/3113 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 939520 -> 939520 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 939520 -> 939520 bytes agents/windows/check_mk_agent.cc | 4 ++-- agents/windows/check_mk_agent.exe | Bin 866304 -> 866304 bytes agents/windows/check_mk_agent.msi | Bin 2067456 -> 2067456 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 866304 -> 866304 bytes agents/windows/install_agent-64.exe | Bin 431158 -> 431102 bytes agents/windows/install_agent.exe | Bin 421694 -> 421747 bytes 11 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/3113 b/.werks/3113 new file mode 100644 index 0000000..f80ef1d --- /dev/null +++ b/.werks/3113 @@ -0,0 +1,10 @@ +Title: windows agent: fixed process handle weren't freed when using wmi-based ps check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459846850 + + diff --git a/ChangeLog b/ChangeLog index 0a879aa..ad20d98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 3020 FIX: netapp_api_volumes: ignore volumes of cluster partner... * 3022 FIX: mk_logwatch (linux): now able to handle queries from multiple servers (no longer loosing data)... * 3112 FIX: esx_vsphere_counters: made levels configurable + * 3113 FIX: windows agent: fixed process handle weren't freed when using wmi-based ps check Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/build_version b/agents/windows/build_version index f6840a9..0a02468 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1570 +1572 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 1cab78f..ba16886 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 3072350..69ae25c 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index b311582..d2be12d 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -914,8 +914,8 @@ void section_ps_wmi(OutputProxy &out) { while (more) { int processId = result.get<int>(L"ProcessId"); - HANDLE process = OpenProcess( - PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processId); + WinHandle process(OpenProcess( + PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processId)); string user = "SYSTEM"; ExtractProcessOwner(process, user); std::wstring process_name; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 0723902..9ef5259 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 2be38ae..e6c6ad2 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index a11f412..0c05d4a 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 8e0e47f..e794de6 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 49dba4a..6ad515d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 5 months

Check for clang 3.8, too.

by Sven Panne

Module: check_mk Branch: master Commit: a061eb5dfecf78e136f229490f864fff24ff2fdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a061eb5dfecf78… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 5 08:09:31 2016 +0200 Check for clang 3.8, too. --- livestatus/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/configure.ac b/livestatus/configure.ac index e6e0798..01a8d5e 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -34,8 +34,8 @@ AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) # Checks for programs. -AC_PROG_CC([gcc-5 clang-3.7 clang-3.6 clang-3.5 clang-3.4 gcc-4.9 gcc-4.8 gcc clang]) -AC_PROG_CXX([g++-5 clang++-3.7 clang++-3.6 clang++-3.5 clang++-3.4 g++-4.9 g++-4.8 g++ clang++]) +AC_PROG_CC([gcc-5 clang-3.8 clang-3.7 clang-3.6 clang-3.5 clang-3.4 gcc-4.9 gcc-4.8 gcc clang]) +AC_PROG_CXX([g++-5 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 clang++-3.4 g++-4.9 g++-4.8 g++ clang++]) AC_PROG_RANLIB AM_CONDITIONAL([HAVE_DIET], [which diet >/dev/null 2>&1]) # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P

8 years, 5 months

Cleaned up SIGINT handling of notify helper

by Lars Michelsen

Module: check_mk Branch: master Commit: e9a5515e164a9a2e1eca7863daa3102ccb4c4d63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9a5515e164a9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 4 16:52:54 2016 +0200 Cleaned up SIGINT handling of notify helper --- modules/notify.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/notify.py b/modules/notify.py index 663b720..7da20d0 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -338,7 +338,10 @@ def notification_analyse_backlog(nr): # | by the Micro Core. | # '----------------------------------------------------------------------' +# TODO: Make use of the generic do_keepalive() mechanism? def notify_keepalive(): + load_module("keepalive") + register_keepalive_sigint_handler() event_keepalive( event_function = notify_notify, log_function = notify_log,

8 years, 5 months

Cleaned up registration of SIGINT handler

by Lars Michelsen

Module: check_mk Branch: master Commit: 806c0c171a6fe8f33463cb52cb6338cd29ec43c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=806c0c171a6fe8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 4 16:21:23 2016 +0200 Cleaned up registration of SIGINT handler --- modules/check_mk.py | 5 +++++ modules/check_mk_base.py | 13 +++++++++++-- modules/nagios.py | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index db652bb..d8f16a9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4897,6 +4897,7 @@ def output_profile(): # | Main entry point and option parsing. Here is where all begins. | # '----------------------------------------------------------------------' +register_sigint_handler() load_checks() opt_nowiki = False @@ -5222,6 +5223,10 @@ try: output_profile() sys.exit(exit_status) +except MKTerminate, e: + # At top level this exception means the process has been terminated without issues. + sys.exit(0) + except (MKGeneralException, MKBailOut), e: sys.stderr.write("%s\n" % e) if opt_debug: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b09d8dc..89f3ff3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -262,13 +262,19 @@ class MKSNMPError(Exception): class MKSkipCheck(Exception): pass -# This signal is raised when a previously configured timeout is reached. +# This exception is raised when a previously configured timeout is reached. # It is used during keepalive mode. It is also used by the automations # which have a timeout set. class MKTimeout(Exception): pass +# This exception is raises when the current Check_MK execution should be +# terminated. Currently it is raised by the SIGINT signal handler to propagate +# the termination up the callstack. +class MKTerminate(Exception): + pass + #. # .--Get data------------------------------------------------------------. @@ -2515,8 +2521,11 @@ def submit_check_mk_aggregation(hostname, status, output): # '----------------------------------------------------------------------' # register SIGINT handler for consistent CTRL+C handling +# TODO: use MKTermiante() signal instead and handle output and exit code in check_mk.py def interrupt_handler(signum, frame): sys.stderr.write('<Interrupted>\n') sys.exit(1) -signal.signal(signal.SIGINT, interrupt_handler) + +def register_sigint_handler(): + signal.signal(signal.SIGINT, interrupt_handler) diff --git a/modules/nagios.py b/modules/nagios.py index 2b152d1..debe7f1 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -986,6 +986,9 @@ if os.path.islink(%(dst)r): output.write(stripped_python_file(modules_dir + "/check_mk_base.py")) + # Register default Check_MK signal handler + output.write("register_sigint_handler()\n") + # TODO: can we avoid adding this module if no predictive monitoring # is being used? output.write(stripped_python_file(modules_dir + "/prediction.py"))

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016