Merge lp:~michael.nelson/charms/trusty/kibana/kibana4-merge-upstream into lp:~canonical-is-sa/charms/trusty/kibana/kibana4

[Michael Nelson]

Merge upstream kibana changes and update test (so it's not expecting kibana to proxy external requests for :9200 to ES).

This just merges the upstream changes that landed last week (r23) and then updates a test which is assuming that requests to kibana on :9200 will be proxied to ES (something that we've explicitly dis-allowed in our kibana4 branch).

Ensured the test works locally:
dev-trusty# ~/charms/kibana/trusty/kibana
$ ./tests/11-scale-elastic.py
2015-11-09 03:09:35 Starting deployment of local
2015-11-09 03:09:35 Deploying services...
2015-11-09 03:09:35 Deploying service elasticsearch using cs:trusty/elasticsearch-12
2015-11-09 03:09:43 Deploying service kibana using /home/michael/charms/kibana/trusty/kibana
2015-11-09 03:09:48 Deploying service logstash-indexer using cs:precise/logstash-indexer-4
2015-11-09 03:13:08 Adding relations...
2015-11-09 03:13:08 Adding relation logstash-indexer:cluster <-> elasticsearch:client
2015-11-09 03:13:09 Adding relation kibana:rest <-> elasticsearch:client
2015-11-09 03:14:09 Exposing service 'kibana'
2015-11-09 03:14:09 Deployment complete in 275.00 seconds
dev-trusty# ~/charms/kibana/trusty/kibana
$

[Michael Foley (foli)]

+1

review: Approve

=== modified file 'hooks/rest-relation-departed'
--- hooks/rest-relation-departed	2013-11-26 08:51:58 +0000
+++ hooks/rest-relation-departed	2015-11-09 03:19:12 +0000
@@ -1,2 +1,3 @@
 #!/bin/sh
 juju-log $JUJU_REMOTE_UNIT departed
+close-port 9200/tcp

=== modified file 'hooks/rest-relation-joined'
--- hooks/rest-relation-joined	2013-11-26 08:51:58 +0000
+++ hooks/rest-relation-joined	2015-11-09 03:19:12 +0000
@@ -1,2 +1,3 @@
 #!/bin/bash
 juju-log $JUJU_REMOTE_UNIT joined
+open-port 9200/tcp

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-10-28 04:08:59 +0000
+++ metadata.yaml	2015-11-09 03:19:12 +0000
@@ -1,6 +1,8 @@
 name: kibana
 summary: alternative (better) logstash frontend
-maintainer: Paul Czarkowski <[e-mail]>
+maintainers:
+  - Paul Czarkowski <[e-mail]>
+  - Chris MacNaughton <[e-mail]>
 description: |
   alternative (better) logstash frontend
 tags:

=== modified file 'tests/11-scale-elastic.py'
--- tests/11-scale-elastic.py	2015-10-09 20:54:45 +0000
+++ tests/11-scale-elastic.py	2015-11-09 03:19:12 +0000
@@ -33,8 +33,8 @@
 ##
 # Set relationship aliases
 ##
-kibana_unit = d.sentry.unit['kibana/0']
-elasticsearch_unit = d.sentry.unit['elasticsearch/1']
+kibana_unit = d.sentry['kibana'][0]
+elasticsearch_unit = d.sentry['elasticsearch'][1]
 
 
 def test_web_interface():
@@ -50,26 +50,26 @@
 
     time.sleep(3)
 
-    url = 'http://%s:9200/_all/_search' % kibana_unit.info['public-address']
-    test_dir = os.path.dirname(__file__)
-    test_data_file = os.path.join(test_dir, '11-scale-elastic-query.json')
-    with open(test_data_file) as fp:
-        test_data = json.load(fp)
-    r = requests.get(url, params=test_data)
-    if not r.ok:
-        amulet.raise_status(amulet.FAIL,
-                            msg="Error performing search.")
+    # Ensure the kibana unit can query ES via localhost (it proxies local 9200
+    # queries to ES)
+    url = 'http://127.0.0.1:9200/_all/_search'
+    result = kibana_unit.run(
+        "curl -XGET {url} -d '@11-scale-elastic-query.json'".format(url=url))
+    if not result[1] == 0:
+        amulet.raise_status(
+            amulet.FAIL, msg="Error performing search. Error code: {}. "
+                             "Result:\n{}".format(result[1], result[0]))
     try:
-        result = r.json()
+        result = json.loads(result[0])
         if result['hits']['total'] != 1:
             amulet.raise_status(amulet.FAIL,
                                 msg="Error inserting value in elasticsearch.")
     except ValueError:
         exc_type, value, traceback = sys.exc_info()
         exc_text = "Exception: (%s) %s. %s" % (value, exc_type, traceback)
-        amulet.raise_status(amulet.FAIL,
-                            msg="Value returned not a valid json." + r.text +
-                            exc_text)
+        amulet.raise_status(
+            amulet.FAIL, msg="Value returned not a valid json.\n{}\n{}".format(
+                result[0], exc_text))
 
 
 test_web_interface()

=== modified file 'tests/12-port-change.py'
--- tests/12-port-change.py	2015-10-09 20:54:45 +0000
+++ tests/12-port-change.py	2015-11-09 03:19:12 +0000
@@ -27,7 +27,7 @@
 
 
 def test_web_interface():
-    kibana_unit = d.sentry.unit['kibana/0']
+    kibana_unit = d.sentry['kibana'][0]
     url = 'http://%s:81/' % kibana_unit.info['public-address']
     r = requests.get(url)
     if not r.ok: