Merge pull request #2409 from ControlSystemStudio/alarm_logging_service

Alarm logging service

Author: shroffk

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java

@@ -22,8 +22,10 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+import static org.phoebus.applications.alarm.logging.ui.AlarmLogTableApp.logger;
 /**
  * A Job to search for alarm messages logged by the alarm logging service
  * @author Kunal Shroff
@@ -78,10 +80,17 @@ public void run(JobMonitor monitor) {
         map.putIfAbsent("size", Arrays.asList(String.valueOf(size)));
 
         try {
-            List<AlarmLogTableItem> result = objectMapper.readValue(client.path("/search/alarm")
+
+            long start = System.currentTimeMillis();
+            String resultStr =  client.path("/search/alarm")
                     .queryParams(map)
-                    .accept(MediaType.APPLICATION_JSON).get(String.class), new TypeReference<List<AlarmLogTableItem>>() {
+                    .accept(MediaType.APPLICATION_JSON).get(String.class);
+
+            logger.log(Level.FINE,"String response = " + (System.currentTimeMillis() - start));
+            start = System.currentTimeMillis();
+            List<AlarmLogTableItem> result = objectMapper.readValue(resultStr, new TypeReference<List<AlarmLogTableItem>>() {
             });
+            logger.log(Level.FINE,"Object mapper response = " + (System.currentTimeMillis() - start));
             alarmMessageHandler.accept(result);
         } catch (JsonProcessingException e) {
             errorHandler.accept("Failed to search for alarm logs ", e);

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java

@@ -307,6 +307,7 @@ public ObservableValue<String> call(CellDataFeatures<AlarmLogTableItem, String>
         tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
         searchParameters.put(Keys.PV, this.searchString);
+        searchParameters.put(Keys.ROOT, "*");
         searchParameters.put(Keys.MESSAGE, "*");
         searchParameters.put(Keys.SEVERITY, "*");
         searchParameters.put(Keys.CURRENTSEVERITY, "*");
@@ -318,14 +319,17 @@ public ObservableValue<String> call(CellDataFeatures<AlarmLogTableItem, String>
         searchParameters.put(Keys.ENDTIME, TimeParser.format(java.time.Duration.ZERO));
         advancedSearchViewController.setSearchParameters(searchParameters);
 
-        query.setText(searchParameters.entrySet().stream().sorted(Map.Entry.comparingByKey()).map((e) -> {
-            return e.getKey().getName().trim() + "=" + e.getValue().trim();
-        }).collect(Collectors.joining("&")));
+        query.setText(
+                searchParameters.entrySet().stream()
+                        .sorted(Map.Entry.comparingByKey())
+                        .map((e) -> e.getKey().getName().trim() + "=" + e.getValue().trim())
+                        .collect(Collectors.joining("&")));
 
-        searchParameters.addListener((MapChangeListener<Keys, String>) change -> query.setText(searchParameters.entrySet().stream()
-                .sorted(Entry.comparingByKey())
-                .map((e) -> e.getKey().getName().trim() + "=" + e.getValue().trim())
-                .collect(Collectors.joining("&"))));
+        searchParameters.addListener(
+                (MapChangeListener<Keys, String>) change -> query.setText(searchParameters.entrySet().stream()
+                        .sorted(Entry.comparingByKey())
+                        .map((e) -> e.getKey().getName().trim() + "=" + e.getValue().trim())
+                        .collect(Collectors.joining("&"))));
 
         query.setOnKeyPressed(keyEvent -> {
             if (keyEvent.getCode() == KeyCode.ENTER) {
@@ -384,6 +388,7 @@ public void setIsNodeTable(Boolean isNodeTable) {
         } else {
             searchParameters.put(Keys.PV, "*");
         }
+        searchParameters.put(Keys.ROOT, "*");
         searchParameters.put(Keys.MESSAGE, "*");
         searchParameters.put(Keys.SEVERITY, "*");
         searchParameters.put(Keys.CURRENTSEVERITY, "*");
@@ -479,16 +484,21 @@ public void resize() {
         }
     }
 
+    Map<String, Keys> lookup = Arrays.stream(Keys.values()).collect(Collectors.toMap(Keys::getName, k -> {
+        return k;
+    }));
+
     @FXML
     void updateQuery() {
-        Arrays.asList(query.getText().split("&")).forEach(s -> {
+        List<String> searchTerms = Arrays.asList(query.getText().split("&"));
+        searchTerms.stream().forEach(s -> {
             String key = s.split("=")[0];
-            for (Map.Entry<Keys, String> entry : searchParameters.entrySet()) {
-                if (entry.getKey().getName().equals(key)) {
-                    searchParameters.put(entry.getKey(), s.split("=")[1]);
-                }
+            String value = s.split("=")[1];
+            if(lookup.containsKey(key)) {
+                searchParameters.put(lookup.get(key), value);
             }
         });
+
     }
 
     @FXML

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableQueryUtil.java

@@ -5,6 +5,7 @@ public class AlarmLogTableQueryUtil {
     // Ordered search keys
     public enum Keys {
         PV("pv"),
+        ROOT("root"),
         SEVERITY("severity"),
         MESSAGE("message"),
         CURRENTSEVERITY("current_severity"),

services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/AlarmLogSearchUtil.java

@@ -139,23 +139,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;
+                    if (!parameter.getValue().equalsIgnoreCase("*")) {
+                        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("*"))