From 985a2a98f135c4b1471b4fb2941e296c9d24b990 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Wed, 17 Jan 2018 10:17:16 -0300 Subject: [PATCH] Revert "updating nginx prometheus metrics names according to prometheus naming best practices (#1910)" This reverts commit 74451e6b1f9b187b659654b7235f17b51efd0784. --- .../ingress/controller/metric/collector/nginx.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/ingress/controller/metric/collector/nginx.go b/internal/ingress/controller/metric/collector/nginx.go index 3372084a817c..4ed6db57fc5c 100644 --- a/internal/ingress/controller/metric/collector/nginx.go +++ b/internal/ingress/controller/metric/collector/nginx.go @@ -56,37 +56,37 @@ func NewNginxStatus(watchNamespace, ingressClass string, ngxHealthPort int, ngxV p.data = &nginxStatusData{ active: prometheus.NewDesc( - prometheus.BuildFQName(ns, "", "active_connections_total"), + prometheus.BuildFQName(ns, "", "active_connections"), "total number of active connections", []string{"ingress_class", "namespace"}, nil), accepted: prometheus.NewDesc( - prometheus.BuildFQName(ns, "", "accepted_connections_total"), + prometheus.BuildFQName(ns, "", "accepted_connections"), "total number of accepted client connections", []string{"ingress_class", "namespace"}, nil), handled: prometheus.NewDesc( - prometheus.BuildFQName(ns, "", "handled_connections_total"), + prometheus.BuildFQName(ns, "", "handled_connections"), "total number of handled connections", []string{"ingress_class", "namespace"}, nil), requests: prometheus.NewDesc( - prometheus.BuildFQName(ns, "", "requests_total"), + prometheus.BuildFQName(ns, "", "total_requests"), "total number of client requests", []string{"ingress_class", "namespace"}, nil), reading: prometheus.NewDesc( - prometheus.BuildFQName(ns, "", "current_reading_connections_total"), + prometheus.BuildFQName(ns, "", "current_reading_connections"), "current number of connections where nginx is reading the request header", []string{"ingress_class", "namespace"}, nil), writing: prometheus.NewDesc( - prometheus.BuildFQName(ns, "", "current_writing_connections_total"), + prometheus.BuildFQName(ns, "", "current_writing_connections"), "current number of connections where nginx is writing the response back to the client", []string{"ingress_class", "namespace"}, nil), waiting: prometheus.NewDesc( - prometheus.BuildFQName(ns, "", "current_waiting_connections_total"), + prometheus.BuildFQName(ns, "", "current_waiting_connections"), "current number of idle client connections waiting for a request", []string{"ingress_class", "namespace"}, nil), }