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

Make filterZone metrics more generic

Browse source 
We don't only have country filters now, so structure the metrics to
handle this
This commit is contained in:
Tom Booth 2017-08-23 11:39:46 +01:00
parent 0a658e4227
commit 21a0a90b55
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

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