IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix reading props from undefined in settings (#82418)

Browse Source 
* Fix reading props from undefined in settings

* Make settings optional in GrafanaManagedReceiverConfig type
This commit is contained in:
Sonia Aguilar
2024-02-14 14:38:20 +01:00
committed by GitHub
parent 9dcb7800de
commit 8dc1cd6d59
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/alerting/unified/components/receivers/grafanaAppReceivers/useReceiversMetadata.ts
View File

@@ -39,7 +39,7 @@ export function getOnCallMetadata(
} }
const matchingOnCallIntegration = onCallIntegrations.find( const matchingOnCallIntegration = onCallIntegrations.find(
(integration) => integration.integration_url === receiver.settings.url (integration) => integration.integration_url === receiver.settings?.url
); );
return { return {

4
public/app/features/alerting/unified/mockApi.ts
View File

@@ -120,7 +120,9 @@ class GrafanaReceiverConfigBuilder {
} }
addSetting(key: string, value: string): GrafanaReceiverConfigBuilder { addSetting(key: string, value: string): GrafanaReceiverConfigBuilder {
this.grafanaReceiverConfig.settings[key] = value; if (this.grafanaReceiverConfig.settings) {
this.grafanaReceiverConfig.settings[key] = value;
}
return this; return this;
} }

2
public/app/plugins/datasource/alertmanager/types.ts
View File

@@ -71,7 +71,7 @@ export type GrafanaManagedReceiverConfig = {
disableResolveMessage: boolean; disableResolveMessage: boolean;
secureFields?: Record<string, boolean>; secureFields?: Record<string, boolean>;
secureSettings?: Record<string, any>; secureSettings?: Record<string, any>;
settings: Record<string, any>; settings?: Record<string, any>; // sometimes settings are optional for security reasons (RBAC)
type: string; type: string;
name: string; name: string;
updated?: string; updated?: string;