summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-elasticsearch
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-12-10 18:55:03 +0200
committerTal Gitelman <tg851x@intl.att.com>2017-12-10 19:33:38 +0200
commit51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 (patch)
tree3ac236a864d74d19b0f5c9020891a7a7e5c31b44 /sdc-os-chef/sdc-elasticsearch
parentb5cc2e0695f195716d6ccdc65e73807a6632ec70 (diff)
Final commit to master merge from
Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'sdc-os-chef/sdc-elasticsearch')
-rw-r--r--sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb21
1 files changed, 6 insertions, 15 deletions
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