Post EventDefinitionUpdated and EventDefinitionDeleted events (#23143)

* Post EventDefinitionUpdated and EventDefinitionDeleted events

* Adjust tests

Author: kingzacko1

graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionDeleted.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2020 Graylog, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Server Side Public License, version 1,
+ * as published by MongoDB, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Server Side Public License for more details.
+ *
+ * You should have received a copy of the Server Side Public License
+ * along with this program. If not, see
+ * <http://www.mongodb.com/licensing/server-side-public-license>.
+ */
+package org.graylog.events.processor;
+
+public record EventDefinitionDeleted(String eventDefinitionId) {
+}

graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionHandler.java

@@ -32,6 +32,7 @@
 import org.graylog.security.shares.EntitySharesService;
 import org.graylog2.database.entities.DefaultEntityScope;
 import org.graylog2.database.entities.NonDeletableSystemScope;
+import org.graylog2.events.ClusterEventBus;
 import org.graylog2.plugin.database.users.User;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
@@ -59,6 +60,7 @@ public class EventDefinitionHandler {
     private final DBEventDefinitionService eventDefinitionService;
     private final DBJobDefinitionService jobDefinitionService;
     private final DBJobTriggerService jobTriggerService;
+    private final ClusterEventBus clusterEventBus;
 
     // Provider to avoid circular dependency
     private final Provider<EntitySharesService> entitySharesServiceProvider;
@@ -70,12 +72,14 @@ public EventDefinitionHandler(DBEventDefinitionService eventDefinitionService,
                                   DBJobDefinitionService jobDefinitionService,
                                   DBJobTriggerService jobTriggerService,
                                   Provider<EntitySharesService> entitySharesServiceProvider,
-                                  JobSchedulerClock clock) {
+                                  JobSchedulerClock clock,
+                                  ClusterEventBus clusterEventBus) {
         this.eventDefinitionService = eventDefinitionService;
         this.jobDefinitionService = jobDefinitionService;
         this.jobTriggerService = jobTriggerService;
         this.entitySharesServiceProvider = entitySharesServiceProvider;
         this.clock = clock;
+        this.clusterEventBus = clusterEventBus;
     }
 
     /**
@@ -167,6 +171,7 @@ public EventDefinitionDto update(EventDefinitionDto updatedEventDefinition, bool
             throw e;
         }
 
+        clusterEventBus.post(new EventDefinitionUpdated(updatedEventDefinition.id()));
         return eventDefinition;
     }
 
@@ -227,6 +232,7 @@ private boolean doDelete(String eventDefinitionId, Supplier<Boolean> deleteSuppl
         getJobDefinition(eventDefinition)
                 .ifPresent(jobDefinition -> deleteJobDefinitionAndTrigger(jobDefinition, eventDefinition));
 
+        clusterEventBus.post(new EventDefinitionDeleted(eventDefinitionId));
         LOG.debug("Deleting event definition <{}/{}>", eventDefinition.id(), eventDefinition.title());
         return deleteSupplier.get();
     }

graylog2-server/src/main/java/org/graylog/events/processor/EventDefinitionUpdated.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2020 Graylog, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Server Side Public License, version 1,
+ * as published by MongoDB, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Server Side Public License for more details.
+ *
+ * You should have received a copy of the Server Side Public License
+ * along with this program. If not, see
+ * <http://www.mongodb.com/licensing/server-side-public-license>.
+ */
+package org.graylog.events.processor;
+
+public record EventDefinitionUpdated(String eventDefinitionId) {
+}

graylog2-server/src/test/java/org/graylog/events/contentpack/facade/EventDefinitionFacadeTest.java

@@ -70,6 +70,7 @@
 import org.graylog2.database.entities.DefaultEntityScope;
 import org.graylog2.database.entities.EntityScope;
 import org.graylog2.database.entities.EntityScopeService;
+import org.graylog2.events.ClusterEventBus;
 import org.graylog2.plugin.PluginMetaData;
 import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.security.PasswordAlgorithmFactory;
@@ -137,6 +138,8 @@ public class EventDefinitionFacadeTest {
     private EntityRegistrar entityRegistrar;
     @Mock
     private EventProcessorConfig mockEventProcessorConfig;
+    @Mock
+    private ClusterEventBus clusterEventBus;
 
     @Before
     @SuppressForbidden("Using Executors.newSingleThreadExecutor() is okay in tests")
@@ -155,7 +158,7 @@ public void setUp() throws Exception {
         jobSchedulerClock = mock(JobSchedulerClock.class);
         final MongoCollections mongoCollections = new MongoCollections(mapperProvider, mongodb.mongoConnection());
         eventDefinitionService = new DBEventDefinitionService(mongoCollections, stateService, entityRegistrar, new EntityScopeService(ENTITY_SCOPES), new IgnoreSearchFilters());
-        eventDefinitionHandler = new EventDefinitionHandler(eventDefinitionService, jobDefinitionService, jobTriggerService, mock(Provider.class), jobSchedulerClock);
+        eventDefinitionHandler = new EventDefinitionHandler(eventDefinitionService, jobDefinitionService, jobTriggerService, mock(Provider.class), jobSchedulerClock, clusterEventBus);
         Set<PluginMetaData> pluginMetaData = new HashSet<>();
         facade = new EventDefinitionFacade(objectMapper, eventDefinitionHandler, pluginMetaData, jobDefinitionService, eventDefinitionService, userService, entityRegistrar);
     }

graylog2-server/src/test/java/org/graylog/events/legacy/LegacyAlertConditionMigratorTest.java

@@ -58,6 +58,7 @@
 import org.graylog2.database.entities.DefaultEntityScope;
 import org.graylog2.database.entities.EntityScope;
 import org.graylog2.database.entities.EntityScopeService;
+import org.graylog2.events.ClusterEventBus;
 import org.graylog2.plugin.system.SimpleNodeId;
 import org.graylog2.shared.bindings.providers.ObjectMapperProvider;
 import org.graylog2.shared.users.UserService;
@@ -137,7 +138,7 @@ public void setUp() throws Exception {
         final DBJobTriggerService jobTriggerService = new DBJobTriggerService(mongoCollections, new SimpleNodeId("5ca1ab1e-0000-4000-a000-000000000000"), clock, schedulerCapabilitiesService, Duration.minutes(5));
         notificationService = new DBNotificationService(mongoCollections, mock(EntityRegistrar.class));
         this.eventDefinitionService = new DBEventDefinitionService(mongoCollections, mock(DBEventProcessorStateService.class), mock(EntityRegistrar.class), new EntityScopeService(ENTITY_SCOPES), new IgnoreSearchFilters());
-        this.eventDefinitionHandler = spy(new EventDefinitionHandler(eventDefinitionService, jobDefinitionService, jobTriggerService, mock(Provider.class), clock));
+        this.eventDefinitionHandler = spy(new EventDefinitionHandler(eventDefinitionService, jobDefinitionService, jobTriggerService, mock(Provider.class), clock, mock(ClusterEventBus.class)));
         this.notificationResourceHandler = spy(new NotificationResourceHandler(notificationService, jobDefinitionService, eventDefinitionService, eventNotificationFactories));
         this.userService = mock(UserService.class);
         when(userService.getRootUser()).thenReturn(Optional.empty());

graylog2-server/src/test/java/org/graylog/events/processor/EventDefinitionHandlerTest.java

@@ -44,6 +44,7 @@
 import org.graylog2.database.entities.DefaultEntityScope;
 import org.graylog2.database.entities.EntityScope;
 import org.graylog2.database.entities.EntityScopeService;
+import org.graylog2.events.ClusterEventBus;
 import org.graylog2.plugin.database.users.User;
 import org.graylog2.plugin.indexer.searches.timeranges.TimeRange;
 import org.graylog2.plugin.system.NodeId;
@@ -71,6 +72,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class EventDefinitionHandlerTest {
@@ -89,6 +92,8 @@ public class EventDefinitionHandlerTest {
 
     @Mock
     private SchedulerCapabilitiesService schedulerCapabilitiesService;
+    @Mock
+    private ClusterEventBus clusterEventBus;
 
     @Mock
     Provider<EntitySharesService> entitySharesServiceProvider;
@@ -119,7 +124,7 @@ public void setUp() throws Exception {
         this.jobDefinitionService = spy(new DBJobDefinitionService(new MongoCollections(mapperProvider, mongodb.mongoConnection()), mapperProvider));
         this.jobTriggerService = spy(new DBJobTriggerService(mongoCollections, nodeId, clock, schedulerCapabilitiesService, Duration.minutes(5)));
 
-        this.handler = new EventDefinitionHandler(eventDefinitionService, jobDefinitionService, jobTriggerService, entitySharesServiceProvider, clock);
+        this.handler = new EventDefinitionHandler(eventDefinitionService, jobDefinitionService, jobTriggerService, entitySharesServiceProvider, clock, clusterEventBus);
     }
 
     @Test
@@ -285,6 +290,7 @@ public void update() {
             assertThat(trigger.data()).isEmpty();
             assertThat(trigger.nextTime()).isEqualTo(clock.nowUTC());
         });
+        verify(clusterEventBus, times(1)).post(new EventDefinitionUpdated(existingDto.id()));
     }
 
     @Test
@@ -430,6 +436,7 @@ public void updateWithErrors() {
             assertThat(definition.title()).isEqualTo(existingJobDefinition.title());
             assertThat(definition.description()).isEqualTo(existingJobDefinition.description());
         });
+        verify(clusterEventBus, times(0)).post(new EventDefinitionUpdated(existingDto.id()));
     }
 
     @Test
@@ -440,6 +447,7 @@ public void delete() {
         assertThat(jobTriggerService.get("54e3deadbeefdeadbeef0002")).isPresent();
 
         assertThat(handler.delete("54e3deadbeefdeadbeef0000")).isTrue();
+        verify(clusterEventBus, times(1)).post(new EventDefinitionDeleted("54e3deadbeefdeadbeef0000"));
 
         assertThat(eventDefinitionService.get("54e3deadbeefdeadbeef0000")).isNotPresent();
         assertThat(jobDefinitionService.get("54e3deadbeefdeadbeef0001")).isNotPresent();