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

Do not wait cluster green status to import dashboards 

The cluster can be red/yellow because of other non related indices,
but this doesn't prevent to create the kibana-int index.

Fixes-bug: #1540951

Change-Id: Ie2fef890f51abc061b3938bdb76cc84d054c6e0d
This commit is contained in:
Swann Croiset 2016-02-03 16:17:24 +01:00
parent 579a73467a
commit 75ee58450a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment_scripts/puppet/modules/lma_logging_analytics/manifests/kibana_dashboard.pp
View File

@ -32,8 +32,7 @@ define lma_logging_analytics::kibana_dashboard (
$dashboard_source = encode_kibana_dashboard('guest', 'guest', $dashboard_title, $content)
exec { $title:
onlyif => ["/usr/bin/curl -sL -w \"%{http_code}\\n\" -XGET ${es_url}/_cluster/health?wait_for_status=green | grep 200 > /dev/null",
"/usr/bin/curl -sL -w \"%{http_code}\\n\" -XHEAD ${es_url}/kibana-int/dashboard/${dashboard_id} | grep 404 > /dev/null"],
onlyif => "/usr/bin/curl -sL -w \"%{http_code}\\n\" -XHEAD ${es_url}/kibana-int/dashboard/${dashboard_id} | grep 404 > /dev/null",
command => "/usr/bin/curl -sL -w \"%{http_code}\\n\" -XPUT ${es_url}/kibana-int/dashboard/${dashboard_id} -d '${dashboard_source}' -o /dev/null | egrep \"(200|201)\" > /dev/null",
}
}