Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
buildscript {
ext {
opensearch_group = "org.opensearch"
opensearch_version = System.getProperty("opensearch.version", "3.4.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "3.6.1-SNAPSHOT")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
version_tokens = opensearch_version.tokenize('-')
Expand Down Expand Up @@ -139,7 +139,7 @@ dependencies {
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: "${versions.commonslang}"
compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.12.0'
compileOnly group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
compileOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
compileOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}")
compileOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
compileOnly(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "${versions.httpcore5}")
compileOnly(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: "${versions.httpclient5}")
Expand All @@ -154,18 +154,18 @@ dependencies {
compileOnly(group: 'software.amazon.awssdk', name: 'utils', version: "${versions.aws}")
compileOnly(group: 'software.amazon.awssdk', name: 'sdk-core', version: "${versions.aws}")

spark 'org.apache.spark:spark-sql-api_2.13:3.5.4'
spark ('org.apache.spark:spark-core_2.13:3.5.4') {
spark 'org.apache.spark:spark-sql-api_2.13:3.5.8'
spark ('org.apache.spark:spark-core_2.13:3.5.8') {
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
}
spark group: 'org.apache.spark', name: 'spark-common-utils_2.13', version: '3.5.4'
spark group: 'org.apache.spark', name: 'spark-common-utils_2.13', version: '3.5.8'

implementation 'org.scala-lang:scala-library:2.13.9'
implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.3'
implementation("org.json4s:json4s-ast_2.13:3.7.0-M11")
implementation("org.json4s:json4s-core_2.13:3.7.0-M11")
implementation("org.json4s:json4s-jackson_2.13:3.7.0-M11")
implementation 'com.fasterxml.jackson.module:jackson-module-scala_3:2.18.2'
implementation "com.fasterxml.jackson.module:jackson-module-scala_3:${versions.jackson}"
implementation group: 'org.scala-lang', name: 'scala3-library_3', version: '3.7.0-RC1-bin-20250119-bd699fc-NIGHTLY'
implementation("com.thoughtworks.paranamer:paranamer:2.8")
implementation("org.jsoup:jsoup:1.19.1")
Expand All @@ -175,7 +175,7 @@ dependencies {
compileOnly group: 'org.opensearch', name:'opensearch-ml-spi', version: "${opensearch_build}"
compileOnly fileTree(dir: jsJarDirectory, include: ["opensearch-job-scheduler-${opensearch_build}.jar"])
implementation fileTree(dir: adJarDirectory, include: ["opensearch-anomaly-detection-${opensearch_build}.jar"])
implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-thin-${opensearch_build}.jar", "ppl-${opensearch_build}.jar", "protocol-${opensearch_build}.jar"])
implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-thin-${opensearch_build}.jar", "ppl-${opensearch_build}.jar", "protocol-${opensearch_build}.jar", "core-${opensearch_build}.jar"])
implementation fileTree(dir: sparkDir, include: ["spark*.jar"])
compileOnly "org.opensearch:common-utils:${opensearch_build}"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
Expand Down Expand Up @@ -217,9 +217,9 @@ task addSparkJar(type: Copy) {
into sparkDir

doLast {
def jarA = file("$sparkDir/spark-sql-api_2.13-3.5.4.jar")
def jarB = file("$sparkDir/spark-core_2.13-3.5.4.jar")
def jarC = file("$sparkDir/spark-common-utils_2.13-3.5.4.jar")
def jarA = file("$sparkDir/spark-sql-api_2.13-3.5.8.jar")
def jarB = file("$sparkDir/spark-core_2.13-3.5.8.jar")
def jarC = file("$sparkDir/spark-common-utils_2.13-3.5.8.jar")

// 3a. Extract jar A to manipulate it
def jarAContents = file("$buildDir/tmp/JarAContents")
Expand Down
17 changes: 17 additions & 0 deletions release-notes/opensearch-skills.release-notes-3.6.0.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## Version 3.6.0 Release Notes

Compatible with OpenSearch and OpenSearch Dashboards version 3.6.0

### Features

* Add SearchAroundTool to search N documents around a given document ([#702](https://github.com/opensearch-project/skills/pull/702))
* Add MetricChangeAnalysisTool for detecting and analyzing metric changes via percentile comparison between baseline and selection periods ([#698](https://github.com/opensearch-project/skills/pull/698))

### Enhancements

* Add filter support for LogPatternAnalysisTool to enable log pattern analysis for specific services ([#707](https://github.com/opensearch-project/skills/pull/707))
* Update default tool descriptions for LogPatternAnalysisTool and DataDistributionTool to improve clarity for LLM usage ([#703](https://github.com/opensearch-project/skills/pull/703))

### Maintenance

* Update Apache Spark dependencies (spark-common-utils_2.13) from 3.5.4 to 3.5.8 ([#713](https://github.com/opensearch-project/skills/pull/713))
8 changes: 7 additions & 1 deletion src/main/java/org/opensearch/agent/ToolPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
import org.opensearch.agent.tools.DataDistributionTool;
import org.opensearch.agent.tools.LogPatternAnalysisTool;
import org.opensearch.agent.tools.LogPatternTool;
import org.opensearch.agent.tools.MetricChangeAnalysisTool;
import org.opensearch.agent.tools.NeuralSparseSearchTool;
import org.opensearch.agent.tools.PPLTool;
import org.opensearch.agent.tools.RAGTool;
import org.opensearch.agent.tools.SearchAlertsTool;
import org.opensearch.agent.tools.SearchAnomalyDetectorsTool;
import org.opensearch.agent.tools.SearchAnomalyResultsTool;
import org.opensearch.agent.tools.SearchAroundDocumentTool;
import org.opensearch.agent.tools.SearchMonitorsTool;
import org.opensearch.agent.tools.VectorDBTool;
import org.opensearch.agent.tools.WebSearchTool;
Expand Down Expand Up @@ -102,6 +104,8 @@ public Collection<Object> createComponents(
WebSearchTool.Factory.getInstance().init(threadPool);
LogPatternAnalysisTool.Factory.getInstance().init(client);
DataDistributionTool.Factory.getInstance().init(client);
SearchAroundDocumentTool.Factory.getInstance().init(client, xContentRegistry);
MetricChangeAnalysisTool.Factory.getInstance().init(client);
return Collections.emptyList();
}

Expand All @@ -122,7 +126,9 @@ public List<Tool.Factory<? extends Tool>> getToolFactories() {
LogPatternTool.Factory.getInstance(),
WebSearchTool.Factory.getInstance(),
LogPatternAnalysisTool.Factory.getInstance(),
DataDistributionTool.Factory.getInstance()
DataDistributionTool.Factory.getInstance(),
SearchAroundDocumentTool.Factory.getInstance(),
MetricChangeAnalysisTool.Factory.getInstance()
);
}

Expand Down
Loading
Loading