docs(elasticsearch): began work on elasticsearch docs #2862

docs/Makefile

@@ -44,7 +44,7 @@ docs-test: docs-build
 	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
 
 docs-build:
-	git fetch https://github.com/grafana/grafana.git docs-1.x && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files
+	git fetch https://github.com/grafana/grafana.git docs-2.1 && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files
 	echo "$(GIT_BRANCH)" > GIT_BRANCH
 	echo "$(GITCOMMIT)" > GITCOMMIT
 	docker build -t "$(DOCKER_DOCS_IMAGE)" .

docs/VERSION

@@ -1 +1 @@
-2.1.0
+2.5.0

docs/mkdocs.yml

@@ -66,6 +66,7 @@ pages:
 
 - ['datasources/overview.md', 'Data Sources', 'Overview']
 - ['datasources/graphite.md', 'Data Sources', 'Graphite']
+- ['datasources/elasticsearch.md', 'Data Sources', 'Elasticsearch']
 - ['datasources/influxdb.md', 'Data Sources', 'InfluxDB']
 - ['datasources/opentsdb.md', 'Data Sources', 'OpenTSDB']
 - ['datasources/kairosdb.md', 'Data Sources', 'KairosDB']

docs/sources/datasources/elasticsearch.md

@@ -0,0 +1,55 @@
+----
+page_title: Elasticsearch
+page_description: Elasticsearch grafana datasource documentation
+page_keywords: Elasticsearch, grafana, kibana, documentation, datasource, docs
+---
+
+# Elasticsearch
+
+Grafana ships with advanced support for Elasticsearch. You can do many types of
+simple or complex elasticsearch queries to visualize logs or metrics stored in elasticsearch. You can
+also annotate your graphs with log events stored in elasticsearch.
+
+## Adding the data source
+![](/img/v2/add_Graphite.jpg)
+
+1. Open the side menu by clicking the the Grafana icon in the top header.
+2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
+
+    > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
+
+3. Click the `Add new` link in the top header.
+4. Select `Elasticsearch` from the dropdown.
+
+Name | Description
+------------ | -------------
+Name | The data source name, important that this is the same as in Grafana v1.x if you plan to import old dashboards.
+Default | Default data source means that it will be pre-selected for new panels.
+Url | The http protocol, ip and port of you elasticsearch server.
+Access | Proxy = access via Grafana backend, Direct = access directory from browser.
+
+Proxy access means that the Grafana backend will proxy all requests from the browser, and send them on to the Data Source. This is useful because it can eliminate CORS (Cross Origin Site Resource) issues, as well as eliminate the need to disseminate authentication details to the Data Source to the browser.
+
+Direct access is still supported because in some cases it may be useful to access a Data Source directly depending on the use case and topology of Grafana, the user, and the Data Source.
+
+### Direct access
+If you select direct access you must update your Elasticsearch configuration to allow other domains to access
+Elasticsearch from the browser. You do this by specifying these to options in your **elasticsearch.yml** config file.
+
+    http.cors.enabled: true
+    http.cors.allow-origin: "*"
+
+### Index settings
+
+![](/img/elasticsearch/elasticsearch_ds_details.png)
+
+
+## Metric editor
+
+### Navigate metric segments
+Click the ``Select metric`` link to start navigating the metric space. One you start you can continue using the mouse
+or keyboard arrow keys. You can select a wildcard and still continue.
+
+![](/img/animated_gifs/graphite_query1.gif)
+
+

docs/sources/datasources/graphite.md

@@ -10,11 +10,11 @@ Grafana has an advanced Graphite query editor that lets you quickly navigate the
 change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested
 queries through the use of query references.
 
-## Adding the data source to Grafana
+## Adding the data source
 ![](/img/v2/add_Graphite.jpg)
 
-1. Open the side menu by clicking the the Grafana icon in the top header. 
-2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.    
+1. Open the side menu by clicking the the Grafana icon in the top header.
+2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
 
     > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
 

docs/sources/datasources/influxdb.md

@@ -12,11 +12,11 @@ them as different data sources.
 
 InfluxDB 0.9 is rapidly evolving and we continue to track its API. InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users.
 
-## Adding the data source to Grafana
+## Adding the data source
 ![](/img/v2/add_Influx.jpg)
 
-1. Open the side menu by clicking the the Grafana icon in the top header. 
-2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.    
+1. Open the side menu by clicking the the Grafana icon in the top header.
+2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
 
     > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
 

docs/sources/versions.html_fragment

@@ -1,3 +1,4 @@
+<li><a class='version' href='/v2.1'>Version v2.5</a></li>
 <li><a class='version' href='/v2.1'>Version v2.1</a></li>
 <li><a class='version' href='/v2.0'>Version v2.0</a></li>
 <li><a class='version' href='/v1.9'>Version v1.9</a></li>