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

Allow proxy_url on oauth2 for metrics and logs #1711

Merged
merged 2 commits into from
May 18, 2022
Merged

Allow proxy_url on oauth2 for metrics and logs #1711

merged 2 commits into from
May 18, 2022

Conversation

martinjaegerdk
Copy link
Contributor

@martinjaegerdk martinjaegerdk commented May 18, 2022 •
edited by rfratto
Loading

PR Description

Update prometheus/common v0.32.1-> v0.33.0, enabling:

  • proxy_url on oauth2 (metrics and logs) prom docs
  • prometheus/common adds http2_enabled as default = true (tests aligned)

Which issue(s) this PR fixes

Fixes #1702

Notes to the Reviewer

N/A

PR Checklist

  • CHANGELOG updated
  • [ ] Documentation added Prometheus docs needs to get updated, but is not yet
  • Tests updated

@martinjaegerdk
Upgrade pkg prometheus/common to v0.33.0
cf424a5 
Enables proxy_url on oauth2 (metrics and logs)
prometheus/common adds http2_enabled as default = true (tests aligned)
@martinjaegerdk
update changelog
5964b13
@martinjaegerdk martinjaegerdk changed the title Upgrade pkg prometheus/common to v0.33.0 Allow proxy_url on oauth2 for metrics and logs (prometheus/common v0.33.0) May 18, 2022
@martinjaegerdk martinjaegerdk changed the title Allow proxy_url on oauth2 for metrics and logs (prometheus/common v0.33.0) Allow proxy_url on oauth2 for metrics and logs May 18, 2022
@martinjaegerdk martinjaegerdk marked this pull request as ready for review May 18, 2022 07:54
@martinjaegerdk martinjaegerdk mentioned this pull request May 18, 2022
Closed
@tpaschalis
Copy link
Member

tpaschalis commented May 18, 2022 •
edited
Loading

Hey @martin-jaeger-maersk! Thanks for taking the time to contribute to the Agent! 🙏

Don't worry about the failure in TestOTelConfig/tail_sampling_config_with_load_balancing, it's a flaky test and we're looking at it in #1654. I'll just re-run to get it green, but it has nothing to do with your PR.

Sorry if that triggered any alarms

tpaschalis
tpaschalis approved these changes May 18, 2022
View reviewed changes
Copy link
Member

@tpaschalis tpaschalis left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@martinjaegerdk
Copy link
Contributor Author

LGTM, thanks!

Thank you. When you plan on merging?

@tpaschalis tpaschalis merged commit ea67af7 into grafana:main May 18, 2022
@martinjaegerdk martinjaegerdk deleted the oauth2-http-proxy-support branch May 19, 2022 07:31
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Mar 27, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tpaschalis tpaschalis tpaschalis approved these changes

Assignees
No one assigned
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Grafana agent http proxy not fully supported
2 participants
@martinjaegerdk @tpaschalis