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

remove already unused endpoint metric

Browse source
This commit is contained in:
Elvin Efendi 2018-11-21 20:05:44 +04:00
parent 068d633e81
commit d8b928f501
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/ingress/metric/collectors/socket.go
View file

@ -30,7 +30,6 @@ import (
) )
type upstream struct { type upstream struct {
Endpoint string `json:"endpoint"`
Latency float64 `json:"upstreamLatency"` Latency float64 `json:"upstreamLatency"`
ResponseLength float64 `json:"upstreamResponseLength"` ResponseLength float64 `json:"upstreamResponseLength"`
ResponseTime float64 `json:"upstreamResponseTime"` ResponseTime float64 `json:"upstreamResponseTime"`
@ -88,8 +87,6 @@ var (
"method", "method",
"path", "path",
// "endpoint",
"namespace", "namespace",
"ingress", "ingress",
"service", "service",
@ -223,11 +220,10 @@ func (sc *SocketCollector) handleMessage(msg []byte) {
} }
requestLabels := prometheus.Labels{ requestLabels := prometheus.Labels{
"host": stats.Host, "host": stats.Host,
"status": stats.Status, "status": stats.Status,
"method": stats.Method, "method": stats.Method,
"path": stats.Path, "path": stats.Path,
//"endpoint": stats.Endpoint,
"namespace": stats.Namespace, "namespace": stats.Namespace,
"ingress": stats.Ingress, "ingress": stats.Ingress,
"service": stats.Service, "service": stats.Service,

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

@ -30,7 +30,6 @@ local function metrics()
requestTime = tonumber(ngx.var.request_time) or -1, requestTime = tonumber(ngx.var.request_time) or -1,
responseLength = tonumber(ngx.var.bytes_sent) or -1, responseLength = tonumber(ngx.var.bytes_sent) or -1,
endpoint = ngx.var.upstream_addr or "-",
upstreamLatency = tonumber(ngx.var.upstream_connect_time) or -1, upstreamLatency = tonumber(ngx.var.upstream_connect_time) or -1,
upstreamResponseTime = tonumber(ngx.var.upstream_response_time) or -1, upstreamResponseTime = tonumber(ngx.var.upstream_response_time) or -1,
upstreamResponseLength = tonumber(ngx.var.upstream_response_length) or -1, upstreamResponseLength = tonumber(ngx.var.upstream_response_length) or -1,

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

@ -96,7 +96,7 @@ describe("Monitor", function()
monitor.flush() monitor.flush()
local expected_payload = '[{"requestLength":256,"ingress":"example","status":"200","service":"http-svc","requestTime":0.04,"namespace":"default","host":"example.com","method":"GET","upstreamResponseTime":0.02,"upstreamResponseLength":456,"endpoint":"10.10.0.1","upstreamLatency":0.01,"path":"\\/","responseLength":512},{"requestLength":256,"ingress":"example","status":"201","service":"http-svc","requestTime":0.04,"namespace":"default","host":"example.com","method":"POST","upstreamResponseTime":0.02,"upstreamResponseLength":456,"endpoint":"10.10.0.1","upstreamLatency":0.01,"path":"\\/","responseLength":512}]' local expected_payload = '[{"requestLength":256,"ingress":"example","status":"200","service":"http-svc","requestTime":0.04,"namespace":"default","host":"example.com","method":"GET","upstreamResponseTime":0.02,"upstreamResponseLength":456,"upstreamLatency":0.01,"path":"\\/","responseLength":512},{"requestLength":256,"ingress":"example","status":"201","service":"http-svc","requestTime":0.04,"namespace":"default","host":"example.com","method":"POST","upstreamResponseTime":0.02,"upstreamResponseLength":456,"upstreamLatency":0.01,"path":"\\/","responseLength":512}]'
assert.stub(tcp_mock.connect).was_called_with(tcp_mock, "unix:/tmp/prometheus-nginx.socket") assert.stub(tcp_mock.connect).was_called_with(tcp_mock, "unix:/tmp/prometheus-nginx.socket")
assert.stub(tcp_mock.send).was_called_with(tcp_mock, expected_payload) assert.stub(tcp_mock.send).was_called_with(tcp_mock, expected_payload)