x
/
fuel-plugin-elasticsearch-kibana
Code Issues Proposed changes

Use standard HTTP ports 

Depends-On: Id94cae82b2bea92e049975ccc9e91e4383f52931
Change-Id: I534edfd8da3999312b175a08b18a89b8972dbdca
This commit is contained in:
Swann Croiset 2016-07-05 15:21:46 +02:00 committed by Simon Pasquier
parent fd448620de
commit 51bbdc809c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment_scripts/puppet/manifests/hiera_override.pp
View File

@ -130,8 +130,13 @@ lma::corosync_roles:
lma::elasticsearch::vip: <%= @vip %>
lma::elasticsearch::es_haproxy_service: elasticsearch-rest
lma::elasticsearch::listen_address: <%= @listen_address%>
<% if @tls_enabled -%>
lma::elasticsearch::kibana_frontend_port: 443
lma::elasticsearch::kibana_frontend_viewer_port: 8443
<% else -%>
lma::elasticsearch::kibana_frontend_port: 80
lma::elasticsearch::kibana_frontend_viewer_port: 81
lma::elasticsearch::kibana_frontend_viewer_port: 8000
<% end -%>
lma::elasticsearch::apache_port: 80
lma::elasticsearch::apache_viewer_port: 81
lma::elasticsearch::kibana_port: 5601

13
deployment_scripts/puppet/manifests/provision_services.pp
View File

@ -17,7 +17,6 @@ notice('fuel-plugin-elasticsearch-kibana: provision_services.pp')
$deployment_id = hiera('deployment_id')
$master_ip = hiera('master_ip')
$vip = hiera('lma::elasticsearch::vip')
$kibana_port = hiera('lma::elasticsearch::kibana_frontend_port')
$kibana_viewer_port = hiera('lma::elasticsearch::kibana_frontend_viewer_port')
$es_port = hiera('lma::elasticsearch::rest_port')
$number_of_replicas = hiera('lma::elasticsearch::number_of_replicas')
@ -34,29 +33,29 @@ if $kibana_tls['enabled'] {
$kibana_hostname = $kibana_tls['hostname']
if $two_links {
$kibana_link_data = "{\"title\":\"Kibana (Admin role)\",\
\"description\":\"Dashboard for visualizing logs and notifications (${kibana_hostname}: ${protocol}://${vip}:${kibana_port})\",\
\"url\":\"${protocol}://${kibana_hostname}:${kibana_port}/\"}"
\"description\":\"Dashboard for visualizing logs and notifications (${kibana_hostname}: ${protocol}://${vip})\",\
\"url\":\"${protocol}://${kibana_hostname}\"}"
$kibana_link_viewer_data = "{\"title\":\"Kibana (Viewer role)\",\
\"description\":\"Dashboard for visualizing logs and notifications (${kibana_hostname}: ${protocol}://${vip}:${kibana_viewer_port})\",\
\"url\":\"${protocol}://${kibana_hostname}:${kibana_viewer_port}/\"}"
} else {
$kibana_link_data = "{\"title\":\"Kibana\",\
\"description\":\"Dashboard for visualizing logs and notifications (${kibana_hostname}: ${protocol}://${vip}:${kibana_port})\",\
\"url\":\"${protocol}://${kibana_hostname}:${kibana_port}/\"}"
\"description\":\"Dashboard for visualizing logs and notifications (${kibana_hostname}: ${protocol}://${vip})\",\
\"url\":\"${protocol}://${kibana_hostname}\"}"
}
} else {
$protocol = 'http'
if $two_links {
$kibana_link_data = "{\"title\":\"Kibana (Admin role)\",\
\"description\":\"Dashboard for visualizing logs and notifications\",\
\"url\":\"${protocol}://${vip}:${kibana_port}/\"}"
\"url\":\"${protocol}://${vip}\"}"
$kibana_link_viewer_data = "{\"title\":\"Kibana (Viewer role)\",\
\"description\":\"Dashboard for visualizing logs and notifications\",\
\"url\":\"${protocol}://${vip}:${kibana_viewer_port}/\"}"
} else {
$kibana_link_data = "{\"title\":\"Kibana\",\
\"description\":\"Dashboard for visualizing logs and notifications\",\
\"url\":\"${protocol}://${vip}:${kibana_port}/\"}"
\"url\":\"${protocol}://${vip}\"}"
}
}