remove notification config from api

moira-alert · Nov 3, 2023 · e509234 · e509234
1 parent fd3429d
commit e509234
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 20 deletions.
diff --git a/cmd/api/config.go b/cmd/api/config.go
@@ -21,7 +21,6 @@ type config struct {
 	Remote              cmd.RemoteConfig              `yaml:"remote"`
 	Prometheus          cmd.PrometheusConfig          `yaml:"prometheus"`
 	NotificationHistory cmd.NotificationHistoryConfig `yaml:"notification_history"`
-	Notification        cmd.NotificationConfig        `yaml:"notification"`
 }
 
 type apiConfig struct {
@@ -115,12 +114,6 @@ func getDefault() config {
 			NotificationHistoryTTL:        "48h",
 			NotificationHistoryQueryLimit: int(notifier.NotificationsLimitUnlimited),
 		},
-		Notification: cmd.NotificationConfig{
-			DelayedTime:               "1m",
-			TransactionTimeout:        "200ms",
-			TransactionMaxRetries:     10,
-			TransactionHeuristicLimit: 10000,
-		},
 		Logger: cmd.LoggerConfig{
 			LogFile:         "stdout",
 			LogLevel:        "info",

diff --git a/cmd/api/config_test.go b/cmd/api/config_test.go
@@ -102,12 +102,6 @@ func Test_webConfig_getDefault(t *testing.T) {
 				NotificationHistoryTTL:        "48h",
 				NotificationHistoryQueryLimit: -1,
 			},
-			Notification: cmd.NotificationConfig{
-				DelayedTime:               "1m",
-				TransactionTimeout:        "200ms",
-				TransactionMaxRetries:     10,
-				TransactionHeuristicLimit: 10000,
-			},
 		}
 
 		result := getDefault()

diff --git a/cmd/api/main.go b/cmd/api/main.go
@@ -83,8 +83,7 @@ func main() {
 
 	databaseSettings := applicationConfig.Redis.GetSettings()
 	notificationHistorySettings := applicationConfig.NotificationHistory.GetSettings()
-	notificationSettings := applicationConfig.Notification.GetSettings()
-	database := redis.NewDatabase(logger, databaseSettings, notificationHistorySettings, notificationSettings, redis.API)
+	database := redis.NewDatabase(logger, databaseSettings, notificationHistorySettings, redis.NotificationConfig{}, redis.API)
 
 	// Start Index right before HTTP listener. Fail if index cannot start
 	searchIndex := index.NewSearchIndex(logger, database, telemetry.Metrics)

diff --git a/local/api.yml b/local/api.yml
@@ -53,11 +53,6 @@ web:
 notification_history:
   ttl: 48h
   query_limit: 10000
-notification:
-  delayed_time: 1m
-  transaction_timeout: 200ms
-  transaction_max_retries: 10
-  transaction_heuristic_limit: 10000
 log:
   log_file: stdout
   log_level: debug