clean up

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

Author: jackiehanyang

gradle.properties

@@ -27,4 +27,4 @@ systemProp.org.gradle.warning.mode=fail
 systemProp.jdk.tls.client.protocols=TLSv1.2
 
 # jvm args for faster test execution by default
-systemProp.tests.jvm.argline=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m
+systemProp.tests.jvm.argline=-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m

gradle/wrapper/gradle-wrapper.properties

@@ -4,4 +4,4 @@ distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

src/main/java/org/opensearch/ad/indices/ADIndexManagement.java

@@ -19,7 +19,6 @@
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.ANOMALY_DETECTION_STATE_INDEX_MAPPING_FILE;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.ANOMALY_RESULTS_INDEX_MAPPING_FILE;
 import static org.opensearch.ad.settings.AnomalyDetectorSettings.CHECKPOINT_INDEX_MAPPING_FILE;
-import static org.opensearch.ad.settings.AnomalyDetectorSettings.FLATTENED_ANOMALY_RESULTS_INDEX_MAPPING_FILE;
 
 import java.io.IOException;
 import java.util.EnumMap;

src/main/java/org/opensearch/timeseries/indices/IndexManagement.java

@@ -273,6 +273,12 @@ protected static String getMappings(String mappingFileRelativePath) throws IOExc
         return Resources.toString(url, Charsets.UTF_8);
     }
 
+    public static String getScripts(String scriptFileRelativePath) throws IOException {
+        URL url = IndexManagement.class.getClassLoader().getResource(scriptFileRelativePath);
+        return Resources.toString(url, Charsets.UTF_8);
+    }
+
+
     protected void choosePrimaryShards(CreateIndexRequest request, boolean hiddenIndex) {
         request
             .settings(

src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java

@@ -289,4 +289,6 @@ public class TimeSeriesSettings {
 
     // max entities to track per detector
     public static final int MAX_TRACKING_ENTITIES = 1000000;
+
+    public static final String FLATTEN_CUSTOM_RESULT_INDEX_PAINLESS = "scripts/flatten-custom-result-index-painless.txt";
 }

src/main/java/org/opensearch/timeseries/settings/TimeSeriesSettings.java

@@ -26,7 +26,6 @@
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.client.Client;
-import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.io.stream.Writeable;

src/main/java/org/opensearch/timeseries/transport/ResultBulkTransportAction.java

@@ -0,0 +1,67 @@
+// Create a map to store the relationship between feature_id and feature_name from feature_data
+def featureNameMap = [:];
+
+// Populate the map from feature_data
+if (ctx.containsKey('feature_data') && ctx.feature_data != null) {
+    for (int i = 0; i < ctx.feature_data.length; i++) {
+        def feature = ctx.feature_data[i];
+        if (feature != null && feature.containsKey('feature_id') && feature.containsKey('feature_name')) {
+            featureNameMap[feature.feature_id] = feature.feature_name;
+            ctx['feature_data_' + feature.feature_name] = feature.data; // Flatten feature_data as before
+        }
+    }
+}
+
+// Flatten nested entity field
+if (ctx.containsKey('entity') && ctx.entity != null) {
+    for (int i = 0; i < ctx.entity.length; i++) {
+        def entity = ctx.entity[i];
+        if (entity != null && entity.containsKey('name') && entity.containsKey('value')) {
+            ctx['entity_' + entity.name] = entity.value;
+        }
+    }
+}
+
+// Flatten nested relevant_attribution field
+if (ctx.containsKey('relevant_attribution') && ctx.relevant_attribution != null) {
+    for (int i = 0; i < ctx.relevant_attribution.length; i++) {
+        def attribution = ctx.relevant_attribution[i];
+        if (attribution != null && attribution.containsKey('feature_id') && attribution.containsKey('data')) {
+            def featureName = featureNameMap[attribution.feature_id];
+            if (featureName != null) {
+                ctx['relevant_attribution_' + featureName] = attribution.data;
+            }
+        }
+    }
+}
+
+// Flatten nested expected_values field
+if (ctx.containsKey('expected_values') && ctx.expected_values != null) {
+    for (int i = 0; i < ctx.expected_values.length; i++) {
+        def expected = ctx.expected_values[i];
+        if (expected != null && expected.containsKey('value_list') && expected.value_list != null) {
+            for (int j = 0; j < expected.value_list.length; j++) {
+                def value = expected.value_list[j];
+                if (value != null && value.containsKey('feature_id') && value.containsKey('data')) {
+                    def featureName = featureNameMap[value.feature_id];
+                    if (featureName != null) {
+                        ctx['expected_values_' + featureName] = value.data;
+                    }
+                }
+            }
+        }
+    }
+}
+
+// Flatten nested past_values field
+if (ctx.containsKey('past_values') && ctx.past_values != null) {
+    for (int i = 0; i < ctx.past_values.length; i++) {
+        def pastValue = ctx.past_values[i];
+        if (pastValue != null && pastValue.containsKey('feature_id') && pastValue.containsKey('data')) {
+            def featureName = featureNameMap[pastValue.feature_id];
+            if (featureName != null) {
+                ctx['past_value_' + featureName] = pastValue.data;
+            }
+        }
+    }
+}