Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "fix doc level query constructor (#651) (#682)" #735

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Revert "fix doc level query constructor (#651) (#682)" #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public FindingDto mapFindingWithDocsToFindingDto(FindingWithDocs findingWithDocs
if (docLevelQueries.isEmpty()) { // this is finding generated by a bucket level monitor
for (Map.Entry<String, String> entry : detector.getRuleIdMonitorIdMap().entrySet()) {
if(entry.getValue().equals(findingWithDocs.getFinding().getMonitorId())) {
docLevelQueries = Collections.singletonList(new DocLevelQuery(entry.getKey(),"", Collections.emptyList(),"",Collections.emptyList()));
docLevelQueries = Collections.singletonList(new DocLevelQuery(entry.getKey(),"","",Collections.emptyList()));
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/org/opensearch/securityanalytics/transport/TransportIndexDetectorAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,7 @@ private void createMonitorFromQueries(List<Pair<String, Rule>> rulesById, Detect
);
}
},
e1 -> {
log.error("Failed to index doc level monitor in detector creation", e1);
listener.onFailure(e1);
}
listener::onFailure
);
}, listener::onFailure);
} else {
Expand Down Expand Up @@ -645,7 +642,7 @@ private IndexMonitorRequest createDocLevelMonitorRequest(List<Pair<String, Rule>
tags.add(rule.getCategory());
tags.addAll(rule.getTags().stream().map(Value::getValue).collect(Collectors.toList()));

DocLevelQuery docLevelQuery = new DocLevelQuery(id, name, Collections.emptyList(), actualQuery, tags);
DocLevelQuery docLevelQuery = new DocLevelQuery(id, name, actualQuery, tags);
docLevelQueries.add(docLevelQuery);
}
DocLevelMonitorInput docLevelMonitorInput = new DocLevelMonitorInput(detector.getName(), detector.getInputs().get(0).getIndices(), docLevelQueries);
Expand Down Expand Up @@ -695,7 +692,6 @@ private IndexMonitorRequest createDocLevelMonitorMatchAllRequest(
DocLevelQuery docLevelQuery = new DocLevelQuery(
monitorName,
monitorName + "doc",
Collections.emptyList(),
actualQuery,
Collections.emptyList()
);
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/org/opensearch/securityanalytics/findings/FindingDtoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package org.opensearch.securityanalytics.findings;

import java.time.Instant;
import java.util.Collections;
import java.util.List;
import org.opensearch.commons.alerting.model.DocLevelQuery;
import org.opensearch.commons.alerting.model.FindingDocument;
Expand All @@ -28,7 +27,7 @@ public void testFindingDTO_creation() {
"findingId",
List.of("doc1", "doc2", "doc3"),
"my_index",
List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())),
List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())),
now,
List.of(findingDocument1, findingDocument2, findingDocument3)
);
Expand All @@ -37,7 +36,7 @@ public void testFindingDTO_creation() {
assertEquals("findingId", findingDto.getId());
assertEquals(List.of("doc1", "doc2", "doc3"), findingDto.getRelatedDocIds());
assertEquals("my_index", findingDto.getIndex());
assertEquals(List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())), findingDto.getDocLevelQueries());
assertEquals(List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())), findingDto.getDocLevelQueries());
assertEquals(now, findingDto.getTimestamp());
assertEquals(List.of(findingDocument1, findingDocument2, findingDocument3), findingDto.getDocuments());
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/opensearch/securityanalytics/findings/FindingServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void testGetFindings_success() {
"monitor_id1",
"monitor_name1",
"test_index1",
List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())),
List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())),
Instant.now(),
"1234"
);
Expand All @@ -100,7 +100,7 @@ public void testGetFindings_success() {
"monitor_id2",
"monitor_name2",
"test_index2",
List.of(new DocLevelQuery("1", "myQuery", Collections.emptyList(), "fieldA:valABC", List.of())),
List.of(new DocLevelQuery("1","myQuery","fieldA:valABC", List.of())),
Instant.now(),
"1234"
);
Expand Down
Loading