Get only active configs for ruler

Author: lelenanam

pkg/configs/api/api.go

@@ -229,6 +229,11 @@ func (a *API) deactivateConfig(w http.ResponseWriter, r *http.Request) {
 	logger := util.WithContext(r.Context(), util.Logger)
 
 	if err := a.db.DeactivateConfig(userID); err != nil {
+		if err == sql.ErrNoRows {
+			level.Info(logger).Log("msg", "config deactivated, no configuration", "userID", userID)
+			http.Error(w, "No configuration", http.StatusNotFound)
+			return
+		}
 		level.Error(logger).Log("msg", "error deactivating config", "err", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -246,10 +251,15 @@ func (a *API) restoreConfig(w http.ResponseWriter, r *http.Request) {
 	logger := util.WithContext(r.Context(), util.Logger)
 
 	if err := a.db.RestoreConfig(userID); err != nil {
+		if err == sql.ErrNoRows {
+			level.Info(logger).Log("msg", "restore config - no configuration", "userID", userID)
+			http.Error(w, "No configuration", http.StatusNotFound)
+			return
+		}
 		level.Error(logger).Log("msg", "error restoring config", "err", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 	level.Info(logger).Log("msg", "config restored", "userID", userID)
-	w.WriteHeader(http.StatusCreated)
+	w.WriteHeader(http.StatusOK)
 }

pkg/configs/configs.go

@@ -38,8 +38,9 @@ func (v View) GetVersionedRulesConfig() *VersionedRulesConfig {
 		return nil
 	}
 	return &VersionedRulesConfig{
-		ID:     v.ID,
-		Config: v.Config.RulesFiles,
+		ID:        v.ID,
+		Config:    v.Config.RulesFiles,
+		DeletedAt: v.DeletedAt,
 	}
 }
 
@@ -95,6 +96,7 @@ func (c RulesConfig) Parse() ([]rules.Rule, error) {
 // VersionedRulesConfig is a RulesConfig together with a version.
 // `data Versioned a = Versioned { id :: ID , config :: a }`
 type VersionedRulesConfig struct {
-	ID     ID          `json:"id"`
-	Config RulesConfig `json:"config"`
+	ID        ID          `json:"id"`
+	Config    RulesConfig `json:"config"`
+	DeletedAt time.Time   `json:"deleted_at"`
 }

pkg/ruler/scheduler.go

@@ -192,10 +192,14 @@ func (s *scheduler) addNewConfigs(now time.Time, cfgs map[string]configs.Version
 			level.Warn(util.Logger).Log("msg", "scheduler: invalid Cortex configuration", "user_id", userID, "err", err)
 			continue
 		}
-
 		level.Info(util.Logger).Log("msg", "scheduler: updating rules for user", "user_id", userID, "num_rules", len(rules))
 		s.Lock()
-		s.cfgs[userID] = rules
+		// if deleted remove from map
+		if !config.DeletedAt.IsZero() {
+			delete(s.cfgs, userID)
+		} else {
+			s.cfgs[userID] = rules
+		}
 		s.Unlock()
 		s.addWorkItem(workItem{userID, rules, now})
 	}