Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

systemd: Expose systemd minor version #2282

Merged
merged 1 commit into from
Feb 6, 2022
Merged

systemd: Expose systemd minor version #2282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions collector/systemd_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ type systemdCollector struct {
socketCurrentConnectionsDesc *prometheus.Desc
socketRefusedConnectionsDesc *prometheus.Desc
systemdVersionDesc *prometheus.Desc
systemdVersion int
systemdVersion float64
unitIncludePattern *regexp.Regexp
unitExcludePattern *regexp.Regexp
logger log.Logger
Expand Down Expand Up @@ -488,7 +488,7 @@ func filterUnits(units []unit, includePattern, excludePattern *regexp.Regexp, lo
return filtered
}

func getSystemdVersion(logger log.Logger) int {
func getSystemdVersion(logger log.Logger) float64 {
conn, err := newSystemdDbusConn()
if err != nil {
level.Warn(logger).Log("msg", "Unable to get systemd dbus connection, defaulting systemd version to 0", "err", err)
Expand All @@ -500,9 +500,9 @@ func getSystemdVersion(logger log.Logger) int {
level.Warn(logger).Log("msg", "Unable to get systemd version property, defaulting to 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)
v, err := strconv.Atoi(version)
v, err := strconv.ParseFloat(version, 64)
if err != nil {
level.Warn(logger).Log("msg", "Got invalid systemd version", "version", version)
return 0
Expand Down