RepoMirrors/postgres_exporter
1
0
Fork 0
mirror of https://github.com/prometheus-community/postgres_exporter synced 2025-04-21 14:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly set short_version for major version 10 and up.

Browse Source 
Before, postgres_exporter reported a full three-digit semver for Postgres
versions in the pg_static metric, padding the version with a extra .0, e.g.
13.3 -> 13.3.0.

Fixes: https://github.com/prometheus-community/postgres_exporter/issues/349
Signed-off-by: Michael Banck <michael.banck@credativ.de>
This commit is contained in:
Michael Banck 2021-12-01 10:16:37 +01:00
parent dcf498e709
commit ce2f9089bd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/postgres_exporter/postgres_exporter.go
View File

@ -653,9 +653,15 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, server *Server)
versionDesc := prometheus.NewDesc(fmt.Sprintf("%s_%s", namespace, staticLabelName), versionDesc := prometheus.NewDesc(fmt.Sprintf("%s_%s", namespace, staticLabelName),
"Version string as reported by postgres", []string{"version", "short_version"}, server.labels) "Version string as reported by postgres", []string{"version", "short_version"}, server.labels)
var semanticVersionShort = semanticVersion.String()
if semanticVersion.GE(semver.MustParse("10.0.0")) {
var versionSplit = strings.Split(semanticVersion.String(), ".")
semanticVersionShort = versionSplit[0] + "." + versionSplit[1]
}
if !e.disableDefaultMetrics && server.master { if !e.disableDefaultMetrics && server.master {
ch <- prometheus.MustNewConstMetric(versionDesc, ch <- prometheus.MustNewConstMetric(versionDesc,
prometheus.UntypedValue, 1, versionString, semanticVersion.String()) prometheus.UntypedValue, 1, versionString, semanticVersionShort)
} }
return nil return nil
} }