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

Proposed by justinsb on 2014-04-14
Status: Merged
Merged at revision: 8
Proposed branch: lp:~justin-fathomdb/charms/precise/kibana/update-version
Merge into: lp:charms/kibana
Diff against target: 168 lines (+53/-45)
4 files modified
config.yaml (+3/-3)
files/charm/config.js (+42/-21)
files/charm/kibana-service.conf (+0/-21)
files/charm/nginx.conf (+8/-0)
To merge this branch: bzr merge lp:~justin-fathomdb/charms/precise/kibana/update-version
Reviewer Review Type Date Requested Status
Marco Ceppi 2014-04-14 Approve on 2014-04-28
Review via email: mp+215699@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Marco Ceppi (marcoceppi) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2013-11-26 09:37:56 +0000
3+++ config.yaml 2014-04-14 16:02:25 +0000
4@@ -1,13 +1,13 @@
5 options:
6 kibana_source:
7 type: string
8- default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.0.0milestone4.tar.gz'
9+ default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.0.0.tar.gz'
10 description: URL to download the source for kibana
11 kibana_source_unpack_directory:
12 type: string
13- default: 'kibana-3.0.0milestone4'
14+ default: 'kibana-3.0.0'
15 description: the name of the directory the tar.gz will unpack to
16 kibana_source_checksum:
17 type: string
18- default: '3ee5416c8a61fa95ba9280631a66997e'
19+ default: 'cef6dc8061c8800ddc5eb2725b9220c0'
20 description: the md5sum of the kibana_source
21
22=== modified file 'files/charm/config.js'
23--- files/charm/config.js 2013-09-29 21:58:50 +0000
24+++ files/charm/config.js 2014-04-14 16:02:25 +0000
25@@ -1,54 +1,75 @@
26-/**
27- * These is the app's configuration, If you need to configure
28- * the default dashboard, please see dashboards/default
29+/** @scratch /configuration/config.js/1
30+ *
31+ * == Configuration
32+ * config.js is where you will find the core Kibana configuration. This file contains parameter that
33+ * must be set before kibana is run for the first time.
34 */
35 define(['settings'],
36 function (Settings) {
37
38
39+ /** @scratch /configuration/config.js/2
40+ *
41+ * === Parameters
42+ */
43 return new Settings({
44
45- /**
46- * URL to your elasticsearch server. You almost certainly don't
47- * want 'http://localhost:9200' here. Even if Kibana and ES are on
48- * the same host
49- *
50- * By default this will attempt to reach ES at the same host you have
51- * elasticsearch installed on. You probably want to set it to the FQDN of your
52+ /** @scratch /configuration/config.js/5
53+ *
54+ * ==== elasticsearch
55+ *
56+ * The URL to your elasticsearch server. You almost certainly don't
57+ * want +http://localhost:9200+ here. Even if Kibana and Elasticsearch are on
58+ * the same host. By default this will attempt to reach ES at the same host you have
59+ * kibana installed on. You probably want to set it to the FQDN of your
60 * elasticsearch host
61- * @type {String}
62 */
63 elasticsearch: "http://"+window.location.hostname,
64
65- /**
66+ /** @scratch /configuration/config.js/5
67+ *
68+ * ==== default_route
69+ *
70+ * This is the default landing page when you don't specify a dashboard to load. You can specify
71+ * files, scripts or saved dashboards here. For example, if you had saved a dashboard called
72+ * `WebLogs' to elasticsearch you might use:
73+ *
74+ * default_route: '/dashboard/elasticsearch/WebLogs',
75+ */
76+ default_route : '/dashboard/file/default.json',
77+
78+ /** @scratch /configuration/config.js/5
79+ *
80+ * ==== kibana-int
81+ *
82 * The default ES index to use for storing Kibana specific object
83 * such as stored dashboards
84- * @type {String}
85 */
86 kibana_index: "kibana-int",
87
88- /**
89- * Panel modules available. Panels will only be loaded when they are defined in the
90+ /** @scratch /configuration/config.js/5
91+ *
92+ * ==== panel_name
93+ *
94+ * An array of panel modules available. Panels will only be loaded when they are defined in the
95 * dashboard, but this list is used in the "add panel" interface.
96- * @type {Array}
97 */
98 panel_names: [
99 'histogram',
100 'map',
101- 'pie',
102+ 'goal',
103 'table',
104 'filtering',
105 'timepicker',
106 'text',
107- 'fields',
108 'hits',
109- 'dashcontrol',
110 'column',
111- 'derivequeries',
112 'trends',
113 'bettermap',
114 'query',
115- 'terms'
116+ 'terms',
117+ 'stats',
118+ 'sparklines'
119 ]
120 });
121 });
122\ No newline at end of file
123
124=== removed file 'files/charm/kibana-service.conf'
125--- files/charm/kibana-service.conf 2012-11-06 04:38:09 +0000
126+++ files/charm/kibana-service.conf 1970-01-01 00:00:00 +0000
127@@ -1,21 +0,0 @@
128-#!/usr/bin/bash
129-
130-# kibana service
131-#
132-
133-description "kibana service"
134-
135-start on virtual-filesystems
136-stop on runlevel [06]
137-
138-respawn
139-respawn limit 5 30
140-env HOME=/opt/kibana
141-chdir /opt/kibana
142-setuid kibana
143-setgid kibana
144-console log
145-
146-script
147- ruby /opt/kibana/kibana.rb
148-end script
149\ No newline at end of file
150
151=== modified file 'files/charm/nginx.conf'
152--- files/charm/nginx.conf 2013-11-26 09:44:11 +0000
153+++ files/charm/nginx.conf 2014-04-14 16:02:25 +0000
154@@ -13,6 +13,14 @@
155 proxy_pass http://es_cluster;
156 proxy_read_timeout 90;
157 }
158+ location ~ ^/.*/_aliases$ {
159+ proxy_pass http://es_cluster;
160+ proxy_read_timeout 90;
161+ }
162+ location ~ ^/_nodes$ {
163+ proxy_pass http://es_cluster;
164+ proxy_read_timeout 90;
165+ }
166 location ~ ^/.*/_search$ {
167 proxy_pass http://es_cluster;
168 proxy_read_timeout 90;

Subscribers

People subscribed via source and target branches

to all changes: