Skip to content
This repository was archived by the owner on Jan 15, 2024. It is now read-only.

Update EsVersion type to string from int for datasource client #34

Merged
merged 1 commit into from
Oct 5, 2021
Merged

Update EsVersion type to string from int for datasource client #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ type JSONData struct {
TimeInterval string `json:"timeInterval,omitempty"`

// Used by Elasticsearch
EsVersion int64 `json:"esVersion,omitempty"`
// From Grafana 8.x esVersion is the semantic version of Elasticsearch.
EsVersion string `json:"esVersion,omitempty"`
TimeField string `json:"timeField,omitempty"`
Interval string `json:"interval,omitempty"`
LogMessageField string `json:"logMessageField,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion datasource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func TestNewElasticsearchDataSource(t *testing.T) {
URL: "http://some-url.com",
IsDefault: true,
JSONData: JSONData{
EsVersion: 70,
EsVersion: "7.0.0",
TimeField: "time",
Interval: "1m",
LogMessageField: "message",
Expand Down