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.

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

Cherry-pick #3947 to 5.x: Fixing panic on prometheus collector when label has , #4001

Merged
merged 1 commit into from
Apr 12, 2017

Conversation

tsg
Copy link
Contributor

@tsg tsg commented Apr 12, 2017

Cherry-pick of PR #3947 to 5.x branch. Original message:

Fixes #3946

@@ -132,6 +132,10 @@ https://github.com/elastic/beats/compare/v5.2.2...v5.3.0[View commits]

- Add error handling to system process metricset for when Linux cgroups are missing from the kernel. {pull}3692[3692]
- Add labels to the Docker healthcheck metricset output. {pull}3707[3707]
- Make system process metricset honor the cpu_ticks config option. {issue}3590[3590]
Copy link
Contributor

Choose a reason for hiding this comment

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

I think some changelog changes sneaked in

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

@ruflin ruflin merged commit d5f1cc7 into elastic:5.x Apr 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants