summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2013-05-23 15:35:35 -0700
committerJenkins <jenkins@review.openstack.org>2013-05-23 23:46:30 +0000
commitce79dcb720e611faf54f580e75224a49145b6c97 (patch)
tree36a1829ed763430f8bfca55f0c355ac688aaa012
parent54fb22d626f7b11944531981cc171ea06d95fcbd (diff)
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
-rw-r--r--manifests/init.pp7
-rwxr-xr-xtemplates/config.rb.erb (renamed from files/config.rb)2
2 files changed, 6 insertions, 3 deletions
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 @@
14# 14#
15# Class to install kibana frontend to logstash. 15# Class to install kibana frontend to logstash.
16# 16#
17class kibana { 17class kibana (
18 $elasticsearch_host = 'localhost'
19) {
18 20
19 group { 'kibana': 21 group { 'kibana':
20 ensure => present, 22 ensure => present,
@@ -67,7 +69,8 @@ class kibana {
67 69
68 file { '/opt/kibana/kibana/KibanaConfig.rb': 70 file { '/opt/kibana/kibana/KibanaConfig.rb':
69 ensure => present, 71 ensure => present,
70 source => 'puppet:///modules/kibana/config.rb', 72 content => template('kibana/config.rb.erb'),
73 replace => true,
71 owner => 'kibana', 74 owner => 'kibana',
72 group => 'kibana', 75 group => 'kibana',
73 require => Vcsrepo['/opt/kibana/kibana'], 76 require => Vcsrepo['/opt/kibana/kibana'],
diff --git a/files/config.rb b/templates/config.rb.erb
index e45fee2..98f0d9f 100755
--- a/files/config.rb
+++ b/templates/config.rb.erb
@@ -7,7 +7,7 @@ module KibanaConfig
7 # Your elastic search server(s). This may be set as an array for round robin 7 # Your elastic search server(s). This may be set as an array for round robin
8 # load balancing 8 # load balancing
9 # Elasticsearch = ["elasticsearch1:9200","elasticsearch2:9200"] 9 # Elasticsearch = ["elasticsearch1:9200","elasticsearch2:9200"]
10 Elasticsearch = "localhost:9200" 10 Elasticsearch = "<%= scope.lookupvar("::kibana::elasticsearch_host") %>:9200"
11 11
12 #Set the Net::HTTP read/open timeouts for the connection to the ES backend 12 #Set the Net::HTTP read/open timeouts for the connection to the ES backend
13 ElasticsearchTimeout = 500 13 ElasticsearchTimeout = 500