diff --git a/server/public/model/config.go b/server/public/model/config.go index 9416de2576..3444349e0b 100644 --- a/server/public/model/config.go +++ b/server/public/model/config.go @@ -4365,6 +4365,10 @@ func (o *Config) Sanitize() { o.SqlSettings.DataSourceSearchReplicas[i] = FakeSetting } + for i := range o.SqlSettings.ReplicaLagSettings { + o.SqlSettings.ReplicaLagSettings[i].DataSource = NewString(FakeSetting) + } + if o.MessageExportSettings.GlobalRelaySettings != nil && o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != nil && *o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != "" { diff --git a/server/public/model/config_test.go b/server/public/model/config_test.go index a2804cae28..8e8456f5fd 100644 --- a/server/public/model/config_test.go +++ b/server/public/model/config_test.go @@ -1387,6 +1387,11 @@ func TestConfigSanitize(t *testing.T) { *c.OpenIdSettings.Secret = "secret" c.SqlSettings.DataSourceReplicas = []string{"stuff"} c.SqlSettings.DataSourceSearchReplicas = []string{"stuff"} + c.SqlSettings.ReplicaLagSettings = []*ReplicaLagSettings{{ + DataSource: NewString("DataSource"), + QueryAbsoluteLag: NewString("QueryAbsoluteLag"), + QueryTimeLag: NewString("QueryTimeLag"), + }} c.Sanitize() @@ -1401,6 +1406,19 @@ func TestConfigSanitize(t *testing.T) { assert.Equal(t, FakeSetting, *c.ElasticsearchSettings.Password) assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceReplicas[0]) assert.Equal(t, FakeSetting, c.SqlSettings.DataSourceSearchReplicas[0]) + + require.Len(t, c.SqlSettings.ReplicaLagSettings, 1) + assert.Equal(t, FakeSetting, *c.SqlSettings.ReplicaLagSettings[0].DataSource) + assert.Equal(t, "QueryAbsoluteLag", *c.SqlSettings.ReplicaLagSettings[0].QueryAbsoluteLag) + assert.Equal(t, "QueryTimeLag", *c.SqlSettings.ReplicaLagSettings[0].QueryTimeLag) + + t.Run("with default config", func(t *testing.T) { + c := Config{} + c.SetDefaults() + c.Sanitize() + + assert.Len(t, c.SqlSettings.ReplicaLagSettings, 0) + }) } func TestConfigFilteredByTag(t *testing.T) {