Merge lp:~justin-fathomdb/charms/precise/kibana/update-version into lp:charms/kibana

[justinsb]

Update to latest kibana (3.0.0-milestone -> 3.0.0)

[Marco Ceppi (marcoceppi)]

Hi Justin, thank you so much for this change! We really appreciate the work in making these charms up today. I noticed you removed the upstart script from this, is there an upstart/init script that comes packaged now with the latest kibana?

Going through the charm I don't see it being used, and it's just exposed via nginx. This LGTM otherwise.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-11-26 09:37:56 +0000
+++ config.yaml	2014-04-14 16:02:25 +0000
@@ -1,13 +1,13 @@
 options:
     kibana_source:
         type: string
-        default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.0.0milestone4.tar.gz'
+        default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.0.0.tar.gz'
         description: URL to download the source for kibana
     kibana_source_unpack_directory:
         type: string
-        default: 'kibana-3.0.0milestone4'
+        default: 'kibana-3.0.0'
         description: the name of the directory the tar.gz will unpack to
     kibana_source_checksum:
         type: string
-        default: '3ee5416c8a61fa95ba9280631a66997e'
+        default: 'cef6dc8061c8800ddc5eb2725b9220c0'
         description: the md5sum of the kibana_source
 
=== modified file 'files/charm/config.js'
--- files/charm/config.js	2013-09-29 21:58:50 +0000
+++ files/charm/config.js	2014-04-14 16:02:25 +0000
@@ -1,54 +1,75 @@
-/**
- * These is the app's configuration, If you need to configure
- * the default dashboard, please see dashboards/default
+/** @scratch /configuration/config.js/1
+ *
+ * == Configuration
+ * config.js is where you will find the core Kibana configuration. This file contains parameter that
+ * must be set before kibana is run for the first time.
  */
 define(['settings'],
 function (Settings) {
   
 
+  /** @scratch /configuration/config.js/2
+   *
+   * === Parameters
+   */
   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
+    /** @scratch /configuration/config.js/5
+     *
+     * ==== elasticsearch
+     *
+     * The URL to your elasticsearch server. You almost certainly don't
+     * want +http://localhost:9200+ here. Even if Kibana and Elasticsearch are on
+     * the same host. By default this will attempt to reach ES at the same host you have
+     * kibana installed on. You probably want to set it to the FQDN of your
      * elasticsearch host
-     * @type {String}
      */
     elasticsearch: "http://"+window.location.hostname,
 
-    /**
+    /** @scratch /configuration/config.js/5
+     *
+     * ==== default_route
+     *
+     * This is the default landing page when you don't specify a dashboard to load. You can specify
+     * files, scripts or saved dashboards here. For example, if you had saved a dashboard called
+     * `WebLogs' to elasticsearch you might use:
+     *
+     * default_route: '/dashboard/elasticsearch/WebLogs',
+     */
+    default_route     : '/dashboard/file/default.json',
+
+    /** @scratch /configuration/config.js/5
+     *
+     * ==== kibana-int
+     *
      * 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
+    /** @scratch /configuration/config.js/5
+     *
+     * ==== panel_name
+     *
+     * An array of 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',
+      'goal',
       'table',
       'filtering',
       'timepicker',
       'text',
-      'fields',
       'hits',
-      'dashcontrol',
       'column',
-      'derivequeries',
       'trends',
       'bettermap',
       'query',
-      'terms'
+      'terms',
+      'stats',
+      'sparklines'
     ]
   });
 });
 \ No newline at end of file
 
=== removed file 'files/charm/kibana-service.conf'
--- files/charm/kibana-service.conf	2012-11-06 04:38:09 +0000
+++ files/charm/kibana-service.conf	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/usr/bin/bash
-
-# kibana service
-#
-
-description     "kibana service"
-
-start on virtual-filesystems
-stop on runlevel [06]
-
-respawn
-respawn limit 5 30
-env HOME=/opt/kibana
-chdir /opt/kibana
-setuid kibana
-setgid kibana
-console log
-
-script
-  ruby /opt/kibana/kibana.rb
-end script
 \ No newline at end of file
 
=== modified file 'files/charm/nginx.conf'
--- files/charm/nginx.conf	2013-11-26 09:44:11 +0000
+++ files/charm/nginx.conf	2014-04-14 16:02:25 +0000
@@ -13,6 +13,14 @@
     proxy_pass http://es_cluster;
     proxy_read_timeout 90;
   }
+  location ~ ^/.*/_aliases$ {
+    proxy_pass http://es_cluster;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/_nodes$ {
+    proxy_pass http://es_cluster;
+    proxy_read_timeout 90;
+  }
   location ~ ^/.*/_search$ {
     proxy_pass http://es_cluster;
     proxy_read_timeout 90;