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

* update docs and gdev provisioning

* update docs
pull/66878/head
Gareth Dawson 2 years ago committed by GitHub
parent c7af53b79f
commit 46b73548b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      devenv/datasources.yaml
  2. 6
      devenv/datasources_docker.yaml
  3. 8
      docs/sources/datasources/elasticsearch/_index.md

@ -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

Loading…
Cancel
Save