Merge lp:~paulcz/charms/precise/kibana/trunk into lp:charms/kibana

[Paul Czarkowski]

* updated for kibana3
* uses nginx to serve up kibana3
* uses nginx to proxy/LB for elasticsearch connectivity

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

[lp:~paulcz/charms/precise/kibana/trunk]

7. By Paul Czarkowski on 2013-10-08

default logstash dashboard

=== modified file 'README.md'
--- README.md	2012-11-22 16:38:58 +0000
+++ README.md	2013-09-29 22:20:07 +0000
@@ -9,9 +9,12 @@
 ----------------
 
  using this charm :
+
     juju deploy kibana
     juju expose kibana
+ 
  not much use on its own ... you'll probably want the full stack
+ 
     juju deploy elasticsearch
     juju deploy logstash-indexer
     juju add-relation logstash-indexer elasticsearch:cluster
@@ -19,7 +22,7 @@
     juju add-relation kibana elasticsearch:rest
     juju expose kibana
 
-    browse to http://ip-address to begin searching.
+browse to http://ip-address to begin searching.
 
 Configuration
 -------------

=== added file 'files/charm/config.js'
--- files/charm/config.js	1970-01-01 00:00:00 +0000
+++ files/charm/config.js	2013-09-29 22:20:07 +0000
@@ -0,0 +1,54 @@
+/**
+ * These is the app's configuration, If you need to configure
+ * the default dashboard, please see dashboards/default
+ */
+define(['settings'],
+function (Settings) {
+  
+
+  return new Settings({
+
+    /**
+     * URL to your elasticsearch server. You almost certainly don't
+     * want 'http://localhost:9200' here. Even if Kibana and ES are on
+     * the same host
+     *
+     * By default this will attempt to reach ES at the same host you have
+     * elasticsearch installed on. You probably want to set it to the FQDN of your
+     * elasticsearch host
+     * @type {String}
+     */
+    elasticsearch: "http://"+window.location.hostname,
+
+    /**
+     * The default ES index to use for storing Kibana specific object
+     * such as stored dashboards
+     * @type {String}
+     */
+    kibana_index: "kibana-int",
+
+    /**
+     * Panel modules available. Panels will only be loaded when they are defined in the
+     * dashboard, but this list is used in the "add panel" interface.
+     * @type {Array}
+     */
+    panel_names: [
+      'histogram',
+      'map',
+      'pie',
+      'table',
+      'filtering',
+      'timepicker',
+      'text',
+      'fields',
+      'hits',
+      'dashcontrol',
+      'column',
+      'derivequeries',
+      'trends',
+      'bettermap',
+      'query',
+      'terms'
+    ]
+  });
+});
\ No newline at end of file

=== removed file 'files/charm/kibana-ruby.tar.gz'
Binary files files/charm/kibana-ruby.tar.gz	2012-11-06 04:38:09 +0000 and files/charm/kibana-ruby.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'files/charm/nginx.conf'
--- files/charm/nginx.conf	1970-01-01 00:00:00 +0000
+++ files/charm/nginx.conf	2013-09-29 22:20:07 +0000
@@ -0,0 +1,35 @@
+server {
+  listen *:80 ;
+
+  server_name kibana;
+  access_log /var/log/nginx/kibana.access.log;
+
+  location / {
+    root /usr/share/kibana3;
+    index index.html index.htm;
+  }
+
+  location ~ ^/_aliases$ {
+    proxy_pass http://es_cluster;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/.*/_search$ {
+    proxy_pass http://es_cluster;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/.*/_mapping$ {
+    proxy_pass http://es_cluster;
+    proxy_read_timeout 90;
+  }
+
+   location ~ ^/kibana-int/dashboard/.*$ {
+    proxy_pass http://es_cluster;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/kibana-int/temp.*$ {
+    proxy_pass http://es_cluster;
+    proxy_read_timeout 90;
+  }  
+}
+
+

=== added file 'files/charm/nginx_lb.conf'
--- files/charm/nginx_lb.conf	1970-01-01 00:00:00 +0000
+++ files/charm/nginx_lb.conf	2013-09-29 22:20:07 +0000
@@ -0,0 +1,3 @@
+upstream es_cluster {
+  server localhost:9200;
+}
\ No newline at end of file

=== modified file 'hooks/install'
--- hooks/install	2012-11-22 16:43:50 +0000
+++ hooks/install	2013-09-29 22:20:07 +0000
@@ -4,50 +4,33 @@
 # Make sure this hook exits cleanly and is idempotent, common problems here are failing to account for a debconf question on a dependency, or trying to pull from github without installing git first.
 set -eux # -x for verbose logging to juju debug-log
 HOME=$PWD
-CHECKSUM="fc290faf6967edad9f65b5182a2905c1"
+CHECKSUM="8614d80e8afdb9d936e8574b24e9b405"
 HOST=`unit-get private-address`
 
 juju-log "install dependency"
