Module: check_mk
Branch: master
Commit: f92fa98b2ef2c553936ac55cf006f84652788fe0
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f92fa98b2ef2c5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Aug 21 17:44:46 2014 +0200
mk_sap: another fix for continuing after an error
---
agents/plugins/.f12 | 7 +++++--
agents/plugins/mk_sap | 14 ++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/agents/plugins/.f12 b/agents/plugins/.f12
index 9c4a18e..2cdd4e4 100755
--- a/agents/plugins/.f12
+++ b/agents/plugins/.f12
@@ -1,3 +1,6 @@
#!/bin/bash
-sudo mkdir -p /usr/lib/check_mk_agent/plugins
-sudo install -m 755 * /usr/lib/check_mk_agent/plugins
+SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)}
+SITE=${SITE:-$(omd sites --bare | head -n 1)}
+# sudo mkdir -p /usr/lib/check_mk_agent/plugins
+sudo install -m 755 * /usr/lib/check_mk_agent/plugins || true
+sudo install -m 755 * /omd/sites/$SITE/share/check_mk/agents/plugins
diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap
index f2f32d6..dbade0a 100755
--- a/agents/plugins/mk_sap
+++ b/agents/plugins/mk_sap
@@ -56,6 +56,9 @@ except ImportError, e:
'"/usr/sap/nwrfcsdk/lib" and run "ldconfig"
afterwards.\n'
)
sys.exit(1)
+ elif 'No module named sapnwrfc' in str(e):
+ sys.stderr.write("Missing the Python module sapnwfrc.\n")
+ sys.exit(1)
else:
raise
@@ -355,11 +358,10 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts):
def connect(cfg):
global conn
try:
- conn = None # make sure that conn is defined, even on an exception
conn = sapnwrfc.base.rfc_connect(cfg)
except sapnwrfc.RFCCommunicationError, e:
sys.stderr.write('ERROR: Unable to connect (%s)\n' % e)
-
+ return
login()
@@ -452,7 +454,11 @@ def connect(cfg):
logout()
conn.close()
-for entrie in cfg:
- connect( entrie )
+
+for entry in cfg:
+ try:
+ connect(entry)
+ except:
+ pass # Make sure that other entries are executed anyway
sys.exit(0)