Merge pull request #2405 from ControlSystemStudio/alarm_logging_service

Adding support for searching based on alarm tree root
ControlSystemStudio · Oct 3, 2022 · 3c570e2 · 3c570e2
2 parents 8b25682 + fd017be
commit 3c570e2
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/AlarmLogSearchUtil.java b/services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/AlarmLogSearchUtil.java
@@ -63,6 +63,8 @@ public class AlarmLogSearchUtil {
     private static final String STARTTIME = "start";
     private static final String ENDTIME = "end";
 
+    private static final String ROOT = "root";
+
     private static final String CONFIG_INDEX_FORMAT = "_alarms_config";
     private static final String STATE_INDEX_FORMAT = "_alarms_state";
 
@@ -136,6 +138,25 @@ public static List<AlarmLogMessage> search(ElasticsearchClient client,
                     );
                     configSet = true;
                     break;
+                case ROOT:
+                    boolQuery.must(
+                            Query.of(b -> b.bool(s -> s.should(
+                                    Query.of(q -> q
+                                            .wildcard(WildcardQuery.of(w -> w
+                                                            .field("config").value("state:/" + parameter.getValue().strip() + "*")
+                                                    )
+                                            )
+                                    ),
+                                    Query.of(q -> q
+                                            .wildcard(WildcardQuery.of(w -> w
+                                                            .field("config").value("config:/" + parameter.getValue().strip() + "*")
+                                                    )
+                                            )
+                                    )
+                            )))
+                    );
+                    configSet = true;
+                    break;
                 case SEVERITY:
                     if (!parameter.getValue().equalsIgnoreCase("*"))
                         boolQuery.must(WildcardQuery.of(w -> w