mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-27 07:31:46 +01:00
Code Issues Projects Releases Wiki Activity

fix: supports searching for int, float and boolean (#3247)

Browse Source
This commit is contained in:
Amir Raminfar
2024-09-03 08:53:00 -07:00
committed by GitHub
parent 7d42bd2b02
commit a1efb8e340
1 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
internal/support/search/search.go
View File

@@ -1,6 +1,7 @@
package search
import (
"fmt"
"regexp"
"strings"
@@ -61,14 +62,8 @@ func searchMapAny(re *regexp.Regexp, orderedMap *orderedmap.OrderedMap[string, a
}
case []any:
for i, v := range value {
switch v := v.(type) {
case string:
if re.MatchString(v) {
found = true
value[i] = re.ReplaceAllString(v, "<mark>$0</mark>")
}
}
if searchArray(re, value) {
found = true
}
case *orderedmap.OrderedMap[string, any]:
@@ -86,6 +81,13 @@ func searchMapAny(re *regexp.Regexp, orderedMap *orderedmap.OrderedMap[string, a
found = true
}
case int, float64, bool:
formatted := fmt.Sprintf("%v", value)
if re.MatchString(formatted) {
orderedMap.Set(pair.Key, re.ReplaceAllString(formatted, "<mark>$0</mark>"))
found = true
}
default:
log.Debug().Type("type", value).Msg("unknown logEvent type inside searchMapAny")
}
@@ -105,14 +107,8 @@ func searchMap(re *regexp.Regexp, data map[string]interface{}) bool {
}
case []any:
for i, v := range value {
switch v := v.(type) {
case string:
if re.MatchString(v) {
found = true
value[i] = re.ReplaceAllString(v, "<mark>$0</mark>")
}
}
if searchArray(re, value) {
found = true
}
case map[string]interface{}:
@@ -120,6 +116,12 @@ func searchMap(re *regexp.Regexp, data map[string]interface{}) bool {
found = true
}
case int, float64, bool:
formatted := fmt.Sprintf("%v", value)
if re.MatchString(formatted) {
data[key] = re.ReplaceAllString(formatted, "<mark>$0</mark>")
found = true
}
default:
log.Debug().Type("type", value).Msg("unknown logEvent type inside searchMap")
}
@@ -138,3 +140,32 @@ func searchMapString(re *regexp.Regexp, orderedMap *orderedmap.OrderedMap[string
}
return found
}
func searchArray(re *regexp.Regexp, data []any) bool {
found := false
for i, value := range data {
switch value := value.(type) {
case string:
if re.MatchString(value) {
data[i] = re.ReplaceAllString(value, "<mark>$0</mark>")
found = true
}
case int, float64, bool:
formatted := fmt.Sprintf("%v", value)
if re.MatchString(formatted) {
data[i] = re.ReplaceAllString(formatted, "<mark>$0</mark>")
found = true
}
case []any:
if searchArray(re, value) {
found = true
}
case map[string]interface{}:
if searchMap(re, value) {
found = true
}
}
}
return found
}