DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove prometheus labels with high cardinality

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-06-25 09:22:28 -04:00 • committed by Manuel Alejandro de Brito Fontes
parent c0ed143fbd
commit 6c8647a27d
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
3 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rootfs/etc/nginx/lua/monitor.lua
View file

@ -16,13 +16,10 @@ function _M.encode_nginx_stats()
return cjson.encode({
host = ngx.var.host or "-",
status = ngx.var.status or "-",
remoteAddr = ngx.var.remote_addr or "-",
realIpAddr = ngx.var.realip_remote_addr or "-",
remoteUser = ngx.var.remote_user or "-",
bytesSent = tonumber(ngx.var.bytes_sent) or -1,
protocol = ngx.var.server_protocol or "-",
method = ngx.var.request_method or "-",
uri = ngx.var.uri or "-",
path = ngx.var.location_path or "-",
requestLength = tonumber(ngx.var.request_length) or -1,
requestTime = tonumber(ngx.var.request_time) or -1,
upstreamName = ngx.var.proxy_upstream_name or "-",

17
rootfs/etc/nginx/lua/test/monitor_test.lua
View file

@ -28,13 +28,10 @@ describe("Monitor", function()
local nginx_environment = {
host = "testshop.com",
status = "200",
remote_addr = "10.10.10.10",
realip_remote_addr = "5.5.5.5",
remote_user = "admin",
bytes_sent = "150",
server_protocol = "HTTP",
request_method = "GET",
uri = "/admin",
location_path = "/admin",
request_length = "300",
request_time = "60",
proxy_upstream_name = "test-upstream",
@ -54,13 +51,10 @@ describe("Monitor", function()
local expected_json_stats = {
host = "testshop.com",
status = "200",
remoteAddr = "10.10.10.10",
realIpAddr = "5.5.5.5",
remoteUser = "admin",
bytesSent = 150.0,
protocol = "HTTP",
method = "GET",
uri = "/admin",
path = "/admin",
requestLength = 300.0,
requestTime = 60.0,
upstreamName = "test-upstream",
@ -82,7 +76,7 @@ describe("Monitor", function()
remote_user = "francisco",
server_protocol = "HTTP",
request_method = "GET",
uri = "/admin",
location_path = "/admin",
request_time = "60",
proxy_upstream_name = "test-upstream",
upstream_addr = "2.2.2.2",
@ -99,13 +93,10 @@ describe("Monitor", function()
local expected_json_stats = {
host = "-",
status = "-",
remoteAddr = "10.10.10.10",
realIpAddr = "5.5.5.5",
remoteUser = "francisco",
bytesSent = -1,
protocol = "HTTP",
method = "GET",
uri = "/admin",
path = "/admin",
requestLength = -1,
requestTime = 60.0,
upstreamName = "test-upstream",