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

Switch elastic/procfs to prometheus/procfs #6548

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Switch elastic/procfs to prometheus/procfs #6548

merged 1 commit into from
Mar 14, 2018

Conversation

ruflin
Copy link
Contributor

@ruflin ruflin commented Mar 14, 2018

All changes have been merged upstream.

@ruflin
Switch elastic/procfs to prometheus/procfs
5ef4cc2 
All changes have been merged upstream.
@ruflin ruflin force-pushed the switch-to-prom-procfs branch from bc75249 to 5ef4cc2 Compare March 14, 2018 11:20
@ruflin ruflin mentioned this pull request Mar 14, 2018
Merged
andrewkroh
andrewkroh approved these changes Mar 14, 2018
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.

If we ever do need to maintain forked changes again we can still do it under github.com/elastic/procfs, but we can use govendor github.com/promethus/procfs::github.com/elastic/procfs to pull them down without needing to change import paths.

@andrewkroh andrewkroh merged commit 874b1b6 into elastic:master Mar 14, 2018
@ruflin ruflin deleted the switch-to-prom-procfs branch March 14, 2018 13:48
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
libbeat Metricbeat Metricbeat review
Projects
None yet
Milestone
No milestone
Development

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