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

combining nginx metrics in nginxStatusData

Browse source
This commit is contained in:
Benjamin Visser 2018-01-17 12:41:06 -05:00
parent 0d93f209f0
commit 7a7352ef36
1 changed files with 22 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,13 +33,9 @@ type (
} }
nginxStatusData struct { nginxStatusData struct {
active *prometheus.Desc connections_total *prometheus.Desc
accepted *prometheus.Desc requests_total *prometheus.Desc
handled *prometheus.Desc connections *prometheus.Desc
requests *prometheus.Desc
reading *prometheus.Desc
writing *prometheus.Desc
waiting *prometheus.Desc
} }
) )
@ -55,39 +51,19 @@ func NewNginxStatus(watchNamespace, ingressClass string, ngxHealthPort int, ngxV
} }
p.data = &nginxStatusData{ p.data = &nginxStatusData{
active: prometheus.NewDesc( connections_total: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "connections_total"), prometheus.BuildFQName(ns, "", "connections_total"),
"total number of active connections", "total number of connections with state {active, accepted, handled}",
[]string{"ingress_class", "namespace", "state"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
accepted: prometheus.NewDesc( requests_total: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "connections_total"),
"total number of accepted client connections",
[]string{"ingress_class", "namespace", "state"}, nil),
handled: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "connections_total"),
"total number of handled connections",
[]string{"ingress_class", "namespace", "state"}, nil),
requests: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "requests_total"), prometheus.BuildFQName(ns, "", "requests_total"),
"total number of client requests", "total number of client requests",
[]string{"ingress_class", "namespace"}, nil), []string{"ingress_class", "namespace"}, nil),
reading: prometheus.NewDesc( connections: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "connections"), prometheus.BuildFQName(ns, "", "connections"),
"current number of connections where nginx is reading the request header", "current number of client connections with state {reading, writing, waiting}",
[]string{"ingress_class", "namespace", "state"}, nil),
writing: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "connections"),
"current number of connections where nginx is writing the response back to the client",
[]string{"ingress_class", "namespace", "state"}, nil),
waiting: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "connections"),
"current number of idle client connections waiting for a request",
[]string{"ingress_class", "namespace", "state"}, nil), []string{"ingress_class", "namespace", "state"}, nil),
} }
@ -98,13 +74,9 @@ func NewNginxStatus(watchNamespace, ingressClass string, ngxHealthPort int, ngxV
// Describe implements prometheus.Collector. // Describe implements prometheus.Collector.
func (p nginxStatusCollector) Describe(ch chan<- *prometheus.Desc) { func (p nginxStatusCollector) Describe(ch chan<- *prometheus.Desc) {
ch <- p.data.active ch <- p.data.connections_total
ch <- p.data.accepted ch <- p.data.requests_total
ch <- p.data.handled ch <- p.data.connections
ch <- p.data.requests
ch <- p.data.reading
ch <- p.data.writing
ch <- p.data.waiting
} }
// Collect implements prometheus.Collector. // Collect implements prometheus.Collector.
@ -134,18 +106,18 @@ func (p nginxStatusCollector) scrape(ch chan<- prometheus.Metric) {
return return
} }
ch <- prometheus.MustNewConstMetric(p.data.active, ch <- prometheus.MustNewConstMetric(p.data.connections_total,
prometheus.GaugeValue, float64(s.Active), p.ingressClass, p.watchNamespace, "active") prometheus.CounterValue, float64(s.Active), p.ingressClass, p.watchNamespace, "active")
ch <- prometheus.MustNewConstMetric(p.data.accepted, ch <- prometheus.MustNewConstMetric(p.data.connections_total,
prometheus.GaugeValue, float64(s.Accepted), p.ingressClass, p.watchNamespace, "accepted") prometheus.CounterValue, float64(s.Accepted), p.ingressClass, p.watchNamespace, "accepted")
ch <- prometheus.MustNewConstMetric(p.data.handled, ch <- prometheus.MustNewConstMetric(p.data.connections_total,
prometheus.GaugeValue, float64(s.Handled), p.ingressClass, p.watchNamespace, "handled") prometheus.CounterValue, float64(s.Handled), p.ingressClass, p.watchNamespace, "handled")
ch <- prometheus.MustNewConstMetric(p.data.requests, ch <- prometheus.MustNewConstMetric(p.data.requests_total,
prometheus.GaugeValue, float64(s.Requests), p.ingressClass, p.watchNamespace) prometheus.CounterValue, float64(s.Requests), p.ingressClass, p.watchNamespace)
ch <- prometheus.MustNewConstMetric(p.data.reading, ch <- prometheus.MustNewConstMetric(p.data.connections,
prometheus.GaugeValue, float64(s.Reading), p.ingressClass, p.watchNamespace, "reading") prometheus.GaugeValue, float64(s.Reading), p.ingressClass, p.watchNamespace, "reading")
ch <- prometheus.MustNewConstMetric(p.data.writing, ch <- prometheus.MustNewConstMetric(p.data.connections,
prometheus.GaugeValue, float64(s.Writing), p.ingressClass, p.watchNamespace, "writing") prometheus.GaugeValue, float64(s.Writing), p.ingressClass, p.watchNamespace, "writing")
ch <- prometheus.MustNewConstMetric(p.data.waiting, ch <- prometheus.MustNewConstMetric(p.data.connections,
prometheus.GaugeValue, float64(s.Waiting), p.ingressClass, p.watchNamespace, "waiting") prometheus.GaugeValue, float64(s.Waiting), p.ingressClass, p.watchNamespace, "waiting")
} }