Return remediation steps with events

Graylog2 · Jul 8, 2024 · d8c7444 · d8c7444
1 parent 79e04cb
commit d8c7444
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog/events/search/EventsSearchResult.java b/graylog2-server/src/main/java/org/graylog/events/search/EventsSearchResult.java
@@ -20,7 +20,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableMap;
+import jakarta.annotation.Nullable;
 import org.graylog.events.event.EventDto;
+import org.graylog.events.processor.EventDefinitionDto;
 
 import java.util.List;
 import java.util.Map;
@@ -109,8 +111,16 @@ public static abstract class ContextEntity {
         @JsonProperty("description")
         public abstract String description();
 
+        @Nullable
+        @JsonProperty(EventDefinitionDto.FIELD_REMEDIATION_STEPS)
+        public abstract String remediationSteps();
+
         public static ContextEntity create(String id, String title, String description) {
-            return new AutoValue_EventsSearchResult_ContextEntity(id, title, description);
+            return new AutoValue_EventsSearchResult_ContextEntity(id, title, description, null);
+        }
+
+        public static ContextEntity create(String id, String title, String description, String remediationSteps) {
+            return new AutoValue_EventsSearchResult_ContextEntity(id, title, description, remediationSteps);
         }
     }
 }
diff --git a/graylog2-server/src/main/java/org/graylog/events/search/EventsSearchService.java b/graylog2-server/src/main/java/org/graylog/events/search/EventsSearchService.java
@@ -156,6 +156,7 @@ private Map<String, EventsSearchResult.ContextEntity> lookupEventDefinitions(Set
                 .map(eventDefinitionService::get)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toMap(EventDefinitionDto::id, d -> EventsSearchResult.ContextEntity.create(d.id(), d.title(), d.description())));
+                .collect(Collectors.toMap(EventDefinitionDto::id,
+                        d -> EventsSearchResult.ContextEntity.create(d.id(), d.title(), d.description(), d.remediationSteps())));
     }
 }