Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 40 additions & 1 deletion pkg/querier/queryrange/detected_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,45 @@ func NewDetectedFieldsHandler(
})
}

type bytesUnit []string

func (b bytesUnit) Contains(s string) bool {
for _, u := range b {
if strings.HasSuffix(s, u) {
return true
}
}
return false
}

var allowedBytesUnits = bytesUnit{
"b",
"kib",
"kb",
"mib",
"mb",
"gib",
"gb",
"tib",
"tb",
"pib",
"pb",
"eib",
"eb",
"ki",
"k",
"mi",
"m",
"gi",
"g",
"ti",
"t",
"pi",
"p",
"ei",
"e",
}

func parseDetectedFieldValues(limit uint32, streams []push.Stream, name string) []string {
values := map[string]struct{}{}
for _, stream := range streams {
Expand All @@ -116,7 +155,7 @@ func parseDetectedFieldValues(limit uint32, streams []push.Stream, name string)
if vals, ok := parsedLabels[name]; ok {
for _, v := range vals {
// special case bytes values, so they can be directly inserted into a query
if bs, err := humanize.ParseBytes(v); err == nil {
if bs, err := humanize.ParseBytes(v); err == nil && allowedBytesUnits.Contains(strings.ToLower(v)) {
bsString := strings.Replace(humanize.Bytes(bs), " ", "", 1)
values[bsString] = struct{}{}
} else {
Expand Down
26 changes: 24 additions & 2 deletions pkg/querier/queryrange/detected_fields_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@ func TestQuerier_DetectedFields(t *testing.T) {
lines := []push.Entry{
{
Timestamp: now,
Line: "ts=2024-09-05T15:36:38.757788067Z caller=metrics.go:66 tenant=2419 level=info bytes=1,024",
Line: "ts=2024-09-05T15:36:38.757788067Z caller=metrics.go:66 tenant=2419 level=info bytes=1024",
StructuredMetadata: infoDetectdFiledMetadata,
},
{
Expand Down Expand Up @@ -1378,7 +1378,29 @@ func TestQuerier_DetectedFields(t *testing.T) {
require.Equal(t, []string{
"1.0GB",
"1.0MB",
"1.0kB",
"1024",
}, detectedFieldValues)

// does not affect other numeric values
request = DetectedFieldsRequest{
logproto.DetectedFieldsRequest{
Start: time.Now().Add(-1 * time.Minute),
End: time.Now(),
Query: `{cluster="us-east-1"} | logfmt`,
LineLimit: 1000,
Limit: 3,
Values: true,
Name: "tenant",
},
"/loki/api/v1/detected_field/tenant/values",
}

detectedFieldValues = handleRequest(handler, request).Values
slices.Sort(detectedFieldValues)
require.Equal(t, []string{
"2419",
"29",
"2919",
}, detectedFieldValues)
})
}
Expand Down
Loading