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

make exclude metric naming more consistent

Browse source
This commit is contained in:
Marco Cadetg 2023-03-17 15:27:56 +01:00
parent be9bf4e4d3
commit facbe569c7
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
internal/ingress/metric/collectors/socket.go
View file

@ -107,7 +107,7 @@ var defObjectives = map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001}
// NewSocketCollector creates a new SocketCollector instance using // NewSocketCollector creates a new SocketCollector instance using
// the ingress watch namespace and class used by the controller // the ingress watch namespace and class used by the controller
func NewSocketCollector(pod, namespace, class string, metricsPerHost, reportStatusClasses bool, buckets HistogramBuckets, excludedMetrics []string) (*SocketCollector, error) { func NewSocketCollector(pod, namespace, class string, metricsPerHost, reportStatusClasses bool, buckets HistogramBuckets, excludeMetrics []string) (*SocketCollector, error) {
socket := "/tmp/nginx/prometheus-nginx.socket" socket := "/tmp/nginx/prometheus-nginx.socket"
// unix sockets must be unlink()ed before being used // unix sockets must be unlink()ed before being used
_ = syscall.Unlink(socket) _ = syscall.Unlink(socket)
@ -133,8 +133,8 @@ func NewSocketCollector(pod, namespace, class string, metricsPerHost, reportStat
requestTags = append(requestTags, "host") requestTags = append(requestTags, "host")
} }
em := make(map[string]struct{}, len(excludedMetrics)) em := make(map[string]struct{}, len(excludeMetrics))
for _, m := range excludedMetrics { for _, m := range excludeMetrics {
// remove potential nginx_ingress_controller prefix from the metric name // remove potential nginx_ingress_controller prefix from the metric name
// TBD: how to handle fully qualified histogram metrics e.g. _buckets and _sum. Should we just remove the suffix and remove the histogram metric or ignore it? // TBD: how to handle fully qualified histogram metrics e.g. _buckets and _sum. Should we just remove the suffix and remove the histogram metric or ignore it?
em[strings.TrimPrefix(m, "nginx_ingress_controller_")] = struct{}{} em[strings.TrimPrefix(m, "nginx_ingress_controller_")] = struct{}{}
@ -277,16 +277,16 @@ func NewSocketCollector(pod, namespace, class string, metricsPerHost, reportStat
return sc, nil return sc, nil
} }
func containsMetric(excludedMetrics map[string]struct{}, name string) bool { func containsMetric(excludeMetrics map[string]struct{}, name string) bool {
if _, ok := excludedMetrics[name]; ok { if _, ok := excludeMetrics[name]; ok {
klog.V(3).InfoS("Skipping metric", "metric", name) klog.V(3).InfoS("Skipping metric", "metric", name)
return true return true
} }
return false return false
} }
func summaryMetric(opts prometheus.SummaryOpts, requestTags []string, excludedMetrics map[string]struct{}) *prometheus.SummaryVec { func summaryMetric(opts prometheus.SummaryOpts, requestTags []string, excludeMetrics map[string]struct{}) *prometheus.SummaryVec {
if containsMetric(excludedMetrics, opts.Name) { if containsMetric(excludeMetrics, opts.Name) {
return nil return nil
} }
return prometheus.NewSummaryVec( return prometheus.NewSummaryVec(
@ -295,8 +295,8 @@ func summaryMetric(opts prometheus.SummaryOpts, requestTags []string, excludedMe
) )
} }
func counterMetric(opts prometheus.CounterOpts, requestTags []string, excludedMetrics map[string]struct{}) *prometheus.CounterVec { func counterMetric(opts prometheus.CounterOpts, requestTags []string, excludeMetrics map[string]struct{}) *prometheus.CounterVec {
if containsMetric(excludedMetrics, opts.Name) { if containsMetric(excludeMetrics, opts.Name) {
return nil return nil
} }
return prometheus.NewCounterVec( return prometheus.NewCounterVec(
@ -305,8 +305,8 @@ func counterMetric(opts prometheus.CounterOpts, requestTags []string, excludedMe
) )
} }
func histogramMetric(opts prometheus.HistogramOpts, requestTags []string, excludedMetrics map[string]struct{}) *prometheus.HistogramVec { func histogramMetric(opts prometheus.HistogramOpts, requestTags []string, excludeMetrics map[string]struct{}) *prometheus.HistogramVec {
if containsMetric(excludedMetrics, opts.Name) { if containsMetric(excludeMetrics, opts.Name) {
return nil return nil
} }
return prometheus.NewHistogramVec( return prometheus.NewHistogramVec(
@ -378,7 +378,7 @@ func (sc *SocketCollector) handleMessage(msg []byte) {
} }
if stats.Latency != -1 { if stats.Latency != -1 {
if sc.connectTime != nil { if sc.requestTime != nil {
connectTimeMetric, err := sc.connectTime.GetMetricWith(requestLabels) connectTimeMetric, err := sc.connectTime.GetMetricWith(requestLabels)
if err != nil { if err != nil {
klog.ErrorS(err, "Error fetching connect time metric") klog.ErrorS(err, "Error fetching connect time metric")