From 3c1591230116896f4334676b260f0b952f56673a Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@gmail.com>
Date: Sat, 6 Jun 2020 15:59:52 +0530
Subject: [PATCH] Adding default map for nginx http metrics cache_stats
Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
.../helm_charts/core/nginx-public-ingress/values.j2 | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index 18c9530a2..61a9cd772 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -751,7 +751,7 @@ nginxconfig: |
log_format main '{{ nginx_client_public_ip_header | d('$remote_addr') }} - $remote_user [$time_local] '
'"$request" $status $body_bytes_sent '
'$request_time $upstream_response_time $pipe'
- '"$http_referer" "$http_user_agent" Cache:$upstream_cache_status';
+ '"$http_referer" "$http_user_agent"';
access_log /var/log/nginx/access.log main;
@@ -769,10 +769,14 @@ nginxconfig: |
metric_connections = prometheus:gauge(
"nginx_http_connections", "Number of HTTP connections", {"state"})
';
-
+ # Defining upstream cache status for nginx metrics
+ map $upstream_cache_status $cache_status {
+ default $upstream_cache_status;
+ '' "NONE";
+ }
# Collecting metrics
log_by_lua '
- metric_requests:inc(1, {ngx.var.server_name, ngx.var.status, ngx.var.request_method, ngx.var.upstream_cache_status})
+ metric_requests:inc(1, {ngx.var.server_name, ngx.var.status, ngx.var.request_method, ngx.var.cache_status})
metric_latency:observe(tonumber(ngx.var.request_time), {ngx.var.server_name})
';
--
GitLab