From ce79dcb720e611faf54f580e75224a49145b6c97 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 23 May 2013 15:35:35 -0700 Subject: [PATCH] Fix elasticsearch connectivity on logstash.o.o. The new elasticsearch server needs to be able to connect back to logstash over the elasticsearch ports. Also make kibana talk to the new elasticsearch server. Change-Id: I88af40c7885b263fcef5ff16210f073cd0a696a5 Reviewed-on: https://review.openstack.org/30354 Reviewed-by: Jeremy Stanley Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- manifests/init.pp | 7 +++++-- files/config.rb => templates/config.rb.erb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) rename files/config.rb => templates/config.rb.erb (98%) diff --git a/manifests/init.pp b/manifests/init.pp index 7eebb50..2987eaf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,7 +14,9 @@ # # Class to install kibana frontend to logstash. # -class kibana { +class kibana ( + $elasticsearch_host = 'localhost' +) { group { 'kibana': ensure => present, @@ -67,7 +69,8 @@ class kibana { file { '/opt/kibana/kibana/KibanaConfig.rb': ensure => present, - source => 'puppet:///modules/kibana/config.rb', + content => template('kibana/config.rb.erb'), + replace => true, owner => 'kibana', group => 'kibana', require => Vcsrepo['/opt/kibana/kibana'], diff --git a/files/config.rb b/templates/config.rb.erb similarity index 98% rename from files/config.rb rename to templates/config.rb.erb index e45fee2..98f0d9f 100755 --- a/files/config.rb +++ 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 = "localhost:9200" + Elasticsearch = "<%= scope.lookupvar("::kibana::elasticsearch_host") %>:9200" #Set the Net::HTTP read/open timeouts for the connection to the ES backend ElasticsearchTimeout = 500