Merge lp:~lazypower/charms/trusty/elasticsearch/20-bump into lp:charms/trusty/elasticsearch

[Charles Butler]

Bump in config, and templating for ES 2.x

[Chris Glass (tribaal)]

Looks good! +1

review: Approve

[Michael Nelson (michael.nelson)]

Hey Chris, Chuck. Since we're landing the changed defaults, I've put an MP with some other changes you may be keen to see landed (these are changes that we're using in production already, but have only tested with 2.x):

https://code.launchpad.net/~michael.nelson/charms/trusty/elasticsearch/merge-elasticsearch2-branch/+merge/288721

Cheers

=== modified file 'config.yaml'
--- config.yaml	2015-11-09 16:30:42 +0000
+++ config.yaml	2016-03-08 16:40:03 +0000
@@ -1,7 +1,7 @@
 options:
   apt-repository:
     type: string
-    default: "deb [arch=amd64] http://packages.elastic.co/elasticsearch/1.7/debian stable main"
+    default: "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main"
     description: |
       A deb-line for the apt archive which contains the elasticsearch package.
       This is necessary until elasticsearch gets into the debian/ubuntu archives.

=== modified file 'templates/elasticsearch.yml'
--- templates/elasticsearch.yml	2014-10-29 00:57:26 +0000
+++ templates/elasticsearch.yml	2016-03-08 16:40:03 +0000
@@ -3,8 +3,11 @@
 
 cluster.name: {{ cluster_name }}
 http.port: 9200
+network.host: ["_site_", "_local_"]
 discovery.zen.ping.multicast.enabled: false
 discovery.zen.ping.unicast.hosts:
 {% for reln in relations.peer %}
   - {{ reln['private-address'] }}
 {% endfor %}
+# workaround for Kibana4 Export Everything bug https://github.com/elastic/kibana/issues/5524
+index.max_result_window: 2147483647