mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Elasticsearch: Deprecate the usage of the database field in provisioning (#66828)
* update docs and gdev provisioning * update docs
This commit is contained in:
@@ -126,9 +126,9 @@ datasources:
|
|||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
uid: gdev-elasticsearch
|
uid: gdev-elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: "[logs-]YYYY.MM.DD"
|
|
||||||
url: http://localhost:9200
|
url: http://localhost:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: "[logs-]YYYY.MM.DD"
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: "@timestamp"
|
timeField: "@timestamp"
|
||||||
logLevelField: level
|
logLevelField: level
|
||||||
@@ -137,9 +137,9 @@ datasources:
|
|||||||
- name: gdev-elasticsearch-filebeat
|
- name: gdev-elasticsearch-filebeat
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: "[filebeat-]YYYY.MM.DD"
|
|
||||||
url: http://localhost:9200
|
url: http://localhost:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: "[filebeat-]YYYY.MM.DD"
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: "@timestamp"
|
timeField: "@timestamp"
|
||||||
timeInterval: "10s"
|
timeInterval: "10s"
|
||||||
@@ -149,9 +149,9 @@ datasources:
|
|||||||
- name: gdev-elasticsearch-metricbeat
|
- name: gdev-elasticsearch-metricbeat
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: "[metricbeat-]YYYY.MM.DD"
|
|
||||||
url: http://localhost:9200
|
url: http://localhost:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: "[metricbeat-]YYYY.MM.DD"
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: "@timestamp"
|
timeField: "@timestamp"
|
||||||
timeInterval: "10s"
|
timeInterval: "10s"
|
||||||
|
|||||||
@@ -71,18 +71,18 @@ datasources:
|
|||||||
- name: gdev-elasticsearch
|
- name: gdev-elasticsearch
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: "[logs-]YYYY.MM.DD"
|
|
||||||
url: http://elasticsearch:9200
|
url: http://elasticsearch:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: "[logs-]YYYY.MM.DD"
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: "@timestamp"
|
timeField: "@timestamp"
|
||||||
|
|
||||||
- name: gdev-elasticsearch-filebeat
|
- name: gdev-elasticsearch-filebeat
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: "[filebeat-]YYYY.MM.DD"
|
|
||||||
url: http://elasticsearch:9200
|
url: http://elasticsearch:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: "[filebeat-]YYYY.MM.DD"
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: "@timestamp"
|
timeField: "@timestamp"
|
||||||
timeInterval: "10s"
|
timeInterval: "10s"
|
||||||
@@ -92,9 +92,9 @@ datasources:
|
|||||||
- name: gdev-elasticsearch-metricbeat
|
- name: gdev-elasticsearch-metricbeat
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: "[metricbeat-]YYYY.MM.DD"
|
|
||||||
url: http://elasticsearch:9200
|
url: http://elasticsearch:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: "[metricbeat-]YYYY.MM.DD"
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: "@timestamp"
|
timeField: "@timestamp"
|
||||||
timeInterval: "10s"
|
timeInterval: "10s"
|
||||||
|
|||||||
@@ -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.
|
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" >}}).
|
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
|
#### Provisioning examples
|
||||||
|
|
||||||
**Basic provisioning:**
|
**Basic provisioning:**
|
||||||
@@ -151,9 +155,9 @@ datasources:
|
|||||||
- name: Elastic
|
- name: Elastic
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: '[metrics-]YYYY.MM.DD'
|
|
||||||
url: http://localhost:9200
|
url: http://localhost:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: '[metrics-]YYYY.MM.DD'
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: '@timestamp'
|
timeField: '@timestamp'
|
||||||
```
|
```
|
||||||
@@ -167,9 +171,9 @@ datasources:
|
|||||||
- name: elasticsearch-v7-filebeat
|
- name: elasticsearch-v7-filebeat
|
||||||
type: elasticsearch
|
type: elasticsearch
|
||||||
access: proxy
|
access: proxy
|
||||||
database: '[filebeat-]YYYY.MM.DD'
|
|
||||||
url: http://localhost:9200
|
url: http://localhost:9200
|
||||||
jsonData:
|
jsonData:
|
||||||
|
index: '[filebeat-]YYYY.MM.DD'
|
||||||
interval: Daily
|
interval: Daily
|
||||||
timeField: '@timestamp'
|
timeField: '@timestamp'
|
||||||
logMessageField: message
|
logMessageField: message
|
||||||
|
|||||||
Reference in New Issue
Block a user