-apt-get install -y ruby curl wget rubygems rinetd
-service rinetd stop
-
-juju-log "download and/or copy kibana tarball"
-if [ -f "files/charm/kibana-ruby.tar.gz" ]
-  then
-    juju-log "kibana binary found local,copy to /tmp"
-    install -o root -g root -m 0644 files/charm/kibana-ruby.tar.gz /tmp/kibana-ruby.tar.gz
-  else
-    # Download and checksum
-    juju-log "kibana binary not found local ... download"
-    wget -q -O /tmp/kibana-ruby.tar.gz "https://github.com/rashidkpc/Kibana/tarball/kibana-ruby"
-    uncomment if you want to checksum
-    #if [[ $(md5sum "/tmp/kibana-ruby.tar.gz " | cut -d " " -f 1) != ${CHECKSUM} ]]; then
-    #  juju-log --log-level CRITICAL "/tmp/kibana-ruby.tar.gz failed MD5 checksum"
-    #  exit 1
-    #fi
-  fi
-
-juju-log "extract kibana tarball and moveto /opt/kibana"
-mkdir -p /opt/kibana
-cd /opt/kibana
-tar xzvf /tmp/kibana-ruby.tar.gz --strip=1 --show-transformed-names
-juju-log "install kibana required gems"
-sed -i "s|http://rubygems.org|https://rubygems.org|" /opt/kibana/Gemfile
-gem install bundler
-bundle install
-sed -i "s|KibanaHost =.*|KibanaHost = \"127.0.0.1\"|" /opt/kibana/KibanaConfig.rb
-cd $HOME
-juju-log "create kibana user"
-useradd kibana
-chown -R kibana. /opt/kibana
-
-juju-log "Install upstart init script"
-install -o root -g root -m 0644 files/charm/kibana-service.conf /etc/init/kibana.conf
-
-# I want kibana to answer on port 80 ... using rinetd...  so I don't need to run as root.
-# Maybe I'll set up an apache reverse proxy to enable https at some point.
-juju-log "configure rinetd to push ${HOST}:80 traffic to localhost:5601"
-echo "${HOST} 80 127.0.0.1 5601" >> /etc/rinetd.conf
-
-
-
+apt-get install -y curl wget git nginx
+
+juju-log "download kibana from elasticsearch.org"
+wget -q -O /tmp/kibana-latest.tgz https://download.elasticsearch.org/kibana/kibana/kibana-latest.tar.gz
+
+install -o root -g root -m 0644 files/charm/nginx.conf /etc/nginx/sites-available/kibana
+install -o root -g root -m 0644 files/charm/nginx_lb.conf /etc/nginx/sites-available/es_cluster
+
+pushd /usr/share
+
+tar xzvf /tmp/kibana-latest.tgz
+
+mv kibana-latest kibana3
+
+rm -f /etc/nginx/sites-enabled/default
+
+popd
+
+rm -f /usr/share/kibana3/config.js
+install -o root -g root -m 0644 files/charm/config.js /usr/share/kibana3/config.js
+
+
+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
+
+service nginx restart

=== modified file 'hooks/rest-relation-changed'
--- hooks/rest-relation-changed	2012-11-18 22:29:29 +0000
+++ hooks/rest-relation-changed	2013-09-29 22:20:07 +0000
@@ -12,21 +12,19 @@
 juju-log Relation members:
 relation-list
 
+echo "upstream es_cluster {"   > /etc/nginx/sites-available/es_cluster
+
 CLUSTER_NAME=`relation-get cluster-name`
 ES_HOST_LIST="none"
 for MEMBER in `relation-list`
 do
   ES_HOST=`relation-get private-address ${MEMBER}`
-  if [  ${ES_HOST_LIST} = "none" ]; then
-    ES_HOST_LIST="'${ES_HOST}:9200'"
-  else
-    ES_HOST_LIST=${ES_HOST_LIST},"'${ES_HOST}:9200'"
-  fi
+  echo "  server ${ES_HOST}:9200;" >> /etc/nginx/sites-available/es_cluster
 done
 
-juju-log "joined elasticsearch : ${CLUSTER_NAME} - hosts ${ES_HOST_LIST}"
-# host setting should ensure this works even when multicast discovery is broken
-
-sed -i "s|Elasticsearch =.*|Elasticsearch = [ ${ES_HOST_LIST} ]|" /opt/kibana/KibanaConfig.rb
-initctl restart kibana
-service rinetd restart
\ No newline at end of file
+echo "}" >> /etc/nginx/sites-available/es_cluster
+
+juju-log "modified list of ES hosts kibana can talk to :-"
+cat /etc/nginx/sites-available/es_cluster
+
+service nginx restart

=== modified file 'hooks/rest-relation-joined'
--- hooks/rest-relation-joined	2012-11-22 16:43:50 +0000
+++ hooks/rest-relation-joined	2013-09-29 22:20:07 +0000
@@ -3,5 +3,4 @@
 # affect any change needed by relationships being formed
 # This script should be idempotent.
 set -eux # -x for verbose logging to juju debug-log
-juju-log $JUJU_REMOTE_UNIT joined
-
+juju-log $JUJU_REMOTE_UNIT joined
\ No newline at end of file

=== modified file 'hooks/start'
--- hooks/start	2012-11-11 18:31:31 +0000
+++ hooks/start	2013-09-29 22:20:07 +0000
@@ -3,8 +3,6 @@
 # Note that currently this is run directly after install
 # i.e. 'service apache2 start'
 
-initctl start kibana
+initctl start nginx
 #open-port 5601/tcp
-sleep 10s
-service rinetd start
 open-port 80/tcp

=== modified file 'hooks/stop'
--- hooks/stop	2012-11-11 18:31:31 +0000
+++ hooks/stop	2013-09-29 22:20:07 +0000
@@ -6,7 +6,5 @@
 # balancer to stop sending traffic.
 # rm /srv/webroot/server-live.txt && sleep 30
 
-initctl stop kibana
-#close-port 5601/tcp
-service rinetd stop
+initctl stop nginx
 close-port 80/tcp

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-11-06 04:38:09 +0000
+++ metadata.yaml	2013-09-29 22:20:07 +0000
@@ -3,6 +3,8 @@
 maintainer: Paul Czarkowski <[e-mail]>
 description: |
   alternative (better) logstash frontend
+categories:
+  - applications  
 provides:
   web:
     interface: kibana

=== modified file 'revision'
--- revision	2012-11-06 04:38:09 +0000
+++ revision	2013-09-29 22:20:07 +0000
@@ -1,1 +1,1 @@
-1
+2