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

[Michael Foley]

Added ability to change the elasticsearch url for kibana so that it can be set to https. This is so that kibana can be secured behind an apache2 proxy with openid.

Also added support for ubuntu basenode.

[Adam Israel (aisrael)]

Hi Michael,

I had a chance to review this merge proposal today. Thanks for your work on improving the kibana charm!

`charm proof` alerted me to 'hooks/website-relation-joined' not being executable. That's not a blocker, as juju should do the right thing, but is an easy fix.

With a new feature such as this, I look for two things that I'm not seeing: some documentation about the new feature in the README, and a test to exercise it. If you could address both of those issues, I'll happily approve this merge.

Thanks once again for your work on this!

review: Needs Fixing

[Michael Nelson (michael.nelson)]

Hey there Michael. I'm just looking at this charm change, and it looks like upstream has already changed the web relation to 'http'. So I think that part is done. There are two other features you've included - the elasticsearch url config option, and the exec.d support.

I'll give you an MP to merge into your canonical-is-sa branch which re-merges trunk, so we can push those two options up for review again.

[lp:~canonical-is-sa/charms/trusty/kibana/trunk]

20. By Michael Foley on 2015-10-30

[michael.nelson,r=foli] Merge upstream (which now has web-relation-joined http relation). Fixed conflicts. Fixed charm proof errors. RT#85874

Unmerged revisions

=== modified file 'config.yaml'
--- config.yaml	2015-04-01 20:07:40 +0000
+++ config.yaml	2015-10-30 06:18:10 +0000
@@ -20,3 +20,7 @@
         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'

=== modified file 'files/charm/config.js'
--- files/charm/config.js	2014-04-14 15:59:48 +0000
+++ files/charm/config.js	2015-10-30 06:18:10 +0000
@@ -72,4 +72,4 @@
       'sparklines'
     ]
   });
-});
\ No newline at end of file
+});

=== modified file 'hooks/config-changed' (properties changed: -x to +x)
=== modified file 'hooks/install'
--- hooks/install	2015-06-18 18:49:22 +0000
+++ hooks/install	2015-10-30 06:18:10 +0000
@@ -1,10 +1,15 @@
 #!/bin/bash
 set -eux
+
+juju-log 'Invoking charm-pre-install hooks'
+[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )
+
 HOME=$PWD
 KIBANA_TARBALL=files/kibana.tgz
 KIBANA_SOURCE=$(config-get kibana_source)
 KIBANA_SOURCE_UNPACK_DIRECTORY=$(config-get kibana_source_unpack_directory)
 KIBANA_SOURCE_CHECKSUM=$(config-get kibana_source_checksum)
+ELASTICSEARCH_URL=$(config-get elasticsearch_url)
 HOST=$(unit-get private-address)
 
 juju-log "install dependency"
@@ -38,6 +43,9 @@
 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

=== modified file 'hooks/start' (properties changed: -x to +x)
=== added file 'hooks/web-relation-joined'
--- hooks/web-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/web-relation-joined	2015-10-30 06:18:10 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -eux
+juju-log $JUJU_REMOTE_UNIT joined
+
+PORT=$(config-get port)
+
+# Set ip/port for web relation
+relation-set port="$PORT"
+relation-set host=`unit-get private-address`

=== removed file 'hooks/web-relation-joined'
--- hooks/web-relation-joined	2015-04-01 20:07:40 +0000
+++ hooks/web-relation-joined	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -eux
-juju-log $JUJU_REMOTE_UNIT joined
-
-PORT=$(config-get port)
-
-# Set ip/port for web relation
-relation-set port="$PORT"
-relation-set host=`unit-get private-address`