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

[Michael Nelson]

Merge upstream (which now has web-relation-joined http relation).
Fixed conflicts.
Fixed charm proof errors.

This branch just re-merges the upstream lp:charms/trusty/kibana and resolves the conflicts (main one being that upstream still uses 'web' rather than 'website', even though it's changed the type to 'http').

Once this is merged, we should be able to ask for this MP to be merged upstream:

https://code.launchpad.net/~canonical-is-sa/charms/trusty/kibana/trunk/+merge/260026

so that the exec.d support and elasticsearch url support gets added upstream.

I'm just testing this now with a local deploy.

[Michael Foley (foli)]

This looks good.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-03-26 03:45:25 +0000
+++ config.yaml	2015-10-28 04:20:49 +0000
@@ -11,8 +11,16 @@
         type: string
         default: '74c6b8b79d1bfc7e4d5376e3c9ecb0fa1e79c986'
         description: the sha1sum of the kibana_source
+    port:
+        type: int
+        default: 80
+        description: The tcp port on which nginx will listen.
+    path:
+        type: string
+        default: ''
+        description: 'The url path of kibana. This is required if kibana is
+        proxied at a non root path. e.g. http://example.com/kibana/'
     elasticsearch_url:
         type: string
         default: '"http://"+window.location.hostname'
         description: URL to for elasticsearch line in config.sh, defaults to '"http://"+window.location.hostname'
-        

=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2015-10-28 04:20:49 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -eux
+
+PORT=$(config-get port)
+KIBANA_PATH=$(config-get path)
+
+sed -i "s/listen.*/listen *:$PORT;/" /etc/nginx/sites-available/kibana
+
+sed -i "s@elasticsearch: .*@elasticsearch: '//'+window.location.hostname+'$KIBANA_PATH',@" /srv/kibana3/config.js
+
+service nginx reload
+
+[[ -r .PREVOPENPORT ]] && PREVOPENPORT=$(cat .PREVOPENPORT) || PREVOPENPORT=''
+[[ -z "$PREVOPENPORT" ]] || close-port $PREVOPENPORT/tcp
+
+open-port $PORT/tcp
+echo $PORT > .PREVOPENPORT
+

=== modified file 'hooks/install'
--- hooks/install	2015-04-21 00:28:13 +0000
+++ hooks/install	2015-10-28 04:20:49 +0000
@@ -31,8 +31,10 @@
 
 pushd /srv
 
-tar xzvf /tmp/kibana.tgz
-mv ${KIBANA_SOURCE_UNPACK_DIRECTORY} kibana3
+if [[ ! -d kibana3 ]]; then
+    tar xzvf /tmp/kibana.tgz
+    mv ${KIBANA_SOURCE_UNPACK_DIRECTORY} kibana3
+fi
 
 rm -f /etc/nginx/sites-enabled/default
 
@@ -40,9 +42,12 @@
 
 rm -f /srv/kibana3/config.js
 install -o root -g root -m 0644 files/charm/config.js /srv/kibana3/config.js
+
 # edit the elasticsearch line to be the value of option elasticsearch_url
 sed -r -i -e 's|(^\s*elasticsearch:\s*).*$|\1'"${ELASTICSEARCH_URL}"',|' /srv/kibana3/config.js
 
+hooks/config-changed
+
 ln -s /etc/nginx/sites-available/kibana /etc/nginx/sites-enabled/kibana
 ln -s /etc/nginx/sites-available/es_cluster /etc/nginx/sites-enabled/es_cluster
 

=== modified file 'hooks/start'
--- hooks/start	2013-09-29 21:58:50 +0000
+++ hooks/start	2015-10-28 04:20:49 +0000
@@ -3,6 +3,4 @@
 # Note that currently this is run directly after install
 # i.e. 'service apache2 start'
 
-initctl start nginx
-#open-port 5601/tcp
-open-port 80/tcp
+service nginx start

=== modified file 'hooks/stop'
--- hooks/stop	2013-09-29 21:58:50 +0000
+++ hooks/stop	2015-10-28 04:20:49 +0000
@@ -6,5 +6,6 @@
 # balancer to stop sending traffic.
 # rm /srv/webroot/server-live.txt && sleep 30
 
-initctl stop nginx
-close-port 80/tcp
+service nginx stop
+[[ -r .PREVOPENPORT ]] && PREVOPENPORT=$(cat .PREVOPENPORT) || PREVOPENPORT=''
+[[ -z "$PREVOPENPORT" ]] || close-port $PREVOPENPORT/tcp

=== renamed file 'hooks/website-relation-joined' => 'hooks/web-relation-joined' (properties changed: -x to +x)
--- hooks/website-relation-joined	2015-03-25 02:40:25 +0000
+++ hooks/web-relation-joined	2015-10-28 04:20:49 +0000
@@ -2,7 +2,8 @@
 set -eux
 juju-log $JUJU_REMOTE_UNIT joined
 
+PORT=$(config-get port)
+
 # Set ip/port for web relation
-relation-set port="80"
+relation-set port="$PORT"
 relation-set host=`unit-get private-address`
-

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-03-25 02:40:25 +0000
+++ metadata.yaml	2015-10-28 04:20:49 +0000
@@ -6,7 +6,7 @@
 tags:
   - applications  
 provides:
-  website:
+  web:
     interface: http
 requires:
   rest:

=== added file 'tests/12-port-change.py'
--- tests/12-port-change.py	1970-01-01 00:00:00 +0000
+++ tests/12-port-change.py	2015-10-28 04:20:49 +0000
@@ -0,0 +1,32 @@
+#!/usr/bin/python3
+
+import amulet
+import requests
+
+seconds = 20000
+
+d = amulet.Deployment(series='trusty')
+
+d.add('kibana')
+d.configure('kibana', {'port': 81})
+
+d.expose('kibana')
+
+try:
+    d.setup(timeout=seconds)
+except amulet.helpers.TimeoutError:
+    amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+except:
+    raise
+
+
+def test_web_interface():
+    kibana_unit = d.sentry.unit['kibana/0']
+    url = 'http://%s:81/' % kibana_unit.info['public-address']
+    r = requests.get(url)
+    if not r.ok:
+        amulet.raise_status(amulet.FAIL,
+                            msg="Error getting kibana page.")
+
+
+test_web_interface()