Merge branch 'elasticsearch_config' into 'master'

Add config options for Elasticsearch.

Related to #1048

See merge request !606

CHANGELOG.md

@@ -17,6 +17,7 @@ omnibus-gitlab repository.
 - Update ruby to 2.1.8 6f1d4204ca24f67bbf453c7d751ba7977c23f55e
 - Update git to 2.6.2 6f1d4204ca24f67bbf453c7d751ba7977c23f55e
 - Ensure that cache clear is run after db:migrate b4dfb1f7b493ae5ef5fabda5c04e2dee6f4b849e
+- Add support for Elasticsearch config (EE only)
 
 8.3.4
 

files/gitlab-config-template/gitlab.rb.template

@@ -75,7 +75,12 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['lfs_enabled'] = true
 # gitlab_rails['lfs_storage_path'] = "/mnt/storage/lfs-objects"
 
-## GitLab Pages
+## ElasticSearch (EE only)
+# gitlab_rails['elasticsearch_enabled'] = false
+# gitlab_rails['elasticsearch_host'] = "localhost"
+# gitlab_rails['elasticsearch_port'] = 9200
+
+## GitLab Pages (EE only)
 # gitlab_rails['pages_path'] = "/mnt/storage/pages"
 
 ## For setting up LDAP

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -102,6 +102,9 @@ default['gitlab']['gitlab-rails']['artifacts_enabled'] = true
 default['gitlab']['gitlab-rails']['artifacts_path'] = nil
 default['gitlab']['gitlab-rails']['lfs_enabled'] = false
 default['gitlab']['gitlab-rails']['lfs_storage_path'] = nil
+default['gitlab']['gitlab-rails']['elasticsearch_enabled'] = false
+default['gitlab']['gitlab-rails']['elasticsearch_host'] = nil
+default['gitlab']['gitlab-rails']['elasticsearch_port'] = nil
 default['gitlab']['gitlab-rails']['pages_enabled'] = false
 default['gitlab']['gitlab-rails']['pages_host'] = nil
 default['gitlab']['gitlab-rails']['pages_port'] = nil

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -116,7 +116,7 @@ production: &base
     # The location where LFS objects are stored (default: shared/lfs-objects).
     storage_path: <%= @lfs_storage_path %>
 
-  ## GitLab Pages
+  ## GitLab Pages (EE only)
   pages:
     enabled: <%= @pages_enabled %>
     path: <%= @pages_path %>
@@ -124,6 +124,14 @@ production: &base
     port: <%= @pages_port %>
     https: <%= @pages_https %>
 
+  ## Elasticsearch (EE only)
+  # Enable it if you are going to use elasticsearch instead of
+  # regular database search
+  elasticsearch:
+    enabled: <%= @elasticsearch_enabled %>
+    host: <%= @elasticsearch_host %>
+    port: <%= @elasticsearch_port %>
+
   ## Gravatar
   ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
   gravatar:

files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

@@ -16,6 +16,7 @@ exec chpst -e /opt/gitlab/etc/<%= @options[:rails_app] %>/env -P \
     -q incoming_email \
     -q common \
     -q pages \
+    -q elasticsearch \
     -q default \
     -e <%= node['gitlab'][@options[:rails_app]]['environment'] %> \
     -r /opt/gitlab/embedded/service/<%= @options[:rails_app] %> \