[checkmk-commits] Check_MK Git: check_mk: #2094 FIX Fixed missing agent section when ntpq times out after 5 seconds

Module: check_mk Branch: master Commit: 2a23f9bf8bc846c6a703da440e813e56d674e856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a23f9bf8bc846… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 9 15:32:37 2015 +0100 #2094 FIX Fixed missing agent section when ntpq times out after 5 seconds --- .werks/2094 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2094 b/.werks/2094 new file mode 100644 index 0000000..49eaca6 --- /dev/null +++ b/.werks/2094 @@ -0,0 +1,10 @@ +Title: Fixed missing agent section when ntpq times out after 5 seconds +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425911550 + + diff --git a/ChangeLog b/ChangeLog index 7a5d67c..08625f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -240,6 +240,7 @@ * 2091 FIX: The check-mk-agent RPM packages can now update the old check_mk-agent named RPMs... * 2046 FIX: Replace GBit with Gbit, MBit with Mbit, KBit with Kbit... * 2098 FIX: ibm_svc_mdiskgrp: fix rounding bug, decimal digits of size (GB, TB) were always lost + * 2094 FIX: Fixed missing agent section when ntpq times out after 5 seconds Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index be6408e..6b2b316 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -393,7 +393,7 @@ fi # Time synchronization with NTP if type ntpq > /dev/null 2>&1 ; then # remove heading, make first column space separated - run_cached -s ntp 30 "waitmax 5 ntpq -np | sed -e 1,2d -e 's/^\(.\)/\1 /' -e 's/^ /%/'" + run_cached -s ntp 30 "waitmax 5 ntpq -np | sed -e 1,2d -e 's/^\(.\)/\1 /' -e 's/^ /%/' || true" fi # Time synchronization with Chrony