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

Include the average request time for filter zones

Browse source 
We would like to know what the request time is for a given service
exposed through this ingress
This commit is contained in:
Tom Booth 2017-08-23 14:21:09 +01:00
parent 21a0a90b55
commit 5159e0c0f7
2 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controllers/nginx/pkg/metric/collector/status.go
View file

@ -81,6 +81,7 @@ type filterZone struct {
InBytes float64 `json:"inBytes"`
OutBytes float64 `json:"outBytes"`
Cache cache `json:"cache"`
RequestMsec float64 `json:"requestMsec"`
Responses response `json:"responses"`
}

42
controllers/nginx/pkg/metric/collector/vts.go
View file

@ -37,23 +37,24 @@ type (
}
vtsData struct {
bytes *prometheus.Desc
cache *prometheus.Desc
connections *prometheus.Desc
responses *prometheus.Desc
requests *prometheus.Desc
filterZoneBytes *prometheus.Desc
filterZoneResponses *prometheus.Desc
filterZoneCache *prometheus.Desc
upstreamBackup *prometheus.Desc
upstreamBytes *prometheus.Desc
upstreamDown *prometheus.Desc
upstreamFailTimeout *prometheus.Desc
upstreamMaxFails *prometheus.Desc
upstreamResponses *prometheus.Desc
upstreamRequests *prometheus.Desc
upstreamResponseMsec *prometheus.Desc
upstreamWeight *prometheus.Desc
bytes *prometheus.Desc
cache *prometheus.Desc
connections *prometheus.Desc
responses *prometheus.Desc
requests *prometheus.Desc
filterZoneBytes *prometheus.Desc
filterZoneResponses *prometheus.Desc
filterZoneRequestMsec *prometheus.Desc
filterZoneCache *prometheus.Desc
upstreamBackup *prometheus.Desc
upstreamBytes *prometheus.Desc
upstreamDown *prometheus.Desc
upstreamFailTimeout *prometheus.Desc
upstreamMaxFails *prometheus.Desc
upstreamResponses *prometheus.Desc
upstreamRequests *prometheus.Desc
upstreamResponseMsec *prometheus.Desc
upstreamWeight *prometheus.Desc
}
)
@ -104,6 +105,11 @@ func NewNGINXVTSCollector(watchNamespace, ingressClass string, port int, path st
"The number of responses with status codes 1xx, 2xx, 3xx, 4xx, and 5xx.",
[]string{"ingress_class", "namespace", "filter_name", "filter_key", "status_code"}, nil),
filterZoneRequestMsec: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "filterzone_request_msecs_avg"),
"The average of only filter zone request processing times in milliseconds.",
[]string{"ingress_class", "namespace", "filter_name", "filter_key"}, nil),
filterZoneCache: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "filterzone_cache_total"),
"Nginx cache count",
@ -252,6 +258,8 @@ func (p vtsCollector) scrapeVts(ch chan<- prometheus.Metric) {
reflectMetrics(&zone.Responses, p.data.filterZoneResponses, ch, p.ingressClass, p.watchNamespace, filterName, filterKey)
reflectMetrics(&zone.Cache, p.data.filterZoneCache, ch, p.ingressClass, p.watchNamespace, filterName, filterKey)
ch <- prometheus.MustNewConstMetric(p.data.filterZoneRequestMsec,
prometheus.CounterValue, zone.RequestMsec, p.ingressClass, p.watchNamespace, filterName, filterKey)
ch <- prometheus.MustNewConstMetric(p.data.filterZoneBytes,
prometheus.CounterValue, zone.InBytes, p.ingressClass, p.watchNamespace, filterName, filterKey, "in")
ch <- prometheus.MustNewConstMetric(p.data.filterZoneBytes,