[Backport 2.x] Include more return values for SearchAnomalyDetectorsT…

…ool and SearchMonitorsTool (#145)

* Include more return values for SearchAnomalyDetectorsTool and SearchMonitorsTool (#143)

Signed-off-by: Tyler Ohlsen <[email protected]>

* 2.x changes

Signed-off-by: Tyler Ohlsen <[email protected]>

---------

Signed-off-by: Tyler Ohlsen <[email protected]>

src/main/java/org/opensearch/agent/tools/SearchAlertsTool.java

@@ -33,7 +33,7 @@
 public class SearchAlertsTool implements Tool {
     public static final String TYPE = "SearchAlertsTool";
     private static final String DEFAULT_DESCRIPTION =
-        "This is a tool that finds alert trigger information. It takes 12 optional argument named sortOrder which defines the order of the results (options are asc or desc, and default is asc), and sortString which defines how to sort the results (default is monitor_name.keyword), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0), and searchString which defines the search string to use for searching a specific alert (default is an empty String), and severityLevel which defines the severity level to filter for (default is ALL), and alertState which defines the alert state to filter for (default is ALL), and monitorId which defines the monitor ID to filter for, and alertIndex which defines the alert index to search from (default is null), and monitorIds which defines the list of monitor IDs to filter for, and workflowIds which defines the list of workflow IDs to filter for（default is null), and alertIds which defines the list of alert IDs to filter for (default is null). The tool returns a list of alerts, and the total number of alerts.";
+        "This is a tool that finds alert trigger information. It takes 12 optional argument named sortOrder which defines the order of the results (options are asc or desc, and default is asc), and sortString which defines how to sort the results (default is monitor_name.keyword), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0), and searchString which defines the search string to use for searching a specific alert (default is an empty String), and severityLevel which defines the severity level to filter for (default is ALL), and alertState which defines the alert state to filter for (default is ALL), and monitorId which defines the monitor ID to filter for, and alertIndex which defines the alert index to search from (default is null), and monitorIds which defines the list of monitor IDs to filter for, and workflowIds which defines the list of workflow IDs to filter for（default is null), and alertIds which defines the list of alert IDs to filter for (default is null). The tool returns 2 values: a list of alerts (each containining id, version, schema version, monitor ID, workflow ID, workflow name, monitor name, monitor version, monitor user, trigger ID, trigger name, finding IDs, related doc IDs, state, start time, end time, last notifcation time, acknowledged time, error message, error history, severity, action execution results, aggregation result bucket, execution ID, associated alert IDs), and the total number of alerts.";
 
     @Setter
     @Getter

src/main/java/org/opensearch/agent/tools/SearchAnomalyDetectorsTool.java

@@ -49,7 +49,7 @@
 public class SearchAnomalyDetectorsTool implements Tool {
     public static final String TYPE = "SearchAnomalyDetectorsTool";
     private static final String DEFAULT_DESCRIPTION =
-        "This is a tool that searches anomaly detectors. It takes 12 optional arguments named detectorName which is the explicit name of the monitor (default is null), and detectorNamePattern which is a wildcard query to match detector name (default is null), and indices which defines the index being detected (default is null), and highCardinality which defines whether the anomaly detector is high cardinality (default is null), and lastUpdateTime which defines the latest update time of the anomaly detector (default is null), and sortOrder which defines the order of the results (options are asc or desc, and default is asc), and sortString which defines how to sort the results (default is name.keyword), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0), and running which defines whether the anomaly detector is running (default is null, indicating both), and disabled which defines whether the anomaly detector is disabled (default is null, indicating both), and failed which defines whether the anomaly detector has failed (default is null, indicating both). The tool returns the list of anomaly detectors, and the total number of anomaly detectors.";
+        "This is a tool that searches anomaly detectors. It takes 12 optional arguments named detectorName which is the explicit name of the monitor (default is null), and detectorNamePattern which is a wildcard query to match detector name (default is null), and indices which defines the index being detected (default is null), and highCardinality which defines whether the anomaly detector is high cardinality (default is null), and lastUpdateTime which defines the latest update time of the anomaly detector (default is null), and sortOrder which defines the order of the results (options are asc or desc, and default is asc), and sortString which defines how to sort the results (default is name.keyword), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0), and running which defines whether the anomaly detector is running (default is null, indicating both), and disabled which defines whether the anomaly detector is disabled (default is null, indicating both), and failed which defines whether the anomaly detector has failed (default is null, indicating both). The tool returns 2 values: a list of anomaly detectors (each containing the id, name, type, description, index, last update time), and the total number of anomaly results.";
 
     @Setter
     @Getter
@@ -244,7 +244,11 @@ private <T> void processHits(Map<String, SearchHit> hitsAsMap, ActionListener<T>
         for (SearchHit hit : hitsAsMap.values()) {
             sb.append("{");
             sb.append("id=").append(hit.getId()).append(",");
-            sb.append("name=").append(hit.getSourceAsMap().get("name"));
+            sb.append("name=").append(hit.getSourceAsMap().get("name")).append(",");
+            sb.append("type=").append(hit.getSourceAsMap().get("type")).append(",");
+            sb.append("description=").append(hit.getSourceAsMap().get("description")).append(",");
+            sb.append("index=").append(hit.getSourceAsMap().get("indices")).append(",");
+            sb.append("lastUpdateTime=").append(hit.getSourceAsMap().get("last_update_time"));
             sb.append("}");
         }
         sb.append("]");

src/main/java/org/opensearch/agent/tools/SearchAnomalyResultsTool.java

@@ -40,7 +40,7 @@
 public class SearchAnomalyResultsTool implements Tool {
     public static final String TYPE = "SearchAnomalyResultsTool";
     private static final String DEFAULT_DESCRIPTION =
-        "This is a tool that searches anomaly results. It takes 9 arguments named detectorId which defines the detector ID to filter for (default is null), and realtime which defines whether the anomaly is real time, and anomalyGradeThreshold which defines the threshold for anomaly grade (a number between 0 and 1 that indicates how anomalous a data point is) (default is 0), and dataStartTime which defines the start time of the anomaly query (default is null), and dataEndTime which defines the end time of the anomaly query (default is null), and sortOrder which defines the order of the results (options are asc or desc, and default is desc), and sortString which which defines how to sort the results (default is data_start_time), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0). The tool returns a list of anomaly results, and the total number of anomaly result.";
+        "This is a tool that searches anomaly results. It takes 9 arguments named detectorId which defines the detector ID to filter for (default is null), and realtime which defines whether the anomaly is real time, and anomalyGradeThreshold which defines the threshold for anomaly grade (a number between 0 and 1 that indicates how anomalous a data point is) (default is 0), and dataStartTime which defines the start time of the anomaly query (default is null), and dataEndTime which defines the end time of the anomaly query (default is null), and sortOrder which defines the order of the results (options are asc or desc, and default is desc), and sortString which which defines how to sort the results (default is data_start_time), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0). The tool returns 2 values: a list of anomaly results (where each result contains the detector ID, the anomaly grade, and the confidence), and the total number of anomaly results.";
 
     @Setter
     @Getter

src/main/java/org/opensearch/agent/tools/SearchMonitorsTool.java

@@ -49,8 +49,7 @@
 public class SearchMonitorsTool implements Tool {
     public static final String TYPE = "SearchMonitorsTool";
     private static final String DEFAULT_DESCRIPTION =
-        "This is a tool that searches alerting monitors. It takes 10 optional arguments named monitorId which defines the monitor ID to filter for (default is null), and monitorName which defines explicit name of the monitor (default is null), and monitorNamePattern which is a wildcard query to match detector name (default is null), and enabled which defines whether the monitor is enabled (default is null, indicating both), and hasTriggers which defines whether the monitor has triggers enabled (default is null, indicating both), and indices which defines the index being monitored (default is null), and sortOrder which defines the order of the results (options are asc or desc, and default is asc), and sortString which defines how to sort the results (default is name.keyword), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0). The tool returns a list of monitors, and the total number of monitors.";
-
+        "This is a tool that searches alerting monitors. It takes 10 optional arguments named monitorId which defines the monitor ID to filter for (default is null), and monitorName which defines explicit name of the monitor (default is null), and monitorNamePattern which is a wildcard query to match detector name (default is null), and enabled which defines whether the monitor is enabled (default is null, indicating both), and hasTriggers which defines whether the monitor has triggers enabled (default is null, indicating both), and indices which defines the index being monitored (default is null), and sortOrder which defines the order of the results (options are asc or desc, and default is asc), and sortString which defines how to sort the results (default is name.keyword), and size which defines the size of the request to be returned (default is 20), and startIndex which defines the index to start from (default is 0).  The tool returns 2 values: a list of alerting monitors (each containining ID, name, type, enabled, enabled time, last update time), and the total number of monitors.";
     @Setter
     @Getter
     private String name = TYPE;
@@ -204,7 +203,11 @@ private <T> void processHits(Map<String, SearchHit> hitsAsMap, ActionListener<T>
         for (SearchHit hit : hitsAsMap.values()) {
             sb.append("{");
             sb.append("id=").append(hit.getId()).append(",");
-            sb.append("name=").append(hit.getSourceAsMap().get("name"));
+            sb.append("name=").append(hit.getSourceAsMap().get("name")).append(",");
+            sb.append("type=").append(hit.getSourceAsMap().get("type")).append(",");
+            sb.append("enabled=").append(hit.getSourceAsMap().get("enabled")).append(",");
+            sb.append("enabledTime=").append(hit.getSourceAsMap().get("enabled_time")).append(",");
+            sb.append("lastUpdateTime=").append(hit.getSourceAsMap().get("last_update_time"));
             sb.append("}");
         }
         sb.append("]");
@@ -218,7 +221,11 @@ private <T> void processGetMonitorHit(Monitor monitor, ActionListener<T> listene
             sb.append("Monitors=[");
             sb.append("{");
             sb.append("id=").append(monitor.getId()).append(",");
-            sb.append("name=").append(monitor.getName());
+            sb.append("name=").append(monitor.getName()).append(",");
+            sb.append("type=").append(monitor.getType()).append(",");
+            sb.append("enabled=").append(monitor.getEnabled()).append(",");
+            sb.append("enabledTime=").append(monitor.getEnabledTime().toEpochMilli()).append(",");
+            sb.append("lastUpdateTime=").append(monitor.getLastUpdateTime().toEpochMilli());
             sb.append("}]");
             sb.append("TotalMonitors=1");
         } else {