Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

switch to regexp2 for parsed filter

Browse Source
This commit is contained in:
Daniel Poßmann
2022-07-07 11:53:51 +02:00
parent 07bc5ba6d9
commit 70055b0682
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/zabbix/utils.go
View File

@@ -4,6 +4,8 @@ import (
"fmt"
"regexp"
"strings"
"github.com/dlclark/regexp2"
)
func (item *Item) ExpandItemName() string {
@@ -63,9 +65,10 @@ func splitKeyParams(paramStr string) []string {
return params
}
func parseFilter(filter string) (*regexp.Regexp, error) {
regex := regexp.MustCompile(`^/(.+)/([imsU]*)$`)
flagRE := regexp.MustCompile("[imsU]+")
func parseFilter(filter string) (*regexp2.Regexp, error) {
vaildREModifiers := "imncsxrde"
regex := regexp.MustCompile(`^/(.+)/(\w*)$`)
flagRE := regexp.MustCompile("[" + vaildREModifiers + "]+")
matches := regex.FindStringSubmatch(filter)
if len(matches) <= 1 {
@@ -77,12 +80,12 @@ func parseFilter(filter string) (*regexp.Regexp, error) {
if flagRE.MatchString(matches[2]) {
pattern += "(?" + matches[2] + ")"
} else {
return nil, fmt.Errorf("error parsing regexp: unsupported flags `%s` (expected [imsU])", matches[2])
return nil, fmt.Errorf("error parsing regexp: unsupported flags `%s` (expected [%s])", matches[2], vaildREModifiers)
}
}
pattern += matches[1]
return regexp.Compile(pattern)
return regexp2.Compile(pattern, regexp2.RE2)
}
func itemTagToString(tag ItemTag) string {