[AUTO] Incremented version to 2.14.1.

.github/workflows/ci.yml

@@ -36,6 +36,8 @@ jobs:
     strategy:
       matrix:
         java: [11, 17, 21]
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     name: Build and Test skills plugin on Linux
     runs-on: ubuntu-latest
     container:
@@ -87,7 +89,7 @@ jobs:
           export FC=/usr/local/Cellar/gcc/12.2.0/bin/gfortran
       - name: Run build
         run: |
-          ./gradlew build
+          ./gradlew build -Dos.arch=x86_64
 
   build-windows:
     strategy:

.github/workflows/test_security.yml

@@ -17,7 +17,8 @@ jobs:
     strategy:
       matrix:
         java: [11, 17, 21]
-
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     name: Run Security Integration Tests on Linux
     runs-on: ubuntu-latest
     needs: Get-CI-Image-Tag

build.gradle

@@ -11,7 +11,7 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
 buildscript {
     ext {
         opensearch_group = "org.opensearch"
-        opensearch_version = System.getProperty("opensearch.version", "2.13.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.18.1-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         version_tokens = opensearch_version.tokenize('-')
@@ -43,12 +43,12 @@ buildscript {
 plugins {
     id 'java-library'
     id 'com.diffplug.spotless' version '6.25.0'
-    id "io.freefair.lombok" version "8.6"
+    id "io.freefair.lombok" version "8.10.2"
     id "de.undercouch.download" version "5.6.0"
 }
 
 lombok {
-    version = "1.18.30"
+    version = "1.18.34"
 }
 
 repositories {
@@ -87,7 +87,7 @@ configurations {
     all {
         resolutionStrategy {
             force "org.mockito:mockito-core:${versions.mockito}"
-            force "com.google.guava:guava:33.0.0-jre" // CVE for 31.1
+            force "com.google.guava:guava:33.2.1-jre" // CVE for 31.1
             force("org.eclipse.platform:org.eclipse.core.runtime:3.30.0") // CVE for < 3.29.0, forces JDK17 for spotless
         }
     }
@@ -107,24 +107,24 @@ task addJarsToClasspath(type: Copy) {
     into("$buildDir/classes")
 
     from(fileTree(dir: adJarDirectory)) {
-        include "opensearch-time-series-analytics-${opensearch_build}.jar"
+        include "opensearch-anomaly-detection-${opensearch_build}.jar"
     }
     into("$buildDir/classes")
 }
 
 dependencies {
     // 3P dependencies
     compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
-    compileOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.22.0"
+    compileOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.23.1"
     compileOnly group: 'org.json', name: 'json', version: '20240205'
-    compileOnly("com.google.guava:guava:33.0.0-jre")
-    compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
+    compileOnly("com.google.guava:guava:33.2.1-jre")
+    compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: '3.16.0'
     compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.11.0'
 
     // Plugin dependencies
     compileOnly group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}"
     implementation fileTree(dir: jsJarDirectory, include: ["opensearch-job-scheduler-${opensearch_build}.jar"])
-    implementation fileTree(dir: adJarDirectory, include: ["opensearch-time-series-analytics-${opensearch_build}.jar"])
+    implementation fileTree(dir: adJarDirectory, include: ["opensearch-anomaly-detection-${opensearch_build}.jar"])
     implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-${opensearch_build}.jar", "ppl-${opensearch_build}.jar", "protocol-${opensearch_build}.jar"])
     compileOnly "org.opensearch:common-utils:${opensearch_build}"
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
@@ -145,16 +145,16 @@ dependencies {
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation group: 'org.json', name: 'json', version: '20240205'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.10.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.14.2'
     testImplementation group: 'org.mockito', name: 'mockito-inline', version: '5.2.0'
-    testImplementation("net.bytebuddy:byte-buddy:1.14.9")
-    testImplementation("net.bytebuddy:byte-buddy-agent:1.14.7")
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
-    testImplementation 'org.mockito:mockito-junit-jupiter:5.10.0'
+    testImplementation("net.bytebuddy:byte-buddy:1.15.4")
+    testImplementation("net.bytebuddy:byte-buddy-agent:1.15.4")
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.2'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.14.2'
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
     testImplementation "com.cronutils:cron-utils:9.2.1"
     testImplementation "commons-validator:commons-validator:1.8.0"
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
 }
 
 task extractSqlJar(type: Copy) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

release-notes/opensearch-skills.release-notes-2.14.0.0.md

@@ -0,0 +1,13 @@
+# 2024-04-29 Version 2.14.0.0
+
+Compatible with OpenSearch 2.14.0
+
+### Features
+* Fix filter fields, adding geo point and date_nanos (#285) (#286)
+* Change ad plugin jar dependency (#288)
+* Remove logic about replace quota for finetuning model (#289) (#291)
+* Move search index tool to ml-commons repo (#297)
+* Move visualization tool to ml-commons (#296) (#298)
+
+### Dependencies
+* Increment byte-buddy version to 1.14.9 (#288)

release-notes/opensearch-skills.release-notes-2.15.0.0.md

@@ -0,0 +1,6 @@
+# 2024-06-11 Version 2.15.0.0
+
+Compatible with OpenSearch 2.15.0
+
+### Maintenance
+Increment version to 2.15.0.0.

release-notes/opensearch-skills.release-notes-2.16.0.0.md

@@ -0,0 +1,8 @@
+# 2024-07-29 Version 2.16.0.0
+
+Compatible with OpenSearch 2.16.0
+
+### Features
+* support nested query in neural sparse tool, vectorDB tool and RAG tool ([#350](https://github.com/opensearch-project/skills/pull/350))
+* Add cluster setting to control ppl execution ([#344](https://github.com/opensearch-project/skills/pull/344))
+* Add CreateAnomalyDetectorTool ([#348](https://github.com/opensearch-project/skills/pull/348))

release-notes/opensearch-skills.release-notes-2.17.0.0.md

@@ -0,0 +1,12 @@
+# 2024-09-07 Version 2.17.0.0
+
+Compatible with OpenSearch 2.17.0
+
+### Maintenance
+update dependency org.apache.logging.log4j:log4j-slf4j-impl to v2.23.1 ([#256](https://github.com/opensearch-project/skills/pull/256))
+update dependency com.google.guava:guava to v33.2.1-jre ([#258](https://github.com/opensearch-project/skills/pull/258))
+Upgrade apache common lang version to 3.16 ([#371](https://github.com/opensearch-project/skills/pull/371))
+update dependency gradle to v8.10 ([#389](https://github.com/opensearch-project/skills/pull/389))
+update plugin io.freefair.lombok to v8.10 ([#393](https://github.com/opensearch-project/skills/pull/393))
+
+

release-notes/opensearch-skills.release-notes-2.18.0.0.md

@@ -0,0 +1,16 @@
+# 2024-10-23 Version 2.18.0.0
+
+Compatible with OpenSearch 2.18.0
+
+### Features
+Add LogPatternTool ([#413](https://github.com/opensearch-project/skills/pull/413))
+Optimize the default prompt and make prompt customizable for create anomaly detector tool ([399](https://github.com/opensearch-project/skills/pull/399))
+
+### Maintenance
+Fix test failure due to external change ([#427](https://github.com/opensearch-project/skills/pull/427))
+fix(deps): update dependency net.bytebuddy:byte-buddy-agent to v1.15.4 ([#279](https://github.com/opensearch-project/skills/pull/279))
+fix(deps): update dependency net.bytebuddy:byte-buddy to v1.15.4 ([#43](https://github.com/opensearch-project/skills/pull/43))
+fix(deps): update junit5 monorepo to v5.11.2 ([#363](https://github.com/opensearch-project/skills/pull/363))
+chore(deps): update dependency gradle to v8.10.2 ([#432](https://github.com/opensearch-project/skills/pull/432))
+chore(deps): update plugin io.freefair.lombok to v8.10.2 ([#434](https://github.com/opensearch-project/skills/pull/434))
+fix(deps): update mockito monorepo to v5.14.2 ([#437](https://github.com/opensearch-project/skills/pull/437))

src/main/java/org/opensearch/agent/ToolPlugin.java

@@ -10,6 +10,8 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import org.opensearch.agent.tools.CreateAnomalyDetectorTool;
+import org.opensearch.agent.tools.LogPatternTool;
 import org.opensearch.agent.tools.NeuralSparseSearchTool;
 import org.opensearch.agent.tools.PPLTool;
 import org.opensearch.agent.tools.RAGTool;
@@ -59,7 +61,6 @@ public Collection<Object> createComponents(
         this.client = client;
         this.clusterService = clusterService;
         this.xContentRegistry = xContentRegistry;
-
         PPLTool.Factory.getInstance().init(client);
         NeuralSparseSearchTool.Factory.getInstance().init(client, xContentRegistry);
         VectorDBTool.Factory.getInstance().init(client, xContentRegistry);
@@ -68,6 +69,8 @@ public Collection<Object> createComponents(
         SearchAnomalyDetectorsTool.Factory.getInstance().init(client, namedWriteableRegistry);
         SearchAnomalyResultsTool.Factory.getInstance().init(client, namedWriteableRegistry);
         SearchMonitorsTool.Factory.getInstance().init(client);
+        CreateAnomalyDetectorTool.Factory.getInstance().init(client);
+        LogPatternTool.Factory.getInstance().init(client, xContentRegistry);
         return Collections.emptyList();
     }
 
@@ -82,7 +85,10 @@ public List<Tool.Factory<? extends Tool>> getToolFactories() {
                 SearchAlertsTool.Factory.getInstance(),
                 SearchAnomalyDetectorsTool.Factory.getInstance(),
                 SearchAnomalyResultsTool.Factory.getInstance(),
-                SearchMonitorsTool.Factory.getInstance()
+                SearchMonitorsTool.Factory.getInstance(),
+                CreateAnomalyDetectorTool.Factory.getInstance(),
+                LogPatternTool.Factory.getInstance()
             );
     }
+
 }

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

@@ -77,7 +77,7 @@ private static Map<String, Object> processResponse(SearchHit hit) {
         return docContent;
     }
 
-    private <T> SearchRequest buildSearchRequest(Map<String, String> parameters) throws IOException {
+    protected <T> SearchRequest buildSearchRequest(Map<String, String> parameters) throws IOException {
         String question = parameters.get(INPUT_FIELD);
         if (StringUtils.isBlank(question)) {
             throw new IllegalArgumentException("[" + INPUT_FIELD + "] is null or empty, can not process it.");
@@ -89,8 +89,7 @@ private <T> SearchRequest buildSearchRequest(Map<String, String> parameters) thr
         searchSourceBuilder.parseXContent(queryParser);
         searchSourceBuilder.fetchSource(sourceFields, null);
         searchSourceBuilder.size(docSize);
-        SearchRequest searchRequest = new SearchRequest().source(searchSourceBuilder).indices(index);
-        return searchRequest;
+        return new SearchRequest().source(searchSourceBuilder).indices(parameters.getOrDefault(INDEX_FIELD, index));
     }
 
     @Override