IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docs-5.1

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-04-18 14:39:38 +02:00
parent d30835f648 4ddd15d921
commit 7e8bd8d004
84 changed files with 1443 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sources/features/datasources/elasticsearch.md
View File

@@ -63,7 +63,7 @@ are supported.
### Min time interval
A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example `1m` if your data is written every minute.
This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value **needs** to be formated as a
This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value **needs** to be formatted as a
number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 seconds). The following time identifiers are supported:
Identifier | Description
@@ -178,4 +178,4 @@ datasources:
jsonData:
interval: Daily
timeField: "@timestamp"
```
```

4
docs/sources/features/datasources/influxdb.md
View File

@@ -45,7 +45,7 @@ All requests will be made from the browser directly to the data source and may b
### Min time interval
A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example `1m` if your data is written every minute.
This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value **needs** to be formated as a
This option can also be overridden/configured in a dashboard panel under data source options. It's important to note that this value **needs** to be formatted as a
number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 seconds). The following time identifiers are supported:
Identifier | Description
@@ -212,4 +212,4 @@ datasources:
user: grafana
password: grafana
url: http://localhost:8086
```
```

4
docs/sources/http_api/data_source.md
View File

@@ -188,8 +188,8 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
```http
HTTP/1.1 200
Content-Type: application/json
Content-Type: application/json
```
## Data source proxy calls