mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Elasticsearch: Implement processing of logs query results in backend (#63647)
* Elasticsearch: Add processing of logs query to backend * Add and fix tests * Add snapshot tests * Fix test in ES client * Small updates, remove redundant logic * Refactor setPreferredVisType to improve readability
This commit is contained in:
@@ -98,6 +98,16 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
|
||||
return nil, errors.New("elasticsearch time field name is required")
|
||||
}
|
||||
|
||||
logLevelField, ok := jsonData["logLevelField"].(string)
|
||||
if !ok {
|
||||
logLevelField = ""
|
||||
}
|
||||
|
||||
logMessageField, ok := jsonData["logMessageField"].(string)
|
||||
if !ok {
|
||||
logMessageField = ""
|
||||
}
|
||||
|
||||
interval, ok := jsonData["interval"].(string)
|
||||
if !ok {
|
||||
interval = ""
|
||||
@@ -132,6 +142,12 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
|
||||
xpack = false
|
||||
}
|
||||
|
||||
configuredFields := es.ConfiguredFields{
|
||||
TimeField: timeField,
|
||||
LogLevelField: logLevelField,
|
||||
LogMessageField: logMessageField,
|
||||
}
|
||||
|
||||
model := es.DatasourceInfo{
|
||||
ID: settings.ID,
|
||||
URL: settings.URL,
|
||||
@@ -139,7 +155,7 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
|
||||
Database: settings.Database,
|
||||
MaxConcurrentShardRequests: int64(maxConcurrentShardRequests),
|
||||
ESVersion: version,
|
||||
TimeField: timeField,
|
||||
ConfiguredFields: configuredFields,
|
||||
Interval: interval,
|
||||
TimeInterval: timeInterval,
|
||||
IncludeFrozen: includeFrozen,
|
||||
|
||||
Reference in New Issue
Block a user