这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

cmd/scollector: Get OS Version in CentOS 7 #1322

Merged
merged 1 commit into from
Sep 15, 2015
Merged

cmd/scollector: Get OS Version in CentOS 7 #1322

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
24 changes: 23 additions & 1 deletion cmd/scollector/collectors/metadata_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,29 @@ func c_meta_linux_version() (opentsdb.MultiDataPoint, error) {
metadata.AddMeta("", nil, "uname", line, true)
return nil
}, "uname", "-a")
if !readOSRelease() {
readIssue()
}
return md, nil
}

func readOSRelease() bool {
var found bool
_ = readLine("/etc/os-release", func(s string) error {
fields := strings.SplitN(s, "=", 2)
if len(fields) != 2 {
return nil
}
if fields[0] == "PRETTY_NAME" {
metadata.AddMeta("", nil, "version", strings.Trim(fields[1], `"`), true)
found = true
}
return nil
})
return found
}

func readIssue() {
_ = util.ReadCommand(func(line string) error {
fields := strings.Fields(line)
hasNum := false
Expand All @@ -44,7 +67,6 @@ func c_meta_linux_version() (opentsdb.MultiDataPoint, error) {
metadata.AddMeta("", nil, "version", strings.Join(fields, " "), true)
return nil
}, "cat", "/etc/issue")
return md, nil
}

func c_meta_linux_serial() (opentsdb.MultiDataPoint, error) {
Expand Down