Merge pull request #369 from Security-Onion-Solutions/cogburn/detecti…

…on-comment-history Include Comments in Detection History
Security-Onion-Solutions · Mar 5, 2024 · 794b6a0 · 794b6a0
2 parents 0638c0c + f36614f
commit 794b6a0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/modules/elastic/elasticdetectionstore.go b/server/modules/elastic/elasticdetectionstore.go
@@ -627,7 +627,7 @@ func (store *ElasticDetectionstore) GetAllCommunitySIDs(ctx context.Context, eng
 }
 
 func (store *ElasticDetectionstore) GetDetectionHistory(ctx context.Context, detectID string) ([]interface{}, error) {
-	query := fmt.Sprintf(`_index:"%s" AND %s%s:"%s" | sortby @timestamp^`, store.auditIndex, store.schemaPrefix, AUDIT_DOC_ID, detectID)
+	query := fmt.Sprintf(`_index:"%s" AND (%s%s:"%s" OR %sdetectioncomment.detectionId:"%s") | sortby @timestamp^`, store.auditIndex, store.schemaPrefix, AUDIT_DOC_ID, detectID, store.schemaPrefix, detectID)
 	history, err := store.Query(ctx, query, store.maxAssociations)
 
 	return history, err