From 55faed7c9dc608f9428cc96ae7cdff3dfd5ad9dd Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Wed, 8 Mar 2017 13:43:02 -0500 Subject: Fix wrong recipe name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The cookbook is looking for ES_6_create_kibana_dashboard_virtualization but the file name is ES_6_kibana_dashboard_virtualization Change the file name to ES_6_create_kibana_dashboard_virtualization to be consistent with the naming convention define in this cookbook. Change-Id: Ieac5ce1203be68db21554f21b2f1e851a6b774d1 Signed-off-by: Alexis de Talhouët --- .../ES_6_create_kibana_dashboard_virtualization.rb | 57 ++++++++++++++++++++++ .../ES_6_kibana_dashboard_virtualization.rb | 57 ---------------------- 2 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb delete mode 100644 sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_kibana_dashboard_virtualization.rb 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 new file mode 100644 index 0000000000..a3b15073a1 --- /dev/null +++ b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_create_kibana_dashboard_virtualization.rb @@ -0,0 +1,57 @@ +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 + Chef::Resource::RubyBlock.send(:include, Chef::Mixin::ShellOut) + #curl_command = "http://#{node['ipaddress']}:9200/_cluster/health?pretty=true" + curl_command = "http://localhost:9200/_cluster/health?pretty=true" + resp = Net::HTTP.get_response URI.parse(curl_command) + stat = JSON.parse(resp.read_body)['status'] + + case stat + when "green" + printf("\033[32m%s\n\033[0m", " ElasticSearch Cluster status is green.") + when "yellow" + printf("\033[33m%s\n\033[0m", " ElasticSearch Cluster status is yellow...") + when "red" + printf("\033[31m%s\n\033[0m", " ElasticSearch Cluster status is red!") + end + end + retries 10 + retry_delay 2 +end + + +bash "create Kibana dashboard" do + code <<-EOH + for file in /root/chef-solo/cookbooks/sdc-elasticsearch/files/default/dashboard_*.json; do + name=`basename $file .json | awk -F"_" '{print $2}'` + echo "Loading dashboard $name:" + curl -XPUT http://localhost:9200/.kibana/dashboard/$name -d @$file || exit 1 + echo + done + EOH +end + + +bash "create Kibana visualization" do + code <<-EOH + for file in /root/chef-solo/cookbooks/sdc-elasticsearch/files/default/visualization_*.json; do + name=`basename $file .json | awk -F"_" '{print $2}'` + echo "Loading visualization $name:" + curl -XPUT http://localhost:9200/.kibana/visualization/$name -d @$file || exit 1 + echo + done + EOH +end + + + diff --git a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_kibana_dashboard_virtualization.rb b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_kibana_dashboard_virtualization.rb deleted file mode 100644 index a3b15073a1..0000000000 --- a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_6_kibana_dashboard_virtualization.rb +++ /dev/null @@ -1,57 +0,0 @@ -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 - Chef::Resource::RubyBlock.send(:include, Chef::Mixin::ShellOut) - #curl_command = "http://#{node['ipaddress']}:9200/_cluster/health?pretty=true" - curl_command = "http://localhost:9200/_cluster/health?pretty=true" - resp = Net::HTTP.get_response URI.parse(curl_command) - stat = JSON.parse(resp.read_body)['status'] - - case stat - when "green" - printf("\033[32m%s\n\033[0m", " ElasticSearch Cluster status is green.") - when "yellow" - printf("\033[33m%s\n\033[0m", " ElasticSearch Cluster status is yellow...") - when "red" - printf("\033[31m%s\n\033[0m", " ElasticSearch Cluster status is red!") - end - end - retries 10 - retry_delay 2 -end - - -bash "create Kibana dashboard" do - code <<-EOH - for file in /root/chef-solo/cookbooks/sdc-elasticsearch/files/default/dashboard_*.json; do - name=`basename $file .json | awk -F"_" '{print $2}'` - echo "Loading dashboard $name:" - curl -XPUT http://localhost:9200/.kibana/dashboard/$name -d @$file || exit 1 - echo - done - EOH -end - - -bash "create Kibana visualization" do - code <<-EOH - for file in /root/chef-solo/cookbooks/sdc-elasticsearch/files/default/visualization_*.json; do - name=`basename $file .json | awk -F"_" '{print $2}'` - echo "Loading visualization $name:" - curl -XPUT http://localhost:9200/.kibana/visualization/$name -d @$file || exit 1 - echo - done - EOH -end - - - -- cgit 1.2.3-korg