Elasticsearch: Deprecate the usage of the database field in provisioning (#66828)

* update docs and gdev provisioning

* update docs
This commit is contained in:
Gareth Dawson 2023-04-19 14:13:53 +01:00 committed by GitHub
parent c7af53b79f
commit 46b73548b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions

View File

@ -126,9 +126,9 @@ datasources:
type: elasticsearch
uid: gdev-elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:9200
jsonData:
index: "[logs-]YYYY.MM.DD"
interval: Daily
timeField: "@timestamp"
logLevelField: level
@ -137,9 +137,9 @@ datasources:
- name: gdev-elasticsearch-filebeat
type: elasticsearch
access: proxy
database: "[filebeat-]YYYY.MM.DD"
url: http://localhost:9200
jsonData:
index: "[filebeat-]YYYY.MM.DD"
interval: Daily
timeField: "@timestamp"
timeInterval: "10s"
@ -149,9 +149,9 @@ datasources:
- name: gdev-elasticsearch-metricbeat
type: elasticsearch
access: proxy
database: "[metricbeat-]YYYY.MM.DD"
url: http://localhost:9200
jsonData:
index: "[metricbeat-]YYYY.MM.DD"
interval: Daily
timeField: "@timestamp"
timeInterval: "10s"

View File

@ -71,18 +71,18 @@ datasources:
- name: gdev-elasticsearch
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://elasticsearch:9200
jsonData:
index: "[logs-]YYYY.MM.DD"
interval: Daily
timeField: "@timestamp"
- name: gdev-elasticsearch-filebeat
type: elasticsearch
access: proxy
database: "[filebeat-]YYYY.MM.DD"
url: http://elasticsearch:9200
jsonData:
index: "[filebeat-]YYYY.MM.DD"
interval: Daily
timeField: "@timestamp"
timeInterval: "10s"
@ -92,9 +92,9 @@ datasources:
- name: gdev-elasticsearch-metricbeat
type: elasticsearch
access: proxy
database: "[metricbeat-]YYYY.MM.DD"
url: http://elasticsearch:9200
jsonData:
index: "[metricbeat-]YYYY.MM.DD"
interval: Daily
timeField: "@timestamp"
timeInterval: "10s"

View File

@ -140,6 +140,10 @@ For more information about AWS authentication options, refer to [AWS authenticat
You can define and configure the data source in YAML files as part of Grafana's provisioning system.
For more information about provisioning, and for available configuration options, refer to [Provisioning Grafana]({{< relref "../../administration/provisioning/#data-sources" >}}).
> **Note:** The previously used `database` field has now been [deprecated](https://github.com/grafana/grafana/pull/58647).
> You should now use the `index` field in `jsonData` to store the index name.
> Please see the examples below.
#### Provisioning examples
**Basic provisioning:**
@ -151,9 +155,9 @@ datasources:
- name: Elastic
type: elasticsearch
access: proxy
database: '[metrics-]YYYY.MM.DD'
url: http://localhost:9200
jsonData:
index: '[metrics-]YYYY.MM.DD'
interval: Daily
timeField: '@timestamp'
```
@ -167,9 +171,9 @@ datasources:
- name: elasticsearch-v7-filebeat
type: elasticsearch
access: proxy
database: '[filebeat-]YYYY.MM.DD'
url: http://localhost:9200
jsonData:
index: '[filebeat-]YYYY.MM.DD'
interval: Daily
timeField: '@timestamp'
logMessageField: message