github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue where query with no metric template returned an error

Browse Source 
Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>
This commit is contained in:
LiZhenCheng9527
2024-03-07 16:06:23 +08:00
parent 9a224a0c90
commit b778013e07
2 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/scheduler_metrics.go
View File

@@ -306,8 +306,8 @@ func (c *Controller) runMetricChecks(canary *flaggerv1.Canary) bool {
canary.Name, canary.Namespace, metric.Name, val, metric.Threshold)
return false
}
} else if metric.Name != "request-success-rate" && metric.Name != "request-duration" {
c.recordEventErrorf(canary, "Metric query failed for no usable metrics template were configured")
} else if metric.Name != "request-success-rate" && metric.Name != "request-duration" && metric.Query == "" {
c.recordEventErrorf(canary, "Metric query failed for no usable metrics template and query were configured")
return false
}
}

45
pkg/controller/scheduler_metrics_test.go
View File

@@ -88,7 +88,8 @@ func TestController_runMetricChecks(t *testing.T) {
t.Run("customVariables", func(t *testing.T) {
ctrl := newDeploymentFixture(nil).ctrl
analysis := &flaggerv1.CanaryAnalysis{Metrics: []flaggerv1.CanaryMetric{{
Name: "", TemplateVariables: map[string]string{
Name: "",
TemplateVariables: map[string]string{
"first": "abc",
"second": "def",
},
@@ -139,4 +140,46 @@ func TestController_runMetricChecks(t *testing.T) {
}
assert.Equal(t, true, ctrl.runMetricChecks(canary))
})
t.Run("no metric Template is defined, but a query is specified", func(t *testing.T) {
ctrl := newDeploymentFixture(nil).ctrl
analysis := &flaggerv1.CanaryAnalysis{Metrics: []flaggerv1.CanaryMetric{{
Name: "undefined metric",
ThresholdRange: &flaggerv1.CanaryThresholdRange{
Min: toFloatPtr(0),
Max: toFloatPtr(100),
},
Query: ">- sum(logback_events_total{level=\"error\", job=\"some-app\"}) <= bool 0",
}}}
canary := &flaggerv1.Canary{
ObjectMeta: metav1.ObjectMeta{Namespace: "default"},
Spec: flaggerv1.CanarySpec{Analysis: analysis},
}
assert.Equal(t, true, ctrl.runMetricChecks(canary))
})
t.Run("both have metric Template and query", func(t *testing.T) {
ctrl := newDeploymentFixture(nil).ctrl
analysis := &flaggerv1.CanaryAnalysis{Metrics: []flaggerv1.CanaryMetric{{
Name: "",
TemplateVariables: map[string]string{
"first": "abc",
"second": "def",
},
TemplateRef: &flaggerv1.CrossNamespaceObjectReference{
Name: "custom-vars",
Namespace: "default",
},
ThresholdRange: &flaggerv1.CanaryThresholdRange{
Min: toFloatPtr(0),
Max: toFloatPtr(100),
},
Query: ">- sum(logback_events_total{level=\"error\", job=\"some-app\"}) <= bool 0",
}}}
canary := &flaggerv1.Canary{
ObjectMeta: metav1.ObjectMeta{Namespace: "default"},
Spec: flaggerv1.CanarySpec{Analysis: analysis},
}
assert.Equal(t, true, ctrl.runMetricChecks(canary))
})
}