Kiu/Node_Exporter
Kiu/Node_Exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-11-23 12:30:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add support macos version (#2471)

Browse Source 
Signed-off-by: Serhii Freidin <sfreydin@macpaw.com>

Signed-off-by: Serhii Freidin <sfreydin@macpaw.com>
This commit is contained in:
sfreydin 2022-09-16 14:13:06 +03:00 committed by GitHub
parent 8755e852fa
commit 31f9aefe2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
collector/os_release.go
View File

@ -14,6 +14,7 @@
package collector
import (
"encoding/xml"
"errors"
"io"
"os"
@ -30,8 +31,9 @@ import (
)
const (
etcOSRelease = "/etc/os-release"
usrLibOSRelease = "/usr/lib/os-release"
etcOSRelease = "/etc/os-release"
usrLibOSRelease = "/usr/lib/os-release"
systemVersionPlist = "/System/Library/CoreServices/SystemVersion.plist"
)
var (
@ -65,6 +67,15 @@ type osReleaseCollector struct {
versionDesc *prometheus.Desc
}
type Plist struct {
Dict Dict `xml:"dict"`
}
type Dict struct {
Key []string `xml:"key"`
String []string `xml:"string"`
}
func init() {
registerCollector("os", defaultEnabled, NewOSCollector)
}
@ -80,7 +91,7 @@ func NewOSCollector(logger log.Logger) (Collector, error) {
[]string{"build_id", "id", "id_like", "image_id", "image_version", "name", "pretty_name",
"variant", "variant_id", "version", "version_codename", "version_id"}, nil,
),
osReleaseFilenames: []string{etcOSRelease, usrLibOSRelease},
osReleaseFilenames: []string{etcOSRelease, usrLibOSRelease, systemVersionPlist},
versionDesc: prometheus.NewDesc(
prometheus.BuildFQName(namespace, "os", "version"),
"Metric containing the major.minor part of the OS version.",
@ -136,10 +147,17 @@ func (c *osReleaseCollector) UpdateStruct(path string) error {
"file", path, "old_value", c.osMtime, "new_value", t)
c.osFilename = path
c.osMtime = t
c.os, err = parseOSRelease(releaseFile)
if err != nil {
return err
// SystemVersion.plist is xml file with MacOs version info
if strings.Contains(releaseFile.Name(), "SystemVersion.plist") {
c.os, err = getMacosProductVersion(releaseFile.Name())
if err != nil {
return err
}
} else {
c.os, err = parseOSRelease(releaseFile)
if err != nil {
return err
}
}
majorMinor := versionRegex.FindString(c.os.VersionID)
@ -179,3 +197,35 @@ func (c *osReleaseCollector) Update(ch chan<- prometheus.Metric) error {
}
return nil
}
func getMacosProductVersion(filename string) (*osRelease, error) {
f, _ := os.Open(filename)
bytePlist, _ := io.ReadAll(f)
f.Close()
var plist Plist
err := xml.Unmarshal(bytePlist, &plist)
if err != nil {
return &osRelease{}, err
}
var osVersionID, osVersionName, osBuildID string
if len(plist.Dict.Key) > 0 {
for index, value := range plist.Dict.Key {
switch value {
case "ProductVersion":
osVersionID = plist.Dict.String[index]
case "ProductName":
osVersionName = plist.Dict.String[index]
case "ProductBuildVersion":
osBuildID = plist.Dict.String[index]
}
}
}
return &osRelease{
Name: osVersionName,
Version: osVersionID,
VersionID: osVersionID,
BuildID: osBuildID,
}, nil
}