diff --git a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts index 0fb9dcfaac5..ba3f923ea1a 100644 --- a/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts +++ b/public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts @@ -39,7 +39,7 @@ export function getOnCallMetadata( } const matchingOnCallIntegration = onCallIntegrations.find( - (integration) => integration.integration_url === receiver.settings.url + (integration) => integration.integration_url === receiver.settings?.url ); return { diff --git a/public/app/features/alerting/unified/mockApi.ts b/public/app/features/alerting/unified/mockApi.ts index cd85c322815..9c3ad1e8539 100644 --- a/public/app/features/alerting/unified/mockApi.ts +++ b/public/app/features/alerting/unified/mockApi.ts @@ -120,7 +120,9 @@ class GrafanaReceiverConfigBuilder { } addSetting(key: string, value: string): GrafanaReceiverConfigBuilder { - this.grafanaReceiverConfig.settings[key] = value; + if (this.grafanaReceiverConfig.settings) { + this.grafanaReceiverConfig.settings[key] = value; + } return this; } diff --git a/public/app/plugins/datasource/alertmanager/types.ts b/public/app/plugins/datasource/alertmanager/types.ts index 51c0f711a7a..4921c31a9c2 100644 --- a/public/app/plugins/datasource/alertmanager/types.ts +++ b/public/app/plugins/datasource/alertmanager/types.ts @@ -71,7 +71,7 @@ export type GrafanaManagedReceiverConfig = { disableResolveMessage: boolean; secureFields?: Record; secureSettings?: Record; - settings: Record; + settings?: Record; // sometimes settings are optional for security reasons (RBAC) type: string; name: string; updated?: string;