Merge branch 'docs/elastic' into 'master'

Split Elasticsearch docs to admin and user

Closes #2056

See merge request !2375

doc/README.md

@@ -54,6 +54,8 @@ Shortcuts to GitLab's most visited docs:
   - [Create a group](gitlab-basics/create-group.md)
   - [GitLab Subgroups](user/group/subgroups/index.md)
 - [Search through GitLab](user/search/index.md): Search for issues, merge requests, projects, groups, todos, and issues in Issue Boards.
+  - **(EES/EEP)** [Advanced Global Search](user/search/advanced_global_search.md): Leverage Elasticsearch for faster, more advanced code search across your entire GitLab instance.
+  - **(EES/EEP)** [Advanced Syntax Search](user/search/advanced_search_syntax.md): Use advanced queries for more targeted search results.
 - [Snippets](user/snippets.md): Snippets allow you to create little bits of code.
 - [Wikis](user/project/wiki/index.md): Enhance your repository documentation with built-in wikis.
 - [GitLab Pages](user/project/pages/index.md): Build, test, and deploy your static website with GitLab Pages.
@@ -161,7 +163,7 @@ have access to GitLab administration tools and settings.
 - [User cohorts](user/admin_area/user_cohorts.md) View user activity over time.
 - [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab.
 - **(EES/EEP)** [Audit logs and events](administration/audit_events.md): View the changes made within the GitLab server.
-- **(EES/EEP)** [Elasticsearch](integration/elasticsearch.md): A flexible, scalable and powerful search service to keep GitLab's search fast when dealing with huge amount of data.
+- **(EES/EEP)** [Elasticsearch](integration/elasticsearch.md): Enable Elasticsearch which powers GitLab's Advanced Global Search. Useful when you deal with a huge amount of data.
 - **(EES/EEP)** [Email users](tools/email.md): Email GitLab users from within GitLab.
 - **(EES/EEP)** [Limit project size](user/admin_area/settings/account_and_limit_settings.md): Set a hard limit for your repositories' size.
 - **(EEP)** [Auditor users](administration/auditor_users.md): Users with read-only access to all projects, groups, and other resources on the GitLab instance.

doc/user/search/advanced_global_search.md

+# Advanced Global Search
+
+>
+- [Introduced][ee-109] in GitLab [Enterprise Edition Starter][ee] 8.4.
+- This is the user documentation. To install and configure Elasticsearch,
+  visit the [admin docs](../../integration/elasticsearch.md).
+
+Leverage Elasticsearch for faster, more advanced code search across your entire
+GitLab instance.
+
+## Overview
+
+The Advanced Global Search in GitLab is a powerful search service that saves
+you time. Instead of creating duplicate code and wasting time, you can
+now search for code within other teams that can help your own project.
+
+GitLab leverages the search capabilities of [Elasticsearch] and enables it when
+searching in:
+
+- GitLab application
+- Projects
+- Repositories
+- Commits
+- Issues
+- Merge requests
+- Milestones
+- Notes (comments)
+- Snippets
+- Wiki
+
+## Use cases
+
+The Advanced Global Search can be useful in various scenarios.
+
+### Faster searches
+
+If you are dealing with huge amount of data and want to keep GitLab's search
+fast, the Advanced Global Search will help you achieve that.
+
+### Promote innersourcing
+
+Your company may consist of many different developer teams each of which has
+their own group where the various projects are hosted. Some of your applications
+may be connected to each other, so your developers need to instantly search
+throughout the GitLab instance and find the code they search for.
+
+## Searching globally
+
+Just use the search as before and GitLab will show you matching code from each
+project you have access to.
+
+![Advanced Global Search](img/advanced_global_search.png)
+
+You can also use the [Advanced Syntax Search](advanced_search_syntax.md) which
+provides some useful queries.
+
+>**Note:**
+Elasticsearch has only data for the default branch. That means that if you go
+to the repository tree and switch the branch from the default to something else,
+then the "Code" tab in the search result page will be served by the regular
+search even if Elasticsearch is enabled.
+
+[ee-1305]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1305
+[aws-elastic]: http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html
+[aws-iam]: http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html
+[aws-instance-profile]: http://docs.aws.amazon.com/codedeploy/latest/userguide/getting-started-create-iam-instance-profile.html#getting-started-create-iam-instance-profile-cli
+[ee-109]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/109 "Elasticsearch Merge Request"
+[elasticsearch]: https://www.elastic.co/products/elasticsearch "Elasticsearch website"
+[install]: https://www.elastic.co/guide/en/elasticsearch/reference/current/_installation.html "Elasticsearch installation documentation"
+[pkg]: https://about.gitlab.com/downloads/ "Download Omnibus GitLab"
+[elastic-settings]: https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration.html#settings "Elasticsearch configuration settings"
+[ee]: https://about.gitlab.com/gitlab-ee/
+[es]: https://www.elastic.co/products/elasticsearch

doc/user/search/advanced_search_syntax.md

-# Advanced search syntax
+# Advanced Syntax Search
 
 >**Notes:**
 - Introduced in [GitLab Enterprise Starter][ee] 9.2
-- The [Elasticsearch integration](../../integration/elasticsearch.md) needs to
-  be enabled
+- This is the user documentation. To install and configure Elasticsearch,
+  visit the [admin docs](../../integration/elasticsearch.md).
 
-Full details can be found in the
-[Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-simple-query-string-query.html#_simple_query_string_syntax)
-but here's a quick guide:
+Use advanced queries for more targeted search results.
+
+## Overview
+
+The Advanced Syntax Search is a subset of the
+[Advanced Global Search](advanced_global_search.md), which you can use if you
+want to have more specific search results.
+
+## Use cases
+
+Let's say for example that the product you develop relies on the code of another
+product that's hosted under some other group.
+
+Since under your GitLab instance there are hosted hundreds of different projects,
+you need the search results to be as efficient as possible. You have a feeling
+of what you want to find (e.g., a function name), but at the same you're also
+not so sure.
+
+In that case, using the regular expressions in your query will yield much better
+results.
+
+## Using the Advanced Syntax Search
+
+The Advanced Syntax Search supports queries of ranges, wildcards, regular
+expressions, fuzziness and much more.
+
+Full details can be found in the [Elasticsearch documentation][elastic], but
+here's a quick guide:
 
 * Searches look for all the words in a query, in any order - e.g.: searching
   issues for `display bug` will return all issues matching both those words, in any order.
@@ -17,5 +42,7 @@ but here's a quick guide:
 * To group terms together, use parentheses: `bug | (display +sound)`
 * To match a partial word, use `*`: `bug find_by_*`
 * To find a term containing one of these symbols, use `\`: `argument \-last`
+* To limit the results based on the time  "created_at:[2012-01-01 TO 2012-12-31]" and other sweet stuff
 
 [ee]: https://about.gitlab.com/gitlab-ee/
+[elastic]: https://www.elastic.co/guide/en/elasticsearch/reference/5.3/query-dsl-simple-query-string-query.html#_simple_query_string_syntax

doc/user/search/index.md

@@ -103,13 +103,17 @@ and **Labels**, select multiple issues to add to a list of your choice:
 
 ![search and select issues to add to board](img/search_issues_board.png)
 
-## Advanced search syntax
+## Advanced Global Search
 
-> Available in [GitLab Enterprise Edition Premium][ee].
+Leverage Elasticsearch for faster, more advanced code search across your entire
+GitLab instance.
 
-If the [Elasticsearch integration](../../integration/elasticsearch.md) is
-enabled, then some advanced search functionality is available.
+[Learn how to use the Advanced Global Search.](advanced_global_search.md)
 
-[Learn how to use the advanced search syntax.](advanced_search_syntax.md)
+## Advanced Syntax Search
+
+Use advanced queries for more targeted search results.
+
+[Learn how to use the Advanced Syntax Search.](advanced_search_syntax.md)
 
 [ee]: https://about.gitlab.com/gitlab-ee/