Skip to content

Udpate usage of notifiers to fix alert and report #4522

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

Merged
AdityaHegde merged 1 commit into from
Apr 5, 2024
Merged

Udpate usage of notifiers to fix alert and report #4522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions admin/server/alerts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ func (s *Server) yamlForManagedAlert(opts *adminv1.AlertOptions, ownerUserID str
// Notification options
res.Renotify = opts.Renotify
res.RenotifyAfter = opts.RenotifyAfterSeconds
res.Notify.Email.Emails = opts.EmailRecipients
res.Notify.Email.Recipients = opts.EmailRecipients
res.Notify.Slack.Channels = opts.SlackChannels
res.Notify.Slack.Users = opts.SlackUsers
res.Notify.Slack.Webhooks = opts.SlackWebhooks
Expand Down Expand Up @@ -496,7 +496,7 @@ func (s *Server) yamlForCommittedAlert(opts *adminv1.AlertOptions) ([]byte, erro
// Notification options
res.Renotify = opts.Renotify
res.RenotifyAfter = opts.RenotifyAfterSeconds
res.Notify.Email.Emails = opts.EmailRecipients
res.Notify.Email.Recipients = opts.EmailRecipients
res.Notify.Slack.Channels = opts.SlackChannels
res.Notify.Slack.Users = opts.SlackUsers
res.Notify.Slack.Webhooks = opts.SlackWebhooks
Expand Down Expand Up @@ -589,7 +589,7 @@ type alertYAML struct {
RenotifyAfter uint32 `yaml:"renotify_after"`
Notify struct {
Email struct {
Emails []string `yaml:"emails"`
Recipients []string `yaml:"emails"`
}
Slack struct {
Users []string `yaml:"users"`
Expand Down
2 changes: 1 addition & 1 deletion web-admin/src/features/alerts/metadata/AlertMetadata.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<EmailRecipients
emailRecipients={$alertQuery.data.resource.alert.spec.notifiers.find(
(n) => n.connector === "email",
)?.properties?.email?.recipients ?? []}
)?.properties?.recipients ?? []}
/>
</div>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<EmailRecipients
emailRecipients={$reportQuery.data.resource.report.spec.notifiers.find(
(n) => n.connector === "email",
)?.properties?.email?.recipients ?? []}
)?.properties?.recipients ?? []}
/>
</div>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion web-common/src/features/alerts/EditAlertDialog.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
recipients:
alertSpec?.notifiers
?.find((n) => n.connector === "email")
?.properties?.email?.recipients?.map((r) => ({ email: r })) ?? [],
?.properties?.recipients?.map((r) => ({ email: r })) ?? [],
evaluationInterval: alertSpec.intervalsIsoDuration ?? "",
...extractAlertFormValues(
queryArgsJson,
Expand Down
2 changes: 1 addition & 1 deletion web-common/src/features/scheduled-reports/EditScheduledReportDialog.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
recipients:
reportSpec.notifiers
?.find((n) => n.connector === "email")
?.properties?.email?.recipients?.map((email) => ({
?.properties?.recipients?.map((email) => ({
email: email,
})) ?? [],
},
Expand Down