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

Added support for status=deferred metric

Browse Source
This commit is contained in:
Andre Ponert 2019-04-15 18:46:11 +02:00
parent af6943b1bc
commit b925d46fcb
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
postfix_exporter.go
View File

@ -66,6 +66,7 @@ type PostfixExporter struct {
smtpdSASLAuthenticationFailures prometheus.Counter smtpdSASLAuthenticationFailures prometheus.Counter
smtpdTLSConnects *prometheus.CounterVec smtpdTLSConnects *prometheus.CounterVec
unsupportedLogEntries *prometheus.CounterVec unsupportedLogEntries *prometheus.CounterVec
errorStatusDeferred prometheus.Counter
} }
// CollectShowqFromReader parses the output of Postfix's 'showq' command // CollectShowqFromReader parses the output of Postfix's 'showq' command
@ -284,6 +285,7 @@ var (
smtpdLostConnectionLine = regexp.MustCompile(`^lost connection after (\w+) from `) smtpdLostConnectionLine = regexp.MustCompile(`^lost connection after (\w+) from `)
smtpdSASLAuthenticationFailuresLine = regexp.MustCompile(`^warning: \S+: SASL \S+ authentication failed: `) smtpdSASLAuthenticationFailuresLine = regexp.MustCompile(`^warning: \S+: SASL \S+ authentication failed: `)
smtpdTLSLine = regexp.MustCompile(`^(\S+) TLS connection established from \S+: (\S+) with cipher (\S+) \((\d+)/(\d+) bits\)$`) smtpdTLSLine = regexp.MustCompile(`^(\S+) TLS connection established from \S+: (\S+) with cipher (\S+) \((\d+)/(\d+) bits\)$`)
errorStatusDeferred = regexp.MustCompile(`, status=deferred`)
) )
// CollectFromLogline collects metrict from a Postfix log line. // CollectFromLogline collects metrict from a Postfix log line.
@ -415,6 +417,10 @@ func (e *PostfixExporter) CollectFromLogline(line string) {
} else { } else {
e.unsupportedLogEntries.WithLabelValues(logMatches[1]).Inc() e.unsupportedLogEntries.WithLabelValues(logMatches[1]).Inc()
} }
} else if logMatches[1] == "error" {
if errorMatches := errorStatusDeferred.FindStringSubmatch(logMatches[2]) ; errorMatches != nil {
e.errorStatusDeferred.Inc()
}
} else { } else {
// Unknown Postfix service. // Unknown Postfix service.
e.unsupportedLogEntries.WithLabelValues(logMatches[1]).Inc() e.unsupportedLogEntries.WithLabelValues(logMatches[1]).Inc()
@ -569,6 +575,12 @@ func NewPostfixExporter(showqPath string, logfilePath string, journal *Journal)
Help: "Log entries that could not be processed.", Help: "Log entries that could not be processed.",
}, },
[]string{"service"}), []string{"service"}),
errorStatusDeferred: prometheus.NewCounter(prometheus.CounterOpts{
Namespace: "postfix",
Name: "error_status_deferred",
Help: "Total number of messages deferred.",
}),
}, nil }, nil
} }
@ -593,6 +605,7 @@ func (e *PostfixExporter) Describe(ch chan<- *prometheus.Desc) {
e.smtpdRejects.Describe(ch) e.smtpdRejects.Describe(ch)
ch <- e.smtpdSASLAuthenticationFailures.Desc() ch <- e.smtpdSASLAuthenticationFailures.Desc()
e.smtpdTLSConnects.Describe(ch) e.smtpdTLSConnects.Describe(ch)
ch <- e.errorStatusDeferred.Desc()
e.unsupportedLogEntries.Describe(ch) e.unsupportedLogEntries.Describe(ch)
} }
@ -654,6 +667,7 @@ func (e *PostfixExporter) Collect(ch chan<- prometheus.Metric) {
e.smtpdRejects.Collect(ch) e.smtpdRejects.Collect(ch)
ch <- e.smtpdSASLAuthenticationFailures ch <- e.smtpdSASLAuthenticationFailures
e.smtpdTLSConnects.Collect(ch) e.smtpdTLSConnects.Collect(ch)
ch <- e.errorStatusDeferred
e.unsupportedLogEntries.Collect(ch) e.unsupportedLogEntries.Collect(ch)
} }