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

Reinstate old labels for filter metrics

Browse source 
To ensure backwards compatibility for this change we should
still use the old labels for metrics. We still introduce the new
style more generic labels.
This commit is contained in:
Tom Booth 2017-08-30 10:42:37 +01:00
parent 20b64eb069
commit f4a6cbc4d4
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,22 +98,22 @@ func NewNGINXVTSCollector(watchNamespace, ingressClass string, port int, path st
filterZoneBytes: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "filterzone_bytes_total"),
"Nginx bytes count",
[]string{"ingress_class", "namespace", "filter_name", "filter_key", "direction"}, nil),
[]string{"ingress_class", "namespace", "server_zone", "country", "filter_name", "filter_key", "direction"}, nil),
filterZoneResponses: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "filterzone_responses_total"),
"The number of responses with status codes 1xx, 2xx, 3xx, 4xx, and 5xx.",
[]string{"ingress_class", "namespace", "filter_name", "filter_key", "status_code"}, nil),
[]string{"ingress_class", "namespace", "server_zone", "country", "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),
[]string{"ingress_class", "namespace", "server_zone", "country", "filter_name", "filter_key"}, nil),
filterZoneCache: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "filterzone_cache_total"),
"Nginx cache count",
[]string{"ingress_class", "namespace", "filter_name", "filter_key", "type"}, nil),
[]string{"ingress_class", "namespace", "server_zone", "country", "filter_name", "filter_key", "type"}, nil),
upstreamBackup: prometheus.NewDesc(
prometheus.BuildFQName(ns, "", "upstream_backup"),
@ -255,15 +255,15 @@ func (p vtsCollector) scrapeVts(ch chan<- prometheus.Metric) {
for filterName, filterKeys := range nginxMetrics.FilterZones {
for filterKey, zone := range filterKeys {
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)
reflectMetrics(&zone.Responses, p.data.filterZoneResponses, ch, p.ingressClass, p.watchNamespace, filterName, filterKey, filterName, filterKey)
reflectMetrics(&zone.Cache, p.data.filterZoneCache, ch, p.ingressClass, p.watchNamespace, filterName, filterKey, filterName, filterKey)
ch <- prometheus.MustNewConstMetric(p.data.filterZoneRequestMsec,
prometheus.CounterValue, zone.RequestMsec, p.ingressClass, p.watchNamespace, filterName, filterKey)
prometheus.CounterValue, zone.RequestMsec, p.ingressClass, p.watchNamespace, filterName, filterKey, filterName, filterKey)
ch <- prometheus.MustNewConstMetric(p.data.filterZoneBytes,
prometheus.CounterValue, zone.InBytes, p.ingressClass, p.watchNamespace, filterName, filterKey, "in")
prometheus.CounterValue, zone.InBytes, p.ingressClass, p.watchNamespace, filterName, filterKey, filterName, filterKey, "in")
ch <- prometheus.MustNewConstMetric(p.data.filterZoneBytes,
prometheus.CounterValue, zone.OutBytes, p.ingressClass, p.watchNamespace, filterName, filterKey, "out")
prometheus.CounterValue, zone.OutBytes, p.ingressClass, p.watchNamespace, filterName, filterKey, filterName, filterKey, "out")
}
}
}