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

Take Prometheus MIME-type header into account #7371

Merged
merged 2 commits into from
Mar 3, 2020

Conversation

pierresouchay
Copy link
Contributor

This will avoid adding format=prometheus in request and to parse more easily metrics using Prometheus.

This commit follows #6514 and extends it by accepting old Prometheus mime-type.

@pierresouchay
Copy link
Contributor Author

damned unstable tests

This will avoid adding format=prometheus in request and to parse
more easily metrics using Prometheus.

This commit follows hashicorp#6514 as
the PR has been closed and extends it by accepting old Prometheus
mime-type.
Copy link
Member

@hanshasselberg hanshasselberg left a comment

Choose a reason for hiding this comment

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

Thank you for your work! Just found the PR from vault: hashicorp/vault#7958. Your solution is a little different from that. Is there a reason for that?

agent/agent_endpoint.go Outdated Show resolved Hide resolved
@hanshasselberg hanshasselberg self-assigned this Mar 3, 2020
@hanshasselberg hanshasselberg added the waiting-reply Waiting on response from Original Poster or another individual in the thread label Mar 3, 2020
Fixed typo to true

Co-Authored-By: Hans Hasselberg <me@hans.io>
@pierresouchay
Copy link
Contributor Author

@i0rek Yes, I do support old mime-type of Prometheus (before standardization of openmetrics)

@ghost ghost removed waiting-reply Waiting on response from Original Poster or another individual in the thread labels Mar 3, 2020
Copy link
Member

@hanshasselberg hanshasselberg left a comment

Choose a reason for hiding this comment

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

Looks great! Thank you!

@hanshasselberg hanshasselberg merged commit 2300e2d into hashicorp:master Mar 3, 2020
@freddygv freddygv added this to the 1.7.2 milestone Mar 12, 2020
freddygv pushed a commit that referenced this pull request Mar 12, 2020
This will avoid adding format=prometheus in request and to parse
more easily metrics using Prometheus.
This commit follows #6514 as
the PR has been closed and extends it by accepting old Prometheus
mime-type.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants