summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef
diff options
context:
space:
mode:
authorYuli Shlosberg <ys9693@att.com>2017-12-18 15:06:12 +0200
committerYuli Shlosberg <ys9693@att.com>2017-12-25 15:46:32 +0000
commit7b9ef5920d732106337338e65dd92feda1d05731 (patch)
treeb0a958d67af0b3d8ed93778c0e79474281e02b08 /sdc-os-chef
parent05c625fb9c3673d6c60511958f7e051257247c2b (diff)
Kibana and import normative API fix
Change-Id: Ic365ed2122dc16f35b54a064166f4774650c9029 Issue-ID: SDC-265 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'sdc-os-chef')
-rw-r--r--sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_create_audit_template.rb7
-rw-r--r--sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb2
-rw-r--r--sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/templates/default/kibana.yml.erb2
-rw-r--r--sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb1
4 files changed, 10 insertions, 2 deletions
diff --git a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_create_audit_template.rb b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_create_audit_template.rb
index 2d882631f2..4e8136c626 100644
--- a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_create_audit_template.rb
+++ b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_create_audit_template.rb
@@ -236,3 +236,10 @@ bash "create audit mapping" do
"aliases": { "last_3_months": {}}}' http://localhost:9200/_template/audit_template
EOH
end
+
+bash "set default index for Kibana" do
+ code <<-EOH
+ curl -XPUT http://localhost:9200/.kibana/index-pattern/auditingevents-* -d '{"title" : "events-*", "timeFieldName": "TIMESTAMP"}'
+ curl -XPUT http://localhost:9200/.kibana/config/4.3.3 -d '{"defaultIndex" : "auditingevents-*"}'
+ EOH
+end
diff --git a/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb b/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb
index b30893c63f..448a2bc642 100644
--- a/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb
+++ b/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/recipes/setup_kibana.rb
@@ -19,7 +19,7 @@ end
bash "echo status" do
code <<-EOH
- echo "DOCKER STARTED"
+ echo "DOCKER STARTED"
EOH
end
diff --git a/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/templates/default/kibana.yml.erb b/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/templates/default/kibana.yml.erb
index 7179a96512..d2c9e7d5c8 100644
--- a/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/templates/default/kibana.yml.erb
+++ b/sdc-os-chef/sdc-kibana/chef-repo/cookbooks/sdc-kibana/templates/default/kibana.yml.erb
@@ -21,7 +21,7 @@ elasticsearch.url: "http://<%= @catalog_host %>:<%= @catalog_port %>/sdc2/esGate
# kibana.index: ".kibana"
# The default application to load.
-# kibana.defaultAppId: "discover"
+kibana.defaultAppId: "dashboard/BI-Dashboard"
# If your Elasticsearch is protected with basic auth, these are the user credentials
# used by the Kibana server to perform maintenance on the kibana_index at startup. Your Kibana
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb
index 91c09db818..c57269c764 100644
--- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb
@@ -18,6 +18,7 @@ errorConfigurationFile: <%= @errorConfigurationFile %>
configurationFile: <%= @ConfigurationFile %>
importTypesConfigDir: <%= @importTypesDir %>
titanPropertiesFile: <%= @titan_file %>
+systemUnderDebug: false
cassandraHost: <%= @CASSANDRA_IP %>
cassandraAuthenticate: true