Skip to content

Commit cff2032

Browse files
authored
Merge pull request #1686 from driv/fix_nginx_query
Fix Nginx request-duration query
2 parents f38183b + 2d5e289 commit cff2032

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkg/metrics/observers/nginx.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var nginxQueries = map[string]string{
5050
"request-duration": `
5151
sum(
5252
rate(
53-
nginx_ingress_controller_ingress_upstream_latency_seconds_sum{
53+
nginx_ingress_controller_response_duration_seconds_sum{
5454
namespace="{{ namespace }}",
5555
ingress="{{ ingress }}",
5656
canary!=""
@@ -60,7 +60,7 @@ var nginxQueries = map[string]string{
6060
/
6161
sum(
6262
rate(
63-
nginx_ingress_controller_ingress_upstream_latency_seconds_count{
63+
nginx_ingress_controller_response_duration_seconds_count{
6464
namespace="{{ namespace }}",
6565
ingress="{{ ingress }}",
6666
canary!=""

pkg/metrics/observers/nginx_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestNginxObserver_GetRequestSuccessRate(t *testing.T) {
8989
}
9090

9191
func TestNginxObserver_GetRequestDuration(t *testing.T) {
92-
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`
92+
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`
9393

9494
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
9595
promql := r.URL.Query()["query"][0]

0 commit comments

Comments
 (0)