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

Point to the right cgroup root dir on Amazon Linux #880

Merged
merged 5 commits into from
Nov 30, 2017
Merged

Point to the right cgroup root dir on Amazon Linux #880

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fddace6
[proc] added cgroup root for amazon linux
shang-wang Nov 29, 2017
9bf5ab7
[proc] fixed comment
shang-wang Nov 29, 2017
0196154
[proc] updated cgroup root detection to check file instead of dir
shang-wang Nov 30, 2017
1d8839c
[proc] added log message for cgroup root for debug
shang-wang Nov 30, 2017
7e67203
[proc] fixed wrong log
shang-wang Nov 30, 2017
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
7 changes: 6 additions & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ func init() {

} else {
Datadog.SetDefault("container_proc_root", "/proc")
Datadog.SetDefault("container_cgroup_root", "/sys/fs/cgroup/")
// for amazon linux the cgroup directory on host is /cgroup/
if _, err := os.Stat("/cgroup/"); err == nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be more specific on the Stat and make sure we don't have an empty folder. We could look for /cgroup/memory/memory.stat for example

Datadog.SetDefault("container_cgroup_root", "/cgroup/")
} else {
Datadog.SetDefault("container_cgroup_root", "/sys/fs/cgroup/")
}
}
Datadog.SetDefault("proc_root", "/proc")
Datadog.SetDefault("histogram_aggregates", []string{"max", "median", "avg", "count"})
Expand Down