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 <fungi@yuggoth.org>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-05-23 15:35:35 -07:00 committed by Jenkins
parent 54fb22d626
commit ce79dcb720
2 changed files with 6 additions and 3 deletions

View File

@ -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'],

View File

@ -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