diff --git a/manifests/logging/server.pp b/manifests/logging/server.pp index b7bb7c89..bca3a9ad 100644 --- a/manifests/logging/server.pp +++ b/manifests/logging/server.pp @@ -40,7 +40,12 @@ class cloud::logging::server( include ::kibana3 include cloud::database::nosql::elasticsearch include cloud::logging::agent - elasticsearch::instance {'fluentd' : } + + # Elasticsearch 1.4 ships with a security setting that prevents Kibana from connecting. + # We need to allow http cors in fluentd instance. + elasticsearch::instance {'fluentd' : + config => { 'http' => { 'cors.enabled' => true } } + } @@haproxy::balancermember{"${::fqdn}-kibana": listening_service => 'kibana', diff --git a/spec/classes/cloud_logging_server_spec.rb b/spec/classes/cloud_logging_server_spec.rb index c00485e4..f66e7036 100644 --- a/spec/classes/cloud_logging_server_spec.rb +++ b/spec/classes/cloud_logging_server_spec.rb @@ -39,7 +39,9 @@ describe 'cloud::logging::server' do end it 'configure an elasticsearch instance' do - is_expected.to contain_elasticsearch__instance('fluentd') + is_expected.to contain_elasticsearch__instance('fluentd').with( + :config => { 'http' => { 'cors.enabled' => true } } + ) end context 'with default firewall enabled' do