Merge branch 'master' into docker

This commit is contained in:
Bart Vercoulen 2021-03-16 12:23:51 +01:00 committed by GitHub
commit de70743c99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -455,7 +455,7 @@ func NewPostfixExporter(showqPath string, logSrc LogSource, logUnsupportedLines
Namespace: "postfix", Namespace: "postfix",
Name: "lmtp_delivery_delay_seconds", Name: "lmtp_delivery_delay_seconds",
Help: "LMTP message processing time in seconds.", Help: "LMTP message processing time in seconds.",
Buckets: []float64{1e-3, 1e-2, 1e-1, 1e0, 1e1, 1e2, 1e3}, Buckets: timeBuckets,
}, },
[]string{"stage"}), []string{"stage"}),
pipeDelays: prometheus.NewHistogramVec( pipeDelays: prometheus.NewHistogramVec(
@ -463,7 +463,7 @@ func NewPostfixExporter(showqPath string, logSrc LogSource, logUnsupportedLines
Namespace: "postfix", Namespace: "postfix",
Name: "pipe_delivery_delay_seconds", Name: "pipe_delivery_delay_seconds",
Help: "Pipe message processing time in seconds.", Help: "Pipe message processing time in seconds.",
Buckets: []float64{1e-3, 1e-2, 1e-1, 1e0, 1e1, 1e2, 1e3}, Buckets: timeBuckets,
}, },
[]string{"relay", "stage"}), []string{"relay", "stage"}),
qmgrInsertsNrcpt: prometheus.NewHistogram(prometheus.HistogramOpts{ qmgrInsertsNrcpt: prometheus.NewHistogram(prometheus.HistogramOpts{
@ -488,7 +488,7 @@ func NewPostfixExporter(showqPath string, logSrc LogSource, logUnsupportedLines
Namespace: "postfix", Namespace: "postfix",
Name: "smtp_delivery_delay_seconds", Name: "smtp_delivery_delay_seconds",
Help: "SMTP message processing time in seconds.", Help: "SMTP message processing time in seconds.",
Buckets: []float64{1e-3, 1e-2, 1e-1, 1e0, 1e1, 1e2, 1e3}, Buckets: timeBuckets,
}, },
[]string{"stage"}), []string{"stage"}),
smtpTLSConnects: prometheus.NewCounterVec( smtpTLSConnects: prometheus.NewCounterVec(