Silenced cleanup (#5127)

chavakula · web-flow · commit d48061a49f67 · 2026-03-05T11:50:17.000+05:30
* Add silenced store support to entity deletion logic

* Refactor silenced store mock methods to include parameters for subscription and check name
diff --git a/backend/api/entity.go b/backend/api/entity.go
@@ -15,20 +15,28 @@ import (
 
 // EntityClient is an API client for entities.
 type EntityClient struct {
-	storev2     storev2.Interface
-	entityStore store.EntityStore
-	eventStore  store.EventStore
-	auth        authorization.Authorizer
+	storev2       storev2.Interface
+	entityStore   store.EntityStore
+	eventStore    store.EventStore
+	silencedStore store.SilencedStore
+	auth          authorization.Authorizer
 }
 
 // NewEntityClient creates a new EntityClient given a store, an event store and
 // an authorizer.
-func NewEntityClient(store store.EntityStore, storev2 storev2.Interface, eventStore store.EventStore, auth authorization.Authorizer) *EntityClient {
+func NewEntityClient(entityStore store.EntityStore, storev2 storev2.Interface, eventStore store.EventStore, auth authorization.Authorizer) *EntityClient {
+	// Try to get SilencedStore from the entityStore if it implements the full Store interface
+	var silencedStore store.Store
+	if s, ok := entityStore.(store.Store); ok {
+		silencedStore = s
+	}
+
 	return &EntityClient{
-		storev2:     storev2,
-		entityStore: store,
-		eventStore:  eventStore,
-		auth:        auth,
+		storev2:       storev2,
+		entityStore:   entityStore,
+		eventStore:    eventStore,
+		silencedStore: silencedStore,
+		auth:          auth,
 	}
 }
 
@@ -64,6 +72,39 @@ func (e *EntityClient) DeleteEntity(ctx context.Context, name string) error {
 		}
 	}
 
+	// Delete entity-specific silenced entries (e.g., entity:web-01:*)
+	if e.silencedStore != nil {
+		entitySubscription := fmt.Sprintf("entity:%s", name)
+		silencedEntries, err := e.silencedStore.GetSilencedEntriesBySubscription(ctx, entitySubscription)
+		if err != nil {
+			// Log the error but continue
+			logger.WithError(err).WithFields(logrus.Fields{
+				"entity":       name,
+				"subscription": entitySubscription,
+			}).Warn("error fetching silenced entries for entity")
+		} else if len(silencedEntries) > 0 {
+			silencedNames := make([]string, 0, len(silencedEntries))
+			for _, entry := range silencedEntries {
+				silencedNames = append(silencedNames, entry.Name)
+			}
+
+			err = e.silencedStore.DeleteSilencedEntryByName(ctx, silencedNames...)
+			if err != nil {
+				// Log the error but continue
+				logger.WithError(err).WithFields(logrus.Fields{
+					"entity":   name,
+					"silences": silencedNames,
+				}).Warn("error deleting silenced entries for entity")
+			} else {
+				logger.WithFields(logrus.Fields{
+					"entity":   name,
+					"silences": silencedNames,
+					"count":    len(silencedNames),
+				}).Info("deleted entity-specific silenced entries")
+			}
+		}
+	}
+
 	return nil
 }
 
diff --git a/backend/api/entity_test.go b/backend/api/entity_test.go
@@ -703,6 +703,7 @@ func TestDeleteEntity(t *testing.T) {
 			Store: func() store.Store {
 				store := new(mockstore.MockStore)
 				store.On("DeleteEntityByName", mock.Anything, "default").Return(nil)
+				store.On("GetSilencedEntriesBySubscription", mock.Anything, []string{"entity:default"}).Return([]*corev2.Silenced{}, nil)
 				return store
 			},
 			EventStore: func() store.EventStore {
@@ -736,6 +737,7 @@ func TestDeleteEntity(t *testing.T) {
 			Store: func() store.Store {
 				store := new(mockstore.MockStore)
 				store.On("DeleteEntityByName", mock.Anything, "default").Return(nil)
+				store.On("GetSilencedEntriesBySubscription", mock.Anything, []string{"entity:default"}).Return([]*corev2.Silenced{}, nil)
 				return store
 			},
 			EventStore: func() store.EventStore {
@@ -770,6 +772,7 @@ func TestDeleteEntity(t *testing.T) {
 			Store: func() store.Store {
 				store := new(mockstore.MockStore)
 				store.On("DeleteEntityByName", mock.Anything, "default").Return(nil)
+				store.On("GetSilencedEntriesBySubscription", mock.Anything, []string{"entity:default"}).Return([]*corev2.Silenced{}, nil)
 				return store
 			},
 			EventStore: func() store.EventStore {
@@ -804,6 +807,7 @@ func TestDeleteEntity(t *testing.T) {
 			Store: func() store.Store {
 				store := new(mockstore.MockStore)
 				store.On("DeleteEntityByName", mock.Anything, "default").Return(nil)
+				store.On("GetSilencedEntriesBySubscription", mock.Anything, []string{"entity:default"}).Return([]*corev2.Silenced{}, nil)
 				return store
 			},
 			EventStore: func() store.EventStore {
diff --git a/backend/api/silenced_test.go b/backend/api/silenced_test.go
@@ -572,7 +572,7 @@ func TestGetSilencedByCheckName(t *testing.T) {
 			},
 			Store: func() store.Store {
 				store := new(mockstore.MockStore)
-				store.On("GetSilencedEntriesByCheckName", mock.Anything).Return([]*corev2.Silenced{defaultSilenced}, nil)
+				store.On("GetSilencedEntriesByCheckName", mock.Anything, "default").Return([]*corev2.Silenced{defaultSilenced}, nil)
 				return store
 			},
 			Auth: func() authorization.Authorizer {
@@ -694,7 +694,7 @@ func TestGetSilencedBySubscription(t *testing.T) {
 			},
 			Store: func() store.Store {
 				store := new(mockstore.MockStore)
-				store.On("GetSilencedEntriesBySubscription", mock.Anything).Return([]*corev2.Silenced{defaultSilenced}, nil)
+				store.On("GetSilencedEntriesBySubscription", mock.Anything, []string{"default"}).Return([]*corev2.Silenced{defaultSilenced}, nil)
 				return store
 			},
 			Auth: func() authorization.Authorizer {
diff --git a/backend/apid/actions/delete_events_by_entity.go b/backend/apid/actions/delete_events_by_entity.go
@@ -11,8 +11,9 @@ import (
 )
 
 type EntityDeleter struct {
-	EntityStore store.EntityStore
-	EventStore  store.EventStore
+	EntityStore   store.EntityStore
+	EventStore    store.EventStore
+	SilencedStore store.SilencedStore
 }
 
 func (d EntityDeleter) Delete(req *http.Request) (interface{}, error) {
@@ -22,6 +23,7 @@ func (d EntityDeleter) Delete(req *http.Request) (interface{}, error) {
 		return nil, NewError(InvalidArgument, err)
 	}
 
+	// Delete all events associated with the entity
 	events, err := d.EventStore.GetEventsByEntity(req.Context(), entityName, &store.SelectionPredicate{})
 	if err != nil {
 		return nil, fmt.Errorf("error fetching events for entity: %s", err)
@@ -43,6 +45,40 @@ func (d EntityDeleter) Delete(req *http.Request) (interface{}, error) {
 		}
 	}
 
+	// Delete entity-specific silenced entries (e.g., entity:web-01:*)
+	if d.SilencedStore != nil {
+		entitySubscription := fmt.Sprintf("entity:%s", entityName)
+		silencedEntries, err := d.SilencedStore.GetSilencedEntriesBySubscription(req.Context(), entitySubscription)
+		if err != nil {
+			// Log the error but continue with entity deletion
+			logger.WithError(err).WithFields(logrus.Fields{
+				"entity":       entityName,
+				"subscription": entitySubscription,
+			}).Warn("error fetching silenced entries for entity")
+		} else if len(silencedEntries) > 0 {
+			silencedNames := make([]string, 0, len(silencedEntries))
+			for _, entry := range silencedEntries {
+				silencedNames = append(silencedNames, entry.Name)
+			}
+
+			err = d.SilencedStore.DeleteSilencedEntryByName(req.Context(), silencedNames...)
+			if err != nil {
+				// Log the error but continue with entity deletion
+				logger.WithError(err).WithFields(logrus.Fields{
+					"entity":   entityName,
+					"silences": silencedNames,
+				}).Warn("error deleting silenced entries for entity")
+			} else {
+				logger.WithFields(logrus.Fields{
+					"entity":   entityName,
+					"silences": silencedNames,
+					"count":    len(silencedNames),
+				}).Info("deleted entity-specific silenced entries")
+			}
+		}
+	}
+
+	// Verify the entity exists before attempting deletion
 	result, err := d.EntityStore.GetEntityByName(req.Context(), entityName)
 	if err != nil {
 		return nil, NewError(InternalErr, err)
@@ -52,5 +88,6 @@ func (d EntityDeleter) Delete(req *http.Request) (interface{}, error) {
 		return nil, NewErrorf(NotFound)
 	}
 
+	// Delete the entity
 	return nil, d.EntityStore.DeleteEntityByName(req.Context(), entityName)
 }
diff --git a/backend/apid/actions/silenced.go b/backend/apid/actions/silenced.go
@@ -36,7 +36,6 @@ func (c SilencedController) List(ctx context.Context, sub, check string) ([]*cor
 	if serr != nil {
 		return nil, NewError(InternalErr, serr)
 	}
-
 	return results, nil
 }
 
diff --git a/backend/apid/actions/silenced_test.go b/backend/apid/actions/silenced_test.go
@@ -98,9 +98,15 @@ func TestSilencedQuery(t *testing.T) {
 			assert := assert.New(t)
 
 			// Mock store methods
-			store.On("GetSilencedEntriesBySubscription", tc.ctx).Return(tc.storeRecords, tc.storeErr).Once()
-			store.On("GetSilencedEntriesByCheckName", tc.ctx).Return(tc.storeRecords, tc.storeErr).Once()
-			store.On("GetSilencedEntries", tc.ctx).Return(tc.storeRecords, tc.storeErr).Once()
+			if tc.params["subscription"] != "" {
+				store.On("GetSilencedEntriesBySubscription", tc.ctx, []string{tc.params["subscription"]}).Return(tc.storeRecords, tc.storeErr).Once()
+			}
+			if tc.params["check"] != "" {
+				store.On("GetSilencedEntriesByCheckName", tc.ctx, tc.params["check"]).Return(tc.storeRecords, tc.storeErr).Once()
+			}
+			if tc.params["subscription"] == "" && tc.params["check"] == "" {
+				store.On("GetSilencedEntries", tc.ctx).Return(tc.storeRecords, tc.storeErr).Once()
+			}
 
 			// Exec Query
 			results, err := actions.List(tc.ctx, tc.params["subscription"], tc.params["check"])
diff --git a/backend/apid/routers/entities.go b/backend/apid/routers/entities.go
@@ -58,8 +58,9 @@ func (r *EntitiesRouter) Mount(parent *mux.Router) {
 	}
 
 	deleter := actions.EntityDeleter{
-		EntityStore: r.store,
-		EventStore:  r.eventStore,
+		EntityStore:   r.store,
+		EventStore:    r.eventStore,
+		SilencedStore: r.store,
 	}
 
 	routes.Del(deleter.Delete)
diff --git a/backend/apid/routers/entities_test.go b/backend/apid/routers/entities_test.go
@@ -48,6 +48,7 @@ func TestEntitiesRouter(t *testing.T) {
 	s.On("DeleteEventByEntityCheck", mock.Anything, "foo", "bar").Return(nil)
 	s.On("DeleteEntityByName", mock.Anything, "foo").Return(nil)
 	s.On("GetEntityByName", mock.Anything, "foo").Return(corev2.FixtureEntity("foo"), nil)
+	s.On("GetSilencedEntriesBySubscription", mock.Anything, []string{"entity:foo"}).Return([]*corev2.Silenced{}, nil)
 	s2 := new(storetest.Store)
 	router := NewEntitiesRouter(s, s2, s)
 	router.controller = controller
diff --git a/backend/store/etcd/silenced_store.go b/backend/store/etcd/silenced_store.go
@@ -83,6 +83,7 @@ func (s *Store) GetSilencedEntries(ctx context.Context) ([]*corev2.Silenced, err
 	if err != nil {
 		return nil, err
 	}
+	logger.Info("I am in listing")
 	return silencedArray, nil
 }
 
diff --git a/testing/mockstore/silenced.go b/testing/mockstore/silenced.go
@@ -31,13 +31,13 @@ func (s *MockStore) GetSilencedEntriesByName(ctx context.Context, names ...strin
 
 // GetSilencedEntriesBySubscription ...
 func (s *MockStore) GetSilencedEntriesBySubscription(ctx context.Context, subscriptions ...string) ([]*types.Silenced, error) {
-	args := s.Called(ctx)
+	args := s.Called(ctx, subscriptions)
 	return args.Get(0).([]*types.Silenced), args.Error(1)
 }
 
 // GetSilencedEntriesByCheckName ...
 func (s *MockStore) GetSilencedEntriesByCheckName(ctx context.Context, checkName string) ([]*types.Silenced, error) {
-	args := s.Called(ctx)
+	args := s.Called(ctx, checkName)
 	return args.Get(0).([]*types.Silenced), args.Error(1)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ func (c SilencedController) List(ctx context.Context, sub, check string) ([]*cor`
`36`	`36`	`if serr != nil {`
`37`	`37`	`return nil, NewError(InternalErr, serr)`
`38`	`38`	`}`
`39`		`-`
`40`	`39`	`return results, nil`
`41`	`40`	`}`
`42`	`41`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,9 @@ func (r EntitiesRouter) Mount(parent mux.Router) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`deleter := actions.EntityDeleter{`
`61`		`- EntityStore: r.store,`
`62`		`- EventStore: r.eventStore,`
	`61`	`+ EntityStore: r.store,`
	`62`	`+ EventStore: r.eventStore,`
	`63`	`+ SilencedStore: r.store,`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`routes.Del(deleter.Delete)`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ func (s Store) GetSilencedEntries(ctx context.Context) ([]corev2.Silenced, err`
`83`	`83`	`if err != nil {`
`84`	`84`	`return nil, err`
`85`	`85`	`}`
	`86`	`+ logger.Info("I am in listing")`
`86`	`87`	`return silencedArray, nil`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ func (s *MockStore) GetSilencedEntriesByName(ctx context.Context, names ...strin`
`31`	`31`
`32`	`32`	`// GetSilencedEntriesBySubscription ...`
`33`	`33`	`func (s MockStore) GetSilencedEntriesBySubscription(ctx context.Context, subscriptions ...string) ([]types.Silenced, error) {`
`34`		`- args := s.Called(ctx)`
	`34`	`+ args := s.Called(ctx, subscriptions)`
`35`	`35`	`return args.Get(0).([]*types.Silenced), args.Error(1)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// GetSilencedEntriesByCheckName ...`
`39`	`39`	`func (s MockStore) GetSilencedEntriesByCheckName(ctx context.Context, checkName string) ([]types.Silenced, error) {`
`40`		`- args := s.Called(ctx)`
	`40`	`+ args := s.Called(ctx, checkName)`
`41`	`41`	`return args.Get(0).([]*types.Silenced), args.Error(1)`
`42`	`42`	`}`
`43`	`43`