admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update prometheus dependencies (#5520)

Browse Source 
Signed-off-by: junot <junotxiang@kubesphere.io>
This commit is contained in:
junot
2023-02-14 09:46:22 +08:00
committed by GitHub
parent a979342f56
commit 2cd5f45d47
769 changed files with 81283 additions and 30511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/alerting/clusterrulegroup_controller.go
View File

@@ -18,7 +18,7 @@ import (
"github.com/go-logr/logr"
promresourcesv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
promlabels "github.com/prometheus/prometheus/pkg/labels"
promlabels "github.com/prometheus/prometheus/model/labels"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"

2
pkg/controller/alerting/rulegroup_controller.go
View File

@@ -19,7 +19,7 @@ import (
"github.com/go-logr/logr"
promresourcesv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
promlabels "github.com/prometheus/prometheus/pkg/labels"
promlabels "github.com/prometheus/prometheus/model/labels"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

12
pkg/controller/alerting/util.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
"github.com/prometheus-community/prom-label-proxy/injectproxy"
promresourcesv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
promlabels "github.com/prometheus/prometheus/pkg/labels"
promlabels "github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/promql/parser"
"gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
@@ -87,7 +87,7 @@ var emptyEnforceExprFunc = func(expr string) (string, error) {
func CreateEnforceExprFunc(enforceRuleMatchers []*promlabels.Matcher) EnforceExprFunc {
if len(enforceRuleMatchers) > 0 {
enforcer := injectproxy.NewEnforcer(enforceRuleMatchers...)
enforcer := injectproxy.NewEnforcer(false, enforceRuleMatchers...)
return func(expr string) (string, error) {
parsedExpr, err := parser.ParseExpr(expr)
if err != nil {
@@ -152,7 +152,7 @@ func makePrometheusRuleGroups(log logr.Logger, groupList client.ObjectList,
prule := promresourcesv1.Rule{
Alert: rule.Alert,
For: string(rule.For),
For: promresourcesv1.Duration(rule.For),
Expr: rule.Expr,
Labels: rule.Labels,
Annotations: rule.Annotations,
@@ -201,7 +201,7 @@ func makePrometheusRuleGroups(log logr.Logger, groupList client.ObjectList,
}
rulegroups = append(rulegroups, &promresourcesv1.RuleGroup{
Name: group.Name,
Interval: group.Spec.Interval,
Interval: promresourcesv1.Duration(group.Spec.Interval),
PartialResponseStrategy: group.Spec.PartialResponseStrategy,
Rules: prules,
})
@@ -224,7 +224,7 @@ func makePrometheusRuleGroups(log logr.Logger, groupList client.ObjectList,
}
rulegroups = append(rulegroups, &promresourcesv1.RuleGroup{
Name: group.Name,
Interval: group.Spec.Interval,
Interval: promresourcesv1.Duration(group.Spec.Interval),
PartialResponseStrategy: group.Spec.PartialResponseStrategy,
Rules: prules,
})
@@ -249,7 +249,7 @@ func makePrometheusRuleGroups(log logr.Logger, groupList client.ObjectList,
}
rulegroups = append(rulegroups, &promresourcesv1.RuleGroup{
Name: group.Name,
Interval: group.Spec.Interval,
Interval: promresourcesv1.Duration(group.Spec.Interval),
PartialResponseStrategy: group.Spec.PartialResponseStrategy,
Rules: prules,
})