From 20710d410daed3e2aaee0ba284a8252d9c087e33 Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Thu, 15 Dec 2022 13:51:55 -0800 Subject: [PATCH 1/2] Fetch Job Details from AD extension Signed-off-by: Varun Jain --- .../java/org/opensearch/ad/AnomalyDetectorExtension.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java b/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java index 9312459ea..a4fae48a2 100644 --- a/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java +++ b/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java @@ -27,6 +27,7 @@ import org.opensearch.client.opensearch.OpenSearchClient; import org.opensearch.common.settings.Setting; import org.opensearch.common.xcontent.NamedXContentRegistry; +import org.opensearch.extensions.JobDetails; import org.opensearch.sdk.BaseExtension; import org.opensearch.sdk.ExtensionRestHandler; import org.opensearch.sdk.ExtensionsRunner; @@ -111,6 +112,12 @@ public OpenSearchClient getClient() { return client; } + // TODO: After AnomalyDetectorJob.java is uncommented, fetch jobIndex from AnomalyDetectorJob + @Override + public JobDetails getJobDetails() { + return new JobDetails(AnomalyDetectorPlugin.AD_JOB_TYPE, ".opendistro-anomaly-detector-jobs"); + } + public static void main(String[] args) throws IOException { // Execute this extension by instantiating it and passing to ExtensionsRunner ExtensionsRunner.run(new AnomalyDetectorExtension()); From 81b8dbda20205157668e0ed89c68d355f6fc5099 Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Fri, 16 Dec 2022 17:07:20 -0800 Subject: [PATCH 2/2] Commnunication Mechanism for JS --- .../org/opensearch/ad/AnomalyDetectorExtension.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java b/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java index a4fae48a2..f7b8fb0f2 100644 --- a/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java +++ b/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java @@ -27,7 +27,6 @@ import org.opensearch.client.opensearch.OpenSearchClient; import org.opensearch.common.settings.Setting; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.opensearch.extensions.JobDetails; import org.opensearch.sdk.BaseExtension; import org.opensearch.sdk.ExtensionRestHandler; import org.opensearch.sdk.ExtensionsRunner; @@ -112,10 +111,15 @@ public OpenSearchClient getClient() { return client; } - // TODO: After AnomalyDetectorJob.java is uncommented, fetch jobIndex from AnomalyDetectorJob @Override - public JobDetails getJobDetails() { - return new JobDetails(AnomalyDetectorPlugin.AD_JOB_TYPE, ".opendistro-anomaly-detector-jobs"); + public String getJobType() { + return AnomalyDetectorPlugin.AD_JOB_TYPE; + } + + // TODO After circular dependency of JS is removed and AnomalyDetectorJob is uncommented, import JobIndex from AnomalyDetectorJob.java. + @Override + public String getJobIndex() { + return ".opendistro-anomaly-detector-jobs"; } public static void main(String[] args) throws IOException {