adding extra_config attribute

notion · Aug 2, 2017 · d1ae249 · d1ae249
1 parent 01de8d6
commit d1ae249
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -166,6 +166,9 @@
 #<> The kibana 4 default application on load
 default['kibana']['defaultapp'] = 'discover'
 
+# Extra config options for kibana.yml (key: value)
+default['kibana']['extra_config'] = {}
+
 # Logging options. Logs to stdout by default.
 default['kibana']['log_to_file'] = false
 default['kibana']['logfile'] = "#{node['kibana']['base_dir']}/kibana.log"

diff --git a/recipes/kibana4.rb b/recipes/kibana4.rb
@@ -48,7 +48,8 @@
     es_port:        node['kibana']['elasticsearch']['port'],
     index:          node['kibana']['index'],
     defaultapp:     node['kibana']['defaultapp'],
-    logging_option: node['kibana']['logging_option']
+    logging_option: node['kibana']['logging_option'],
+    extra_config:   node['kibana']['extra_config']
   )
   notifies :restart, 'service[kibana]'
 end

diff --git a/recipes/kibana5.rb b/recipes/kibana5.rb
@@ -50,7 +50,8 @@
     es_port:        node['kibana']['elasticsearch']['port'],
     index:          node['kibana']['index'],
     defaultapp:     node['kibana']['defaultapp'],
-    logging_option: node['kibana']['logging_option']
+    logging_option: node['kibana']['logging_option'],
+    extra_config:   node['kibana']['extra_config']
   )
   notifies :restart, 'service[kibana]'
 end

diff --git a/templates/default/kibana4.yml.erb b/templates/default/kibana4.yml.erb
@@ -81,3 +81,9 @@ bundled_plugin_ids:
  - plugins/table_vis/index
  - plugins/vis_types/index
  - plugins/visualize/index
+
+
+# Extra config
+<% @extra_config.each do |k,v| %>
+<%= k %>: <%= v %>
+<% end %>
diff --git a/templates/default/kibana5.yml.erb b/templates/default/kibana5.yml.erb
@@ -69,16 +69,7 @@ elasticsearch.ssl.verify: true
 # logging.dest: ./kibana.log
 <%= @logging_option -%>
 
-
-# Plugins that are included in the build, and no longer found in the plugins/ folder
-bundled_plugin_ids:
- - plugins/dashboard/index
- - plugins/discover/index
- - plugins/doc/index
- - plugins/kibana/index
- - plugins/markdown_vis/index
- - plugins/metric_vis/index
- - plugins/settings/index
- - plugins/table_vis/index
- - plugins/vis_types/index
- - plugins/visualize/index
+# Extra config
+<% @extra_config.each do |k,v| %>
+<%= k %>: <%= v %>
+<% end %>