IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CloudWatch Logs: Add labels to alert and expression queries (#77529)

Browse Source
This commit is contained in:
Isabella Siu 2023-11-02 16:26:31 -04:00 committed by GitHub
parent 9e0ca0d113
commit 64e28c0ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/tsdb/cloudwatch/log_query.go
View File

@ -205,14 +205,16 @@ func groupResults(results *data.Frame, groupingFieldNames []string, fromSyncQuer
if fromSyncQuery { if fromSyncQuery {
// remove grouping indices // remove grouping indices
newFrame.Fields = removeFieldsByIndex(newFrame.Fields, removeFieldIndices) newFrame.Fields = removeFieldsByIndex(newFrame.Fields, removeFieldIndices)
groupLabels := generateLabels(groupingFields, i)
// set the group key as the display name for sync queries // set the group key as the display name for sync queries
for i := 1; i < len(newFrame.Fields); i++ { for j := 1; j < len(newFrame.Fields); j++ {
valueField := newFrame.Fields[i] valueField := newFrame.Fields[j]
if valueField.Config == nil { if valueField.Config == nil {
valueField.Config = &data.FieldConfig{} valueField.Config = &data.FieldConfig{}
} }
valueField.Config.DisplayNameFromDS = groupKey valueField.Config.DisplayNameFromDS = groupKey
valueField.Labels = groupLabels
} }
} }
@ -275,10 +277,21 @@ func generateGroupKey(fields []*data.Field, row int) string {
} }
} }
} }
return groupKey return groupKey
} }
func generateLabels(fields []*data.Field, row int) data.Labels {
labels := data.Labels{}
for _, field := range fields {
if strField, ok := field.At(row).(*string); ok {
if strField != nil {
labels[field.Name] = *strField
}
}
}
return labels
}
func numericFieldToStringField(field *data.Field) (*data.Field, error) { func numericFieldToStringField(field *data.Field) (*data.Field, error) {
if !field.Type().Numeric() { if !field.Type().Numeric() {
return nil, fmt.Errorf("field is not numeric") return nil, fmt.Errorf("field is not numeric")

4
pkg/tsdb/cloudwatch/log_query_test.go
View File

@ -583,7 +583,7 @@ func TestGroupingResultsWithFromSyncQueryTrue(t *testing.T) {
Name: "fakelog-a1", Name: "fakelog-a1",
Fields: []*data.Field{ Fields: []*data.Field{
data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}), data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}),
data.NewField("count", data.Labels{}, []*string{ data.NewField("count", data.Labels{"@log": "fakelog-a", "stream": "1"}, []*string{
aws.String("100"), aws.String("100"),
aws.String("57"), aws.String("57"),
}), }),
@ -594,7 +594,7 @@ func TestGroupingResultsWithFromSyncQueryTrue(t *testing.T) {
Name: "fakelog-b1", Name: "fakelog-b1",
Fields: []*data.Field{ Fields: []*data.Field{
data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}), data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}),
data.NewField("count", data.Labels{}, []*string{ data.NewField("count", data.Labels{"@log": "fakelog-b", "stream": "1"}, []*string{
aws.String("150"), aws.String("150"),
aws.String("62"), aws.String("62"),
}), }),