public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prometheus: remove scope dependency (#84991)

Browse Source 
* Prometheus: remove scope dependency
temp workaround

* depguard

* comment

* remove rules since they need a newer version of golangci-lint

---------

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
This commit is contained in:
Kyle Brandt
2024-03-22 16:52:42 +01:00
committed by GitHub
co-authored by ismail simsek
parent 2f7fd729ef
commit 86a2a1a19b
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/promlib/models/scope.go
+2 -3
View File
@@ -3,12 +3,11 @@ package models
import (
"fmt"
"github.com/grafana/grafana/pkg/apis/scope/v0alpha1"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/promql/parser"
)
func ApplyQueryScope(rawExpr string, scope v0alpha1.ScopeSpec) (string, error) {
func ApplyQueryScope(rawExpr string, scope ScopeSpec) (string, error) {
expr, err := parser.ParseExpr(rawExpr)
if err != nil {
return "", err
@@ -59,7 +58,7 @@ func ApplyQueryScope(rawExpr string, scope v0alpha1.ScopeSpec) (string, error) {
return expr.String(), nil
}
func scopeFiltersToMatchers(filters []v0alpha1.ScopeFilter) ([]*labels.Matcher, error) {
func scopeFiltersToMatchers(filters []ScopeFilter) ([]*labels.Matcher, error) {
matchers := make([]*labels.Matcher, 0, len(filters))
for _, f := range filters {
var mt labels.MatchType