mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-12-27 22:49:44 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2282 from frebib/bug/systemd-version

Browse source 
systemd: Expose systemd minor version
This commit is contained in:
Ben Kochie 2022-02-06 15:16:13 +01:00 committed by GitHub
parent bf320eb05f 64c4c39132
commit f7086d437b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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