fix default handling

grafana · Feb 5, 2025 · f6f11a3 · f6f11a3
1 parent 6e63499
commit f6f11a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/opensearch/client/client.go b/pkg/opensearch/client/client.go
@@ -119,7 +119,8 @@ func NewClient(ctx context.Context, ds *backend.DataSourceInstanceSettings, http
 	}
 
 	logLevelField := jsonData.Get("logLevelField").MustString()
-	logMessageField := jsonData.Get("logMessageField").MustString()
+	// logMessageField defaults to "_source"
+	logMessageField := jsonData.Get("logMessageField").MustString("_source")
 
 	db, err := jsonData.Get("database").String()
 	if err != nil {

diff --git a/pkg/opensearch/response_parser.go b/pkg/opensearch/response_parser.go
@@ -487,9 +487,8 @@ func processLogsResponse(res *client.SearchResponse, configuredFields client.Con
 			flattened = flatten(hit["_source"].(map[string]interface{}), maxFlattenDepth)
 			sourceMarshalled, err := json.Marshal(flattened)
 			if err != nil {
-				queryRes.Error = err
-				queryRes.ErrorSource = backend.ErrorSourcePlugin
-				return queryRes
+				errResp := errorsource.Response(errorsource.PluginError(err, false))
+				return errResp
 			}
 			sourceString = string(sourceMarshalled)
 		}