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

compressing nginx metric names

Browse source
This commit is contained in:
Benjamin Visser 2018-01-17 11:37:40 -05:00
parent c4a2ebe4cb
commit 0d93f209f0
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
internal/ingress/controller/metric/collector/nginx.go
View file

@ -56,19 +56,19 @@ func NewNginxStatus(watchNamespace, ingressClass string, ngxHealthPort int, ngxV
p.data = &nginxStatusData{ p.data = &nginxStatusData{
active: prometheus.NewDesc( active: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "active_connections_total"), prometheus.BuildFQName(ns, "", "connections_total"),
"total number of active connections", "total number of active connections",
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
accepted: prometheus.NewDesc( accepted: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "accepted_connections_total"), prometheus.BuildFQName(ns, "", "connections_total"),
"total number of accepted client connections", "total number of accepted client connections",
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
handled: prometheus.NewDesc( handled: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "handled_connections_total"), prometheus.BuildFQName(ns, "", "connections_total"),
"total number of handled connections", "total number of handled connections",
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
requests: prometheus.NewDesc( requests: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "requests_total"), prometheus.BuildFQName(ns, "", "requests_total"),
@ -76,19 +76,19 @@ func NewNginxStatus(watchNamespace, ingressClass string, ngxHealthPort int, ngxV
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace"}, nil),
reading: prometheus.NewDesc( reading: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "current_reading_connections"), prometheus.BuildFQName(ns, "", "connections"),
"current number of connections where nginx is reading the request header", "current number of connections where nginx is reading the request header",
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
writing: prometheus.NewDesc( writing: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "current_writing_connections"), prometheus.BuildFQName(ns, "", "connections"),
"current number of connections where nginx is writing the response back to the client", "current number of connections where nginx is writing the response back to the client",
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
waiting: prometheus.NewDesc( waiting: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "current_waiting_connections"), prometheus.BuildFQName(ns, "", "connections"),
"current number of idle client connections waiting for a request", "current number of idle client connections waiting for a request",
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
} }
go p.start() go p.start()
@ -135,17 +135,17 @@ func (p nginxStatusCollector) scrape(ch chan<- prometheus.Metric) {
} }
ch <- prometheus.MustNewConstMetric(p.data.active, ch <- prometheus.MustNewConstMetric(p.data.active,
prometheus.GaugeValue, float64(s.Active), p.ingressClass, p.watchNamespace) prometheus.GaugeValue, float64(s.Active), p.ingressClass, p.watchNamespace, "active")
ch <- prometheus.MustNewConstMetric(p.data.accepted, ch <- prometheus.MustNewConstMetric(p.data.accepted,
prometheus.GaugeValue, float64(s.Accepted), p.ingressClass, p.watchNamespace) prometheus.GaugeValue, float64(s.Accepted), p.ingressClass, p.watchNamespace, "accepted")
ch <- prometheus.MustNewConstMetric(p.data.handled, ch <- prometheus.MustNewConstMetric(p.data.handled,
prometheus.GaugeValue, float64(s.Handled), p.ingressClass, p.watchNamespace) prometheus.GaugeValue, float64(s.Handled), p.ingressClass, p.watchNamespace, "handled")
ch <- prometheus.MustNewConstMetric(p.data.requests, ch <- prometheus.MustNewConstMetric(p.data.requests,
prometheus.GaugeValue, float64(s.Requests), p.ingressClass, p.watchNamespace) prometheus.GaugeValue, float64(s.Requests), p.ingressClass, p.watchNamespace)
ch <- prometheus.MustNewConstMetric(p.data.reading, ch <- prometheus.MustNewConstMetric(p.data.reading,
prometheus.GaugeValue, float64(s.Reading), p.ingressClass, p.watchNamespace) prometheus.GaugeValue, float64(s.Reading), p.ingressClass, p.watchNamespace, "reading")
ch <- prometheus.MustNewConstMetric(p.data.writing, ch <- prometheus.MustNewConstMetric(p.data.writing,
prometheus.GaugeValue, float64(s.Writing), p.ingressClass, p.watchNamespace) prometheus.GaugeValue, float64(s.Writing), p.ingressClass, p.watchNamespace, "writing")
ch <- prometheus.MustNewConstMetric(p.data.waiting, ch <- prometheus.MustNewConstMetric(p.data.waiting,
prometheus.GaugeValue, float64(s.Waiting), p.ingressClass, p.watchNamespace) prometheus.GaugeValue, float64(s.Waiting), p.ingressClass, p.watchNamespace, "waiting")
} }