public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting: Replace IntegrationConfig with IntegrationSchemaVersion (#112010)

Browse Source 
* remove unused compat functions

* update to alerting module from pr

* replace IntegrationConfig with IntegrationSchemaVersion

* safely resolve a string into integration type

* change usages of integration config
This commit is contained in:
Yuri Tseretyan
2025-10-07 11:08:16 -04:00
committed by GitHub
parent 66fc694718
commit 7d1c6b6bd2
17 changed files with 76 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/models/testing.go
+3 -5
View File
@@ -1323,9 +1323,7 @@ func (n IntegrationMutators) WithValidConfig(integrationType schema.IntegrationT
panic(fmt.Sprintf("unknown integration type: %s", integrationType))
}
config := ncfg.GetRawNotifierConfig(c.Name)
typeSchema, _ := alertingNotify.GetSchemaForIntegration(integrationType)
integrationConfig, _ := IntegrationConfigFromSchema(typeSchema, schema.V1)
c.Config = integrationConfig
c.Config, _ = alertingNotify.GetSchemaVersionForIntegration(integrationType, schema.V1)
var settings map[string]any
_ = json.Unmarshal(config.Settings, &settings)
@@ -1342,11 +1340,11 @@ func (n IntegrationMutators) WithValidConfig(integrationType schema.IntegrationT
func (n IntegrationMutators) WithInvalidConfig(integrationType schema.IntegrationType) Mutator[Integration] {
return func(c *Integration) {
typeSchema, ok := alertingNotify.GetSchemaForIntegration(integrationType)
var ok bool
c.Config, ok = alertingNotify.GetSchemaVersionForIntegration(integrationType, schema.V1)
if !ok {
panic(fmt.Sprintf("unknown integration type: %s", integrationType))
}
c.Config, _ = IntegrationConfigFromSchema(typeSchema, schema.V1)
c.Settings = map[string]interface{}{}
c.SecureSettings = map[string]string{}
if integrationType == webex.Type {