Merge branch 'master' into docs-5.1

2018-04-13 15:44:53 +02:00
parent f2c5417ee4 f5363227ff
commit 428d4b0dbf
10 changed files with 169 additions and 2 deletions
@@ -257,3 +257,24 @@ tags | Optional field name to use for event tags as a comma separated string.

 Time series queries should work in alerting conditions. Table formatted queries is not yet supported in alert rule
 conditions.
+
+## Configure datasource with provisioning
+
+It's now possible to configure datasources using config files with Grafanas provisioning system. You can read more about how it works and all the settings you can set for datasources on the [provisioning docs page](/administration/provisioning/#datasources)
+
+Here are some provisioning examples for this datasource.
+
+```yaml
+apiVersion: 1
+
+datasources:
+  - name: Postgres
+    type: postgres
+    url: localhost:5432
+    database: grafana
+    user: grafana
+    password: password
+    jsonData:
+      sslmode: "disable" # disable/require/verify-ca/verify-full
+
+```