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

Merge pull request #1686 from driv/fix_nginx_query

Browse Source 
Fix Nginx request-duration query
This commit is contained in:
Sanskar Jaiswal
2024-07-26 15:27:24 +05:30
committed by GitHub
parent f38183bfd1 2d5e289142
commit cff2032ac0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/metrics/observers/nginx.go
+2 -2
View File
@@ -50,7 +50,7 @@ var nginxQueries = map[string]string{
"request-duration": `
sum(
rate(
nginx_ingress_controller_ingress_upstream_latency_seconds_sum{
nginx_ingress_controller_response_duration_seconds_sum{
namespace="{{ namespace }}",
ingress="{{ ingress }}",
canary!=""
@@ -60,7 +60,7 @@ var nginxQueries = map[string]string{
/
sum(
rate(
nginx_ingress_controller_ingress_upstream_latency_seconds_count{
nginx_ingress_controller_response_duration_seconds_count{
namespace="{{ namespace }}",
ingress="{{ ingress }}",
canary!=""
pkg/metrics/observers/nginx_test.go
+1 -1
View File
@@ -89,7 +89,7 @@ func TestNginxObserver_GetRequestSuccessRate(t *testing.T) {
}
func TestNginxObserver_GetRequestDuration(t *testing.T) {
expected := ` sum( rate( nginx_ingress_controller_ingress_upstream_latency_seconds_sum{ namespace="nginx", ingress="podinfo", canary!="" }[1m] ) ) / sum( rate( nginx_ingress_controller_ingress_upstream_latency_seconds_count{ namespace="nginx", ingress="podinfo", canary!="" }[1m] ) ) * 1000`
expected := ` sum( rate( nginx_ingress_controller_response_duration_seconds_sum{ namespace="nginx", ingress="podinfo", canary!="" }[1m] ) ) / sum( rate( nginx_ingress_controller_response_duration_seconds_count{ namespace="nginx", ingress="podinfo", canary!="" }[1m] ) ) * 1000`
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
promql := r.URL.Query()["query"][0]