From d8b928f501ce208463965315f12229013ae3c095 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Wed, 21 Nov 2018 20:05:44 +0400 Subject: [PATCH] remove already unused endpoint metric --- internal/ingress/metric/collectors/socket.go | 12 ++++-------- rootfs/etc/nginx/lua/monitor.lua | 1 - rootfs/etc/nginx/lua/test/monitor_test.lua | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/internal/ingress/metric/collectors/socket.go b/internal/ingress/metric/collectors/socket.go index 864c0d190..00c780d31 100644 --- a/internal/ingress/metric/collectors/socket.go +++ b/internal/ingress/metric/collectors/socket.go @@ -30,7 +30,6 @@ import ( ) type upstream struct { - Endpoint string `json:"endpoint"` Latency float64 `json:"upstreamLatency"` ResponseLength float64 `json:"upstreamResponseLength"` ResponseTime float64 `json:"upstreamResponseTime"` @@ -88,8 +87,6 @@ var ( "method", "path", - // "endpoint", - "namespace", "ingress", "service", @@ -223,11 +220,10 @@ func (sc *SocketCollector) handleMessage(msg []byte) { } requestLabels := prometheus.Labels{ - "host": stats.Host, - "status": stats.Status, - "method": stats.Method, - "path": stats.Path, - //"endpoint": stats.Endpoint, + "host": stats.Host, + "status": stats.Status, + "method": stats.Method, + "path": stats.Path, "namespace": stats.Namespace, "ingress": stats.Ingress, "service": stats.Service, diff --git a/rootfs/etc/nginx/lua/monitor.lua b/rootfs/etc/nginx/lua/monitor.lua index c32466279..a63ddc75c 100644 --- a/rootfs/etc/nginx/lua/monitor.lua +++ b/rootfs/etc/nginx/lua/monitor.lua @@ -30,7 +30,6 @@ local function metrics() requestTime = tonumber(ngx.var.request_time) 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, upstreamResponseTime = tonumber(ngx.var.upstream_response_time) or -1, upstreamResponseLength = tonumber(ngx.var.upstream_response_length) or -1, diff --git a/rootfs/etc/nginx/lua/test/monitor_test.lua b/rootfs/etc/nginx/lua/test/monitor_test.lua index fcf1dbda9..8796d0a62 100644 --- a/rootfs/etc/nginx/lua/test/monitor_test.lua +++ b/rootfs/etc/nginx/lua/test/monitor_test.lua @@ -96,7 +96,7 @@ describe("Monitor", function() 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.send).was_called_with(tcp_mock, expected_payload)