locker98/postfix_exporter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve metric naming.

Browse Source 
Rename the queue_* metrics to showq_*, named after the other processes.
Also add a missing _total suffix to the SASL failures metric.
This commit is contained in:
Ed Schouten 2017-06-01 14:26:00 +02:00
parent a907c85658
commit c5b05341a3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
postfix_exporter.go
View File

@ -96,7 +96,7 @@ func CollectTextualShowqFromReader(file io.Reader, ch chan<- prometheus.Metric)
sizeHistogram := prometheus.NewHistogramVec( sizeHistogram := prometheus.NewHistogramVec(
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: "postfix", Namespace: "postfix",
Name: "queue_message_size_bytes", Name: "showq_message_size_bytes",
Help: "Size of messages in Postfix's message queue, in bytes", Help: "Size of messages in Postfix's message queue, in bytes",
Buckets: []float64{1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9}, Buckets: []float64{1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9},
}, },
@ -104,7 +104,7 @@ func CollectTextualShowqFromReader(file io.Reader, ch chan<- prometheus.Metric)
ageHistogram := prometheus.NewHistogramVec( ageHistogram := prometheus.NewHistogramVec(
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: "postfix", Namespace: "postfix",
Name: "queue_message_age_seconds", Name: "showq_message_age_seconds",
Help: "Age of messages in Postfix's message queue, in seconds", Help: "Age of messages in Postfix's message queue, in seconds",
Buckets: []float64{1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8}, Buckets: []float64{1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8},
}, },
@ -177,7 +177,7 @@ func CollectBinaryShowqFromReader(file io.Reader, ch chan<- prometheus.Metric) e
sizeHistogram := prometheus.NewHistogramVec( sizeHistogram := prometheus.NewHistogramVec(
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: "postfix", Namespace: "postfix",
Name: "queue_message_size_bytes", Name: "showq_message_size_bytes",
Help: "Size of messages in Postfix's message queue, in bytes", Help: "Size of messages in Postfix's message queue, in bytes",
Buckets: []float64{1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9}, Buckets: []float64{1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9},
}, },
@ -185,7 +185,7 @@ func CollectBinaryShowqFromReader(file io.Reader, ch chan<- prometheus.Metric) e
ageHistogram := prometheus.NewHistogramVec( ageHistogram := prometheus.NewHistogramVec(
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: "postfix", Namespace: "postfix",
Name: "queue_message_age_seconds", Name: "showq_message_age_seconds",
Help: "Age of messages in Postfix's message queue, in seconds", Help: "Age of messages in Postfix's message queue, in seconds",
Buckets: []float64{1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8}, Buckets: []float64{1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8},
}, },
@ -486,7 +486,7 @@ func NewPostfixExporter(showqPath string, logfilePath string) (*PostfixExporter,
[]string{"code"}), []string{"code"}),
smtpdSASLAuthenticationFailures: prometheus.NewCounter(prometheus.CounterOpts{ smtpdSASLAuthenticationFailures: prometheus.NewCounter(prometheus.CounterOpts{
Namespace: "postfix", Namespace: "postfix",
Name: "smtpd_sasl_authentication_failures", Name: "smtpd_sasl_authentication_failures_total",
Help: "Total number of SASL authentication failures.", Help: "Total number of SASL authentication failures.",
}), }),
smtpdTLSConnects: prometheus.NewCounterVec( smtpdTLSConnects: prometheus.NewCounterVec(