From c7932eaf206b16dbdce61f517d991b8c69b1a021 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Sat, 22 Jun 2013 10:39:04 -0700 Subject: [PATCH] Better elasticsearch cluster settings. Use mutliple discover nodes to determine elasticsearch cluster membership. Put a timeout on recovery starting instead of the default to recovery immediately. Describe cluster topology in elasticsearch yaml config so that it can make smarter decisions. Round robin kibana requests across each discover node. Change-Id: I08ef9dd158ddf6a6ce01dfb2050626f543d45b10 Reviewed-on: https://review.openstack.org/34106 Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Approved: James E. Blair Tested-by: Jenkins --- manifests/init.pp | 2 +- templates/config.rb.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 0fcfd3c..eb091ab 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,7 +15,7 @@ # Class to install kibana frontend to logstash. # class kibana ( - $discover_node = 'localhost' + $discover_nodes = ['localhost:9200'] ) { group { 'kibana': diff --git a/templates/config.rb.erb b/templates/config.rb.erb index 65384ec..b59843e 100755 --- a/templates/config.rb.erb +++ b/templates/config.rb.erb @@ -7,7 +7,7 @@ module KibanaConfig # Your elastic search server(s). This may be set as an array for round robin # load balancing # Elasticsearch = ["elasticsearch1:9200","elasticsearch2:9200"] - Elasticsearch = "<%= scope.lookupvar("::kibana::discover_node") %>:9200" + Elasticsearch = ["<%= scope.lookupvar("::kibana::discover_nodes").join("\",\"") %>"] #Set the Net::HTTP read/open timeouts for the connection to the ES backend ElasticsearchTimeout = 500