summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2016-07-15 19:25:28 +0000
committerPatrick Uiterwijk <puiterwijk@redhat.com>2016-07-15 19:25:40 +0000
commit6685841b7c150ba9e3371294a9e40a2ba18afce1 (patch)
tree2884d0d857a608218b7ff7200dc772ba0bb489b5
parentc9cba944c89cfb9b650571441bda05282e2a1bf2 (diff)
downloadansible-6685841b7c150ba9e3371294a9e40a2ba18afce1.tar.gz
ansible-6685841b7c150ba9e3371294a9e40a2ba18afce1.tar.xz
ansible-6685841b7c150ba9e3371294a9e40a2ba18afce1.zip
Fix the osbs nagios script
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
-rwxr-xr-xroles/nagios/client/files/scripts/check_osbs_builds.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/roles/nagios/client/files/scripts/check_osbs_builds.py b/roles/nagios/client/files/scripts/check_osbs_builds.py
index b5c7e742c..ef0a4700a 100755
--- a/roles/nagios/client/files/scripts/check_osbs_builds.py
+++ b/roles/nagios/client/files/scripts/check_osbs_builds.py
@@ -6,14 +6,18 @@ import sys
sp = subprocess.Popen(
["osbs", "list-builds"],
stdout=subprocess.PIPE,
- stderr=subprocess.PIPE
+ stderr=subprocess.PIPE,
+ stdin=subprocess.PIPE
)
sp_out, sp_err = sp.communicate()
+sp_err = sp_err.split('\n')
-if sp_err.split()[0] == 'BUILD':
+if 'not attached to terminal' in sp_err[0]:
+ sp_err = sp_err[1:]
+
+if sp_err[0].split()[0] == 'BUILD':
print "OK: OSBS is responsive to 'osbs list-builds'"
sys.exit(0)
else:
print "CRITICAL: OSBS UNRESPONSIVE"
sys.exit(2)
-