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

fix: support text-only email configs #5804

Merged
merged 1 commit into from
Aug 22, 2023

Conversation

simonpasquier
Copy link
Contributor

@simonpasquier simonpasquier commented Aug 10, 2023

Description

Closes #5421

Type of change

What type of changes does your code introduce to the Prometheus operator? Put an x in the box that apply.

  • CHANGE (fix or feature that would cause existing functionality to not work as expected)
  • FEATURE (non-breaking change which adds functionality)
  • BUGFIX (non-breaking change which fixes an issue)
  • ENHANCEMENT (non-breaking change which improves existing functionality)
  • NONE (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)

Changelog entry

Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.

fix: support text-only email configs

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier simonpasquier requested a review from a team as a code owner August 10, 2023 15:55
@simonpasquier
Copy link
Contributor Author

I've tested locally: when setting html: "" in the Alertmanager configuration secret, I receive a text-only email.

@@ -699,10 +699,10 @@ type EmailConfig struct {
Headers []KeyValue `json:"headers,omitempty"`
// The HTML body of the email notification.
// +optional
HTML string `json:"html,omitempty"`
HTML *string `json:"html,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Do still wanna make improvements and bug fixed on alpha apis?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

for now, v1alpha1 is still the default version being installed. I started #5398 a while ago to move forward with v1beta1 but no time to complete it for now...

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, thx

@simonpasquier simonpasquier mentioned this pull request Aug 17, 2023
5 tasks
Copy link
Member

@ArthurSens ArthurSens left a comment

Choose a reason for hiding this comment

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

Nice job tracking this down all the way from an issue in prometheus/alertmanager :)

@simonpasquier simonpasquier merged commit f7edae1 into prometheus-operator:main Aug 22, 2023
16 checks passed
@simonpasquier simonpasquier deleted the fix-5421 branch August 22, 2023 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to send text email alerts in Rancher monitoring
4 participants