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

Recognize systemd based cgroups #71

Merged
merged 3 commits into from
Nov 17, 2019
Merged

Recognize systemd based cgroups #71

merged 3 commits into from
Nov 17, 2019

Conversation

vjsamuel
Copy link
Contributor

@vjsamuel vjsamuel commented Nov 1, 2019

Systemd based cgroups like how containerd works creates entries with .slice. In the case of kubernetes pods it would be kubepods.slice. This PR looks for .slice in addition to Docker and LXC.

@andrewkroh
Copy link
Member

LGTM. Could you please add a test case for .slice in

go-sysinfo/providers/linux/container_test.go

Line 83 in 64e7342

func TestIsContainerized(t *testing.T) {
.

@vjsamuel
Copy link
Contributor Author

@andrewkroh done

andrewkroh
andrewkroh approved these changes Nov 17, 2019
View reviewed changes
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you.

@andrewkroh andrewkroh added review enhancement New feature or request labels Nov 17, 2019
@andrewkroh andrewkroh merged commit cd25452 into elastic:master Nov 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vjsamuel @andrewkroh