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 #24622 to 7.x: accept text/plain type by default for prometheus client scraping #24731

Merged
merged 2 commits into from
Mar 24, 2021

Conversation

ChrsMark
Copy link
Member

@ChrsMark ChrsMark commented Mar 24, 2021

Cherry-pick of PR #24622 to 7.x branch. Original message:

What does this PR do?

accept text/plain type by default for prometheus client scraping

Why is it important?

prometheus java client 0.10.0 introduced breaking changes that when application/openmetrics-text is seen in accept list, new types(i.e. info) will be exposed and they are not supported by current metrics parser

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

  • start a java app instrumented with prometheus client version 0.10.0 and then start metricbeat to scrape it

Related issues

Use cases

Screenshots

Logs

@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 24, 2021
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #24731 opened

  • Start Time: 2021-03-24T14:55:40.394+0000

  • Duration: 100 min 16 sec

  • Commit: 66e1baa

Test stats 🧪

Test Results
Failed 0
Passed 8896
Skipped 2388
Total 11284

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 8896
Skipped 2388
Total 11284

@ChrsMark ChrsMark merged commit 29c38b4 into elastic:7.x Mar 24, 2021
@zube zube bot removed the [zube]: Done label Jun 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants