docs: update after #11531

docs/sources/administration/provisioning.md

@@ -100,7 +100,7 @@ datasources:
 - name: Graphite
 - name: Graphite
   # <string, required> datasource type. Required
   # <string, required> datasource type. Required
   type: graphite
   type: graphite
-  # <string, required> access mode. direct or proxy. Required
+  # <string, required> access mode. proxy or direct (Server or Browser in the UI). Required
   access: proxy
   access: proxy
   # <int> org id. will default to orgId 1 if not specified
   # <int> org id. will default to orgId 1 if not specified
   orgId: 1
   orgId: 1

docs/sources/features/datasources/elasticsearch.md

@@ -29,13 +29,19 @@ Name | Description
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Url* | The HTTP protocol, IP, and port of your Elasticsearch server.
 *Url* | The HTTP protocol, IP, and port of your Elasticsearch server.
-*Access* | Proxy = access via Grafana backend, Direct = access directly from browser.
+*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the 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 to the browser.
+Access mode controls how requests to the data source will be handled. Server should be the preferred way if nothing else stated.
 
 
-### Direct access
+### Server access mode (Default)
 
 
-If you select direct access you must update your Elasticsearch configuration to allow other domains to access
+All requests will be made from the browser to Grafana backend/server which in turn will forward the requests to the data source and by that circumvent possible Cross-Origin Resource Sharing (CORS) requirements. The URL needs to be accessible from the grafana backend/server if you select this access mode.
+
+### Browser (Direct) access
+
+All requests will be made from the browser directly to the data source and may be subject to Cross-Origin Resource Sharing (CORS) requirements. The URL needs to be accessible from the browser if you select this access mode.
+
+If you select Browser 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.
 Elasticsearch from the browser. You do this by specifying these to options in your **elasticsearch.yml** config file.
 
 
 ```bash
 ```bash
@@ -45,7 +51,7 @@ http.cors.allow-origin: "*"
 
 
 ### Index settings
 ### Index settings
 
 
-![](/img/docs/elasticsearch/elasticsearch_ds_details.png)
+![Elasticsearch Datasource Details](/img/docs/elasticsearch/elasticsearch_ds_details.png)
 
 
 Here you can specify a default for the `time field` and specify the name of your Elasticsearch index. You can use
 Here you can specify a default for the `time field` and specify the name of your Elasticsearch index. You can use
 a time pattern for the index name or a wildcard.
 a time pattern for the index name or a wildcard.
@@ -57,7 +63,7 @@ are supported.
 
 
 ## Metric Query editor
 ## Metric Query editor
 
 
-![](/img/docs/elasticsearch/query_editor.png)
+![Elasticsearch Query Editor](/img/docs/elasticsearch/query_editor.png)
 
 
 The Elasticsearch query editor allows you to select multiple metrics and group by multiple terms or filters. Use the plus and minus icons to the right to add/remove
 The Elasticsearch query editor allows you to select multiple metrics and group by multiple terms or filters. Use the plus and minus icons to the right to add/remove
 metrics or group by clauses. Some metrics and group by clauses haves options, click the option text to expand the row to view and edit metric or group by options.
 metrics or group by clauses. Some metrics and group by clauses haves options, click the option text to expand the row to view and edit metric or group by options.

docs/sources/features/datasources/graphite.md

@@ -31,13 +31,22 @@ Name | Description
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Url* | The HTTP protocol, IP, and port of your graphite-web or graphite-api install.
 *Url* | The HTTP protocol, IP, and port of your graphite-web or graphite-api install.
-*Access* | Proxy = access via Grafana backend, Direct = access directly from browser.
+*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the 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 browser.
+Access mode controls how requests to the data source will be handled. Server should be the preferred way if nothing else stated.
+
+### Server access mode (Default)
+
+All requests will be made from the browser to Grafana backend/server which in turn will forward the requests to the data source and by that circumvent possible Cross-Origin Resource Sharing (CORS) requirements. The URL needs to be accessible from the grafana backend/server if you select this access mode.
+
+### Browser access mode
+
+All requests will be made from the browser directly to the data source and may be subject to Cross-Origin Resource Sharing (CORS) requirements. The URL needs to be accessible from the browser if you select this access mode.
 
 
 ## Metric editor
 ## Metric editor
 
 
 ### Navigate metric segments
 ### Navigate metric segments
+
 Click the ``Select metric`` link to start navigating the metric space. One you start you can continue using the mouse
 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.
 or keyboard arrow keys. You can select a wildcard and still continue.
 
 

docs/sources/features/datasources/influxdb.md

@@ -28,16 +28,20 @@ Name | Description
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Url* | The http protocol, ip and port of you influxdb api (influxdb api port is by default 8086)
 *Url* | The http protocol, ip and port of you influxdb api (influxdb api port is by default 8086)
-*Access* | Proxy = access via Grafana backend, Direct = access directly from browser.
+*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
 *Database* | Name of your influxdb database
 *Database* | Name of your influxdb database
 *User* | Name of your database user
 *User* | Name of your database user
 *Password* | Database user's password
 *Password* | Database user's password
 
 
-### Proxy vs Direct access
+Access mode controls how requests to the data source will be handled. Server should be the preferred way if nothing else stated.
 
 
-Proxy access means that the Grafana backend will proxy all requests from the browser. So requests to InfluxDB will be channeled through
-`grafana-server`. This means that the URL you specify needs to be accessible from the server you are running Grafana on. Proxy access
-mode is also more secure as the username & password will never reach the browser.
+### Server access mode (Default)
+
+All requests will be made from the browser to Grafana backend/server which in turn will forward the requests to the data source and by that circumvent possible Cross-Origin Resource Sharing (CORS) requirements. The URL needs to be accessible from the grafana backend/server if you select this access mode.
+
+### Browser access mode
+
+All requests will be made from the browser directly to the data source and may be subject to Cross-Origin Resource Sharing (CORS) requirements. The URL needs to be accessible from the browser if you select this access mode.
 
 
 ## Query Editor
 ## Query Editor
 
 

docs/sources/features/datasources/opentsdb.md

@@ -28,11 +28,10 @@ Name | Description
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Url* | The http protocol, ip and port of you opentsdb server (default port is usually 4242)
 *Url* | The http protocol, ip and port of you opentsdb server (default port is usually 4242)
-*Access* | Proxy = access via Grafana backend, Direct = access directly from browser.
+*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
 *Version* | Version = opentsdb version, either <=2.1 or 2.2
 *Version* | Version = opentsdb version, either <=2.1 or 2.2
 *Resolution* | Metrics from opentsdb may have datapoints with either second or millisecond resolution.
 *Resolution* | Metrics from opentsdb may have datapoints with either second or millisecond resolution.
 
 
-
 ## Query editor
 ## Query editor
 
 
 Open a graph in edit mode by click the title. Query editor will differ if the datasource has version <=2.1 or = 2.2.
 Open a graph in edit mode by click the title. Query editor will differ if the datasource has version <=2.1 or = 2.2.

docs/sources/features/datasources/prometheus.md

@@ -30,7 +30,7 @@ Name | Description
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Name* | The data source name. This is how you refer to the data source in panels & queries.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Default* | Default data source means that it will be pre-selected for new panels.
 *Url* | The http protocol, ip and port of you Prometheus server (default port is usually 9090)
 *Url* | The http protocol, ip and port of you Prometheus server (default port is usually 9090)
-*Access* | Proxy = access via Grafana backend, Direct = access directly from browser.
+*Access* | Server (default) = URL needs to be accessible from the Grafana backend/server, Browser = URL needs to be accessible from the browser.
 *Basic Auth* | Enable basic authentication to the Prometheus data source.
 *Basic Auth* | Enable basic authentication to the Prometheus data source.
 *User* | Name of your Prometheus user
 *User* | Name of your Prometheus user
 *Password* | Database user's password
 *Password* | Database user's password