From 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Sun, 10 Dec 2017 18:55:03 +0200 Subject: Final commit to master merge from Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman --- .../ES_6_create_kibana_dashboard_virtualization.rb | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'sdc-os-chef/sdc-elasticsearch') diff --git a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb index 216d103fa3..a35c9bec40 100644 --- a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb +++ b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb @@ -1,12 +1,3 @@ -cookbook_file "/usr/share/elasticsearch/config/kibana_dashboard_virtualization.json" do - source "kibana_dashboard_virtualization.json" - owner "elasticsearch" - group "elasticsearch" - mode "0755" -end - - - ruby_block "check_ElasticSearch_Cluster_Health" do block do #tricky way to load this Chef::Mixin::ShellOut utilities @@ -29,12 +20,6 @@ ruby_block "check_ElasticSearch_Cluster_Health" do retry_delay 2 end -bash "echo status" do - code <<-EOH - echo "DOCKER STARTED" - EOH -end - bash "create Kibana dashboard" do code <<-EOH for file in /root/chef-solo/cookbooks/sdc-elasticsearch/files/default/dashboard_*.json; do @@ -55,4 +40,10 @@ bash "create Kibana visualization" do echo done EOH +end + +bash "echo status" do + code <<-EOH + echo "DOCKER STARTED" + EOH end \ No newline at end of file -- cgit 1.2.3-korg