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 secure settings migration (#73749)

Browse Source 
Fix secure settings migration
This commit is contained in:
Konrad Lalik 2023-08-24 15:46:19 +02:00 committed by GitHub
parent 05c386504b
commit e7a2c86af8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/alerting/unified/components/receivers/form/ChannelOptions.tsx
View File

@ -68,7 +68,6 @@ export function ChannelOptions<R extends ChannelValues>({
)?.[option.propertyName]; )?.[option.propertyName];
const defaultValue = defaultValues?.settings?.[option.propertyName]; const defaultValue = defaultValues?.settings?.[option.propertyName];
const hasSecureProperty = defaultValues.secureSettings?.[option.propertyName];
return ( return (
<OptionField <OptionField
@ -77,7 +76,7 @@ export function ChannelOptions<R extends ChannelValues>({
key={key} key={key}
error={error} error={error}
pathPrefix={pathPrefix} pathPrefix={pathPrefix}
pathSuffix={option.secure && hasSecureProperty ? 'secureSettings.' : 'settings.'} pathSuffix={option.secure ? 'secureSettings.' : 'settings.'}
option={option} option={option}
/> />
); );

4
public/app/features/alerting/unified/utils/receiver-form.ts
View File

@ -215,6 +215,10 @@ function grafanaChannelConfigToFormChannelValues(
delete values.settings[option.propertyName]; delete values.settings[option.propertyName];
values.secureFields[option.propertyName] = true; values.secureFields[option.propertyName] = true;
} }
if (option.secure && values.settings[option.propertyName]) {
values.secureSettings[option.propertyName] = values.settings[option.propertyName];
delete values.settings[option.propertyName];
}
}); });
return values; return values;