RepoMirrors
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

systemd: Expose systemd minor version 

systemd patch versions are as important as the major version number;
they indicate security or bug fixes or other behavioural changes between
versions.

Use float64 over float32 as the rounding error with float32 rendered
250.3 as 250.3000030517578 in my testing.

Signed-off-by: Joe Groocock <jgroocock@cloudflare.com>
Signed-off-by: Joe Groocock <me@frebib.net>
This commit is contained in:
Joe Groocock 2022-02-06 14:01:45 +00:00 committed by Joe Groocock
parent bf320eb05f
commit 64c4c39132
No known key found for this signature in database
GPG Key ID: E0B16BEACFBB6A86
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collector/systemd_linux.go
View File

@ -72,7 +72,7 @@ type systemdCollector struct {
socketCurrentConnectionsDesc *prometheus.Desc socketCurrentConnectionsDesc *prometheus.Desc
socketRefusedConnectionsDesc *prometheus.Desc socketRefusedConnectionsDesc *prometheus.Desc
systemdVersionDesc *prometheus.Desc systemdVersionDesc *prometheus.Desc
systemdVersion int systemdVersion float64
unitIncludePattern *regexp.Regexp unitIncludePattern *regexp.Regexp
unitExcludePattern *regexp.Regexp unitExcludePattern *regexp.Regexp
logger log.Logger logger log.Logger
@ -488,7 +488,7 @@ func filterUnits(units []unit, includePattern, excludePattern *regexp.Regexp, lo
return filtered return filtered
} }
func getSystemdVersion(logger log.Logger) int { func getSystemdVersion(logger log.Logger) float64 {
conn, err := newSystemdDbusConn() conn, err := newSystemdDbusConn()
if err != nil { if err != nil {
level.Warn(logger).Log("msg", "Unable to get systemd dbus connection, defaulting systemd version to 0", "err", err) level.Warn(logger).Log("msg", "Unable to get systemd dbus connection, defaulting systemd version to 0", "err", err)
@ -500,9 +500,9 @@ func getSystemdVersion(logger log.Logger) int {
level.Warn(logger).Log("msg", "Unable to get systemd version property, defaulting to 0") level.Warn(logger).Log("msg", "Unable to get systemd version property, defaulting to 0")
return 0 return 0
} }
re := regexp.MustCompile(`[0-9][0-9][0-9]`) re := regexp.MustCompile(`[0-9][0-9][0-9](\.[0-9]+)?`)
version = re.FindString(version) version = re.FindString(version)
v, err := strconv.Atoi(version) v, err := strconv.ParseFloat(version, 64)
if err != nil { if err != nil {
level.Warn(logger).Log("msg", "Got invalid systemd version", "version", version) level.Warn(logger).Log("msg", "Got invalid systemd version", "version", version)
return 0 return 0