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

Merge branch 'regexp2' of github.com:thetuxkeeper/grafana-zabbix into thetuxkeeper-regexp2

Browse Source
This commit is contained in:
Alexander Zobnin
2022-09-01 09:38:40 +03:00
parent b34408739c 4fa13c9b87
commit 459722d0e4
5 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/zabbix/methods.go
View File

@@ -148,7 +148,7 @@ func filterItemsByTag(items []*Item, filter string) ([]*Item, error) {
}
for _, t := range tags {
if re != nil {
if re.MatchString(t) {
if match, err := re.MatchString(t); match && err != nil {
filteredItems = append(filteredItems, i)
break
}
@@ -173,7 +173,7 @@ func filterItemsByQuery(items []*Item, filter string) ([]*Item, error) {
for _, i := range items {
name := i.Name
if re != nil {
if re.MatchString(name) {
if match, err := re.MatchString(name); match && err != nil {
filteredItems = append(filteredItems, i)
}
} else if name == filter {
@@ -212,7 +212,7 @@ func filterAppsByQuery(items []Application, filter string) ([]Application, error
for _, i := range items {
name := i.Name
if re != nil {
if re.MatchString(name) {
if match, err := re.MatchString(name); match && err != nil {
filteredItems = append(filteredItems, i)
}
} else if name == filter {
@@ -251,7 +251,7 @@ func filterHostsByQuery(items []Host, filter string) ([]Host, error) {
for _, i := range items {
name := i.Name
if re != nil {
if re.MatchString(name) {
if match, err := re.MatchString(name); match && err != nil {
filteredItems = append(filteredItems, i)
}
} else if name == filter {
@@ -282,7 +282,7 @@ func filterGroupsByQuery(items []Group, filter string) ([]Group, error) {
for _, i := range items {
name := i.Name
if re != nil {
if re.MatchString(name) {
if match, err := re.MatchString(name); match && err != nil {
filteredItems = append(filteredItems, i)
}
} else if name == filter {