diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c4efd2..e981536f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed too frequent retry of `perform_notification` task on Telegram ratelimit error by @Ferril ([#3744](https://github.com/grafana/oncall/pull/3744)) +- Dynamic labels & multi-label extraction label are broken ([#3750](https://github.com/grafana/oncall/issues/3750)) - Add check whether organization has Slack connection on update Slack related field using public api endpoints by @Ferril ([#3751](https://github.com/grafana/oncall/pull/3751)) diff --git a/grafana-plugin/src/containers/IntegrationLabelsForm/IntegrationLabelsForm.tsx b/grafana-plugin/src/containers/IntegrationLabelsForm/IntegrationLabelsForm.tsx index 73f54d1e..ac53937d 100644 --- a/grafana-plugin/src/containers/IntegrationLabelsForm/IntegrationLabelsForm.tsx +++ b/grafana-plugin/src/containers/IntegrationLabelsForm/IntegrationLabelsForm.tsx @@ -206,9 +206,10 @@ const IntegrationLabelsForm = observer((props: IntegrationLabelsFormProps) => { templates={templates} templateBody={alertGroupLabels.custom[customLabelIndexToShowTemplateEditor].value.name} onHide={() => setCustomLabelIndexToShowTemplateEditor(undefined)} - onUpdateTemplates={({ alert_group_labels }) => { + onUpdateTemplates={(templates) => { const newCustom = [...alertGroupLabels.custom]; - newCustom[customLabelIndexToShowTemplateEditor].value.name = alert_group_labels; + newCustom[customLabelIndexToShowTemplateEditor].value.name = + templates[LabelTemplateOptions.AlertGroupDynamicLabel.key]; setAlertGroupLabels({ ...alertGroupLabels, @@ -229,10 +230,10 @@ const IntegrationLabelsForm = observer((props: IntegrationLabelsFormProps) => { templates={templates} templateBody={alertGroupLabels.template} onHide={() => setShowTemplateEditor(false)} - onUpdateTemplates={({ alert_group_labels }) => { + onUpdateTemplates={(templates) => { setAlertGroupLabels({ ...alertGroupLabels, - template: alert_group_labels, + template: templates[LabelTemplateOptions.AlertGroupMultiLabel.key], }); setShowTemplateEditor(undefined); diff --git a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx index c2714029..f3fb474a 100644 --- a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx +++ b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx @@ -177,6 +177,7 @@ const OutgoingWebhookForm = observer((props: OutgoingWebhookFormProps) => { preset: selectedPreset?.id, trigger_type: null, http_method: 'POST', + forward_all: true, }; } else if (isNewOrCopy) { data = { ...outgoingWebhookStore.items[id], is_legacy: false, name: '' };