Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix logs display when _source is log message field #565

Merged
merged 4 commits into from
Feb 5, 2025
Merged

Fix logs display when _source is log message field #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e50c1f9
Fix logs display when _source is log message field
iwysiu Feb 4, 2025
6e63499
update snapshot test
iwysiu Feb 4, 2025
f6f11a3
fix default handling
iwysiu Feb 5, 2025
35d896d
update snapshot tests
iwysiu Feb 5, 2025
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 cspell.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"go.sum",
"go.mod",
".gitignore",
".config/**"
".config/**",
"pkg/opensearch/snapshot_tests/testdata/**"
],
"words": [
"aggs",
Expand Down
3 changes: 2 additions & 1 deletion pkg/opensearch/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 12 additions & 4 deletions pkg/opensearch/response_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,15 +482,23 @@ func processLogsResponse(res *client.SearchResponse, configuredFields client.Con

for hitIdx, hit := range res.Hits.Hits {
var flattened map[string]interface{}
var sourceString string
if hit["_source"] != nil {
flattened = flatten(hit["_source"].(map[string]interface{}), maxFlattenDepth)
sourceMarshalled, err := json.Marshal(flattened)
if err != nil {
errResp := errorsource.Response(errorsource.PluginError(err, false))
return errResp
}
sourceString = string(sourceMarshalled)
}

doc := map[string]interface{}{
"_id": hit["_id"],
"_type": hit["_type"],
"_index": hit["_index"],
"_source": flattened,
"_id": hit["_id"],
"_type": hit["_type"],
"_index": hit["_index"],
// In case of logs query we want to have the raw source as a string field so it can be visualized in logs panel
"_source": sourceString,
}

for k, v := range flattened {
Expand Down
12 changes: 6 additions & 6 deletions pkg/opensearch/response_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,9 +1460,9 @@ func TestProcessLogsResponse_creates_correct_data_frame_fields(t *testing.T) {
utils.Pointer("mock-index"),
}).SetConfig(&data.FieldConfig{Filterable: utils.Pointer(true)}),
data.NewField("_source", nil,
[]*json.RawMessage{
utils.Pointer(json.RawMessage(`{"fields.lvl":"debug","host":"djisaodjsoad","level":"debug","line":"hello, i am a message","number":1,"testtime":"06/24/2019"}`)),
utils.Pointer(json.RawMessage(`{"fields.lvl":"info","host":"dsalkdakdop","level":"error","line":"hello, i am also message","number":2,"testtime":"06/24/2019"}`)),
[]*string{
utils.Pointer(`{"fields.lvl":"debug","host":"djisaodjsoad","level":"debug","line":"hello, i am a message","number":1,"testtime":"06/24/2019"}`),
utils.Pointer(`{"fields.lvl":"info","host":"dsalkdakdop","level":"error","line":"hello, i am also message","number":2,"testtime":"06/24/2019"}`),
}).SetConfig(&data.FieldConfig{Filterable: utils.Pointer(true)}),
data.NewField("_type", nil,
[]*string{
Expand Down Expand Up @@ -1669,9 +1669,9 @@ func TestProcessLogsResponse_log_query_with_nested_fields(t *testing.T) {
utils.Pointer("logs-2023.02.08"),
}).SetConfig(&data.FieldConfig{Filterable: utils.Pointer(true)}),
data.NewField("_source", nil,
[]*json.RawMessage{
utils.Pointer(json.RawMessage(`{"@timestamp":"2023-02-08T15:10:55.830Z","counter":"109","float":58.253758485091,"label":"val1","line":"log text [479231733]","location":"17.089705232090438, 41.62861966340297","lvl":"info","nested.field.double_nested":true,"shapes":[{"type":"triangle"},{"type":"square"}],"xyz":null}`)),
utils.Pointer(json.RawMessage(`{"@timestamp":"2023-02-08T15:10:54.835Z","counter":"108","float":54.5977098233944,"label":"val1","line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]","location":"19.766305918490463, 40.42639175509792","lvl":"info","nested.field.double_nested":false,"shapes":[{"type":"triangle"},{"type":"square"}],"xyz":"def"}`)),
[]*string{
utils.Pointer(`{"@timestamp":"2023-02-08T15:10:55.830Z","counter":"109","float":58.253758485091,"label":"val1","line":"log text [479231733]","location":"17.089705232090438, 41.62861966340297","lvl":"info","nested.field.double_nested":true,"shapes":[{"type":"triangle"},{"type":"square"}],"xyz":null}`),
utils.Pointer(`{"@timestamp":"2023-02-08T15:10:54.835Z","counter":"108","float":54.5977098233944,"label":"val1","line":"log text with ANSI \u001b[31mpart of the text\u001b[0m [493139080]","location":"19.766305918490463, 40.42639175509792","lvl":"info","nested.field.double_nested":false,"shapes":[{"type":"triangle"},{"type":"square"}],"xyz":"def"}`),
}).SetConfig(&data.FieldConfig{Filterable: utils.Pointer(true)}),
data.NewField("_type", nil,
[]*json.RawMessage{
Expand Down
Loading