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

pkg/alertmanager: define all possible receivers #3689

Merged
merged 1 commit into from Nov 19, 2020

Conversation

simonpasquier
Copy link
Contributor

If the user-defined Alertmanager configuration declared a receiver that
isn't yet supported by AlertmanagerConfig (e.g. email, Pushover or
VictorOps), the receiver declaration would be dropped from the generated
configuration.

Closes #3665

If the user-defined Alertmanager configuration declared a receiver that
isn't yet supported by AlertmanagerConfig (e.g. email, Pushover or
VictorOps), the receiver declaration would be dropped from the generated
configuration.

Closes prometheus-operator#3665

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier simonpasquier marked this pull request as ready for review November 18, 2020 13:36
@simonpasquier simonpasquier requested a review from a team as a code owner November 18, 2020 13:36
Copy link
Contributor

@lilic lilic left a comment

Choose a reason for hiding this comment

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

lgtm

@simonpasquier simonpasquier merged commit eb603d1 into prometheus-operator:master Nov 19, 2020
@simonpasquier simonpasquier deleted the fix-3665 branch November 19, 2020 10:37
Comment on lines +269 to +279
func (d *duration) UnmarshalText(text []byte) error {
parsed, err := time.ParseDuration(string(text))
if err == nil {
*d = duration(parsed)
}
return err
}

func (d duration) MarshalText() ([]byte, error) {
return []byte(time.Duration(d).String()), nil
}
Copy link
Member

Choose a reason for hiding this comment

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

Why this is in types.go?

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.

Slack receivers are not being populated using managed secret for alertmanager
3 participants