Module: check_mk
Branch: master
Commit: bbbe07b68a1bd1aaa8e4f25d45ed0adfbe3c0736
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbbe07b68a1bd1…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Thu Jul 5 11:27:21 2018 +0200
6306 FIX check_mk_agent.aix: Prevent timeout of Check_MK service if LPARs of a PowerHA are
hanging
Change-Id: I573146f561b9d1b3f23bffd8298ba924a66bebdf
---
.werks/6306 | 11 +++++++++++
agents/check_mk_agent.aix | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/.werks/6306 b/.werks/6306
new file mode 100644
index 0000000..2c97859
--- /dev/null
+++ b/.werks/6306
@@ -0,0 +1,11 @@
+Title: check_mk_agent.aix: Prevent timeout of Check_MK service if LPARs of a PowerHA are
hanging
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1530782811
+
+
diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix
index dc7ad5f..e820990 100755
--- a/agents/check_mk_agent.aix
+++ b/agents/check_mk_agent.aix
@@ -337,13 +337,13 @@ then
echo '<<<aix_hacmp_services>>>'
if type clshowsrv ; then
- clshowsrv -v
+ waitmax 5 clshowsrv -v
else # fallback, hardcoded base installation path
- /usr/es/sbin/cluster/utilities/clshowsrv -v
+ waitmax 5 /usr/es/sbin/cluster/utilities/clshowsrv -v
fi
echo '<<<aix_hacmp_resources:sep(58)>>>'
- clRGinfo -s
+ waitmax 5 clRGinfo -s
fi
fi