Merge lp:~verterok/charms/trusty/logstash/logstash2_fix-e2e-cron into lp:~canonical-is-sa/charms/trusty/logstash/logstash2

[Guillermo Gonzalez]

Fix cron script: add new line and use run-this-one instead of run-one, to kill any previous stalled run.
Also, use python3 and add timeout for the ES http request in the lumberjack e2e script

Fix cron script: add new line and use run-this-one instead of run-one, to kill any previous stalled run.
Also, use python3 and add timeout for the ES http request in the lumberjack e2e script

[Chris Stratford (chris-gondolin)]

approve

review: Approve

=== modified file 'files/nrpe/check_lumberjack_e2e.py'
--- files/nrpe/check_lumberjack_e2e.py	2016-01-22 21:34:37 +0000
+++ files/nrpe/check_lumberjack_e2e.py	2016-02-01 13:59:37 +0000
@@ -1,12 +1,9 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 """
 This is very simple lumbjerjack client to run a e2e check against logstash+elasticsearch.
 
 All the lumberjack protocol code was adapted from Matt Johnson: https://pypi.python.org/pypi/stashward/0.1.4
 """
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
 
 import traceback
 import datetime
@@ -14,13 +11,12 @@
 import errno
 import socket
 import sys
-import urllib
+import urllib.request
 import json
 import time
 import uuid
 import random
 
-
 from logging import INFO
 
 from ssl import wrap_socket, CERT_NONE, CERT_REQUIRED, SSLError
@@ -215,11 +211,13 @@
     while not ok or elapsed >= args.critical:
         es_host = es_hosts[random.randint(0, len(es_hosts)-1)]
         try:
-            resp = urllib.urlopen("http://%s/%s/_search?size=1" % (es_host, index), data=json.dumps(get_body))
-        except Exception, e:
+            resp = urllib.request.urlopen("http://%s/%s/_search?size=1" % (es_host, index),
+                                  data=json.dumps(get_body).encode('utf-8'),
+                                  timeout=args.es_timeout)
+        except Exception as e:
             print("Elasticsearch unreachable: %s" % str(e))
             return 2
-        results = json.loads(resp.read())
+        results = json.loads(resp.read().decode('utf-8'))
         elapsed = time.time()-ts
         for result in results['hits']['hits']:
             if 'request_id' in result['_source'] and req_id == result['_source']['request_id']:
@@ -252,12 +250,14 @@
     parser.add_argument('--es', dest="es_host_port", required=True,
                         help="Comma separated list of elasticsearch " + \
                         "host:port, e.g: host:port,host1:port1..")
+    parser.add_argument('-t', dest="es_timeout", type=int, default=5,
+                        help="timeout for ES http request")
     parser.add_argument('-f', dest="e2e_file", required=True,
                         help="path to the output file")
     args = parser.parse_args()
     try:
         sys.exit(main(args))
-    except Exception, e:
+    except Exception as e:
         with open(args.e2e_file, 'w') as fd:
             fd.write("ERROR: Unhandled error: %s\n" % (str(e),))
             fd.flush()

=== modified file 'templates/e2e-cron.tmpl'
--- templates/e2e-cron.tmpl	2016-01-25 13:09:45 +0000
+++ templates/e2e-cron.tmpl	2016-02-01 13:59:37 +0000
@@ -1,3 +1,4 @@
 # Cron job to run e2e check 
 MAILTO=""
-{{ cron_expression }} nagios run-one python {{ charm_dir }}/files/nrpe/check_lumberjack_e2e.py --es {{ es_ips }} -f {{ e2e_file }} {{ e2e_params }}
+{{ cron_expression }} nagios run-this-one python3 {{ charm_dir }}/files/nrpe/check_lumberjack_e2e.py --es {{ es_ips }} -f {{ e2e_file }} {{ e2e_params }}
+