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

Use proxy_from_environment in Alertmanager #1782

Merged
merged 6 commits into from
Jan 2, 2025

Conversation

TheoBrigitte
Copy link
Member

@TheoBrigitte TheoBrigitte commented Dec 17, 2024

Use the proxy_from_environment option in the Alertmanager configuration to make it read the proxy settings from environment variables (HTTP_PROXY, HTTPS_PROXY, NO_PROXY, etc...) rather having the operator setting proxy via proxy_url.

See https://prometheus.io/docs/alerting/0.26/configuration/#http_config

2 things are happening here:

  • Replace proxy_url in favor of proxy_from_environment
  • Move the SlackApiToken condition so proxy_from_environment is not dependent on it

@TheoBrigitte TheoBrigitte self-assigned this Dec 17, 2024
@TheoBrigitte TheoBrigitte marked this pull request as ready for review December 17, 2024 19:48
@TheoBrigitte TheoBrigitte requested a review from a team as a code owner December 17, 2024 19:48
Copy link
Contributor

@QuentinBisson QuentinBisson left a comment

Choose a reason for hiding this comment

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

Do we need to do this as it's going away with vintage?

@TheoBrigitte
Copy link
Member Author

Do we need to do this as it's going away with vintage?

Not really, but it's good to align configs between the new and the old Alertmanager until the migration is done.

@QuentinBisson
Copy link
Contributor

Please dont release it before next year :)

@TheoBrigitte TheoBrigitte merged commit 3f42eba into main Jan 2, 2025
5 checks passed
@TheoBrigitte TheoBrigitte deleted the alertmanager-proxy-from-environment branch January 2, 2025 11:01
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