[AUTO] Incremented version to 2.13.1.

.github/workflows/ci.yml

@@ -6,6 +6,8 @@ on:
   pull_request:
     branches:
       - "*"
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
   Get-CI-Image-Tag:
@@ -57,6 +59,7 @@ jobs:
           - 11
           - 17
           - 21
+          - 23
     name: Build and Test
     runs-on: windows-latest
 

build.gradle

@@ -6,7 +6,7 @@
 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")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         kotlin_version = System.getProperty("kotlin.version", "1.8.21")

gradle/wrapper/gradle-wrapper.properties

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

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 ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

release-notes/opensearch-common-utils.release-notes-2.13.0.0.md

@@ -0,0 +1,16 @@
+## Version 2.13.0.0 2023-03-21
+
+Compatible with OpenSearch 2.13.0
+
+### Maintenance
+* Increment version to 2.13.0-SNAPSHOT ([#591](https://github.com/opensearch-project/common-utils/pull/591))
+
+### Enhancement
+* add queryFieldNames field in Doc Level Queries (#[582](https://github.com/opensearch-project/common-utils/pull/582)) (#[597](https://github.com/opensearch-project/common-utils/pull/597))
+
+# Features
+* fix findings API enhancemnts (#[611](https://github.com/opensearch-project/common-utils/pull/611)) (#[617](https://github.com/opensearch-project/common-utils/pull/617))
+* Feature findings enhancemnt (#[596](https://github.com/opensearch-project/common-utils/pull/596)) (#[606](https://github.com/opensearch-project/common-utils/pull/606))
+
+### Documentation
+* Added 2.13.0.0 release notes ([#622](https://github.com/opensearch-project/common-utils/pull/622))

release-notes/opensearch-common-utils.release-notes-2.14.0.0.md

@@ -0,0 +1,15 @@
+## Version 2.14.0.0 2024-04-30
+
+Compatible with OpenSearch 2.14.0
+
+### Maintenance
+* Increment version to 2.14.0-SNAPSHOT ([#625](https://github.com/opensearch-project/common-utils/pull/625))
+
+### Refactor
+* Obfuscate ip addresses in alert error message ([#511](https://github.com/opensearch-project/common-utils/pull/511))
+* Change doc level query name validation ([#630](https://github.com/opensearch-project/common-utils/pull/630))
+* Added validation for the new clusters field. ([#633](https://github.com/opensearch-project/common-utils/pull/633))
+* Wrapped URI syntax exception in IllegalArgument exception. ([#645](https://github.com/opensearch-project/common-utils/pull/645))
+
+### Documentation
+* Added 2.14.0.0 release notes. ([#648](https://github.com/opensearch-project/common-utils/pull/648))

release-notes/opensearch-common-utils.release-notes-2.15.0.0.md

@@ -0,0 +1,20 @@
+## Version 2.15.0.0 2024-06-10
+
+Compatible with OpenSearch 2.15.0
+
+### Maintenance
+* Increment version to 2.15.0-SNAPSHOT ([#651](https://github.com/opensearch-project/common-utils/pull/651))
+
+
+### Features
+* CorrelationAlert model added ([#631](https://github.com/opensearch-project/common-utils/pull/631), [#679](https://github.com/opensearch-project/common-utils/pull/679))
+
+### Bug Fixes
+* Bug fixes for correlation Alerts ([#670](https://github.com/opensearch-project/common-utils/pull/670), [#680](https://github.com/opensearch-project/common-utils/pull/680))
+
+### Enhancements
+* Add start_time and end_time filters to GetAlertsRequest. ([#655](https://github.com/opensearch-project/common-utils/pull/655))
+* Added new models for Alerting Comments ([#663](https://github.com/opensearch-project/common-utils/pull/663), [#671](https://github.com/opensearch-project/common-utils/pull/671), [#674](https://github.com/opensearch-project/common-utils/pull/674) [#678](https://github.com/opensearch-project/common-utils/pull/678))
+
+### Documentation
+* Added 2.15.0.0 release notes. ([#672](https://github.com/opensearch-project/common-utils/pull/672))

release-notes/opensearch-common-utils.release-notes-2.16.0.0.md

@@ -0,0 +1,12 @@
+## Version 2.16.0.0 2024-07-25
+
+Compatible with OpenSearch 2.16.0
+
+### Maintenance
+* Increment version to 2.16.0-SNAPSHOT ([#688](https://github.com/opensearch-project/common-utils/pull/688))
+
+### Enhancements
+* [Backport 2.x] Add support for remote monitors ([#694](https://github.com/opensearch-project/common-utils/pull/694))
+
+### Documentation
+* Added 2.16.0.0 release notes. ([#700](https://github.com/opensearch-project/common-utils/pull/700))

release-notes/opensearch-common-utils.release-notes-2.17.0.0.md

@@ -0,0 +1,16 @@
+## Version 2.17.0.0 2024-09-03
+
+Compatible with OpenSearch 2.17.0
+
+### Maintenance
+* Fixed Common-Utils CIs: ([#703](https://github.com/opensearch-project/common-utils/pull/703))
+
+### Bug Fixes
+* Added missing ctx variables ([#710](https://github.com/opensearch-project/common-utils/pull/710))
+* Changed the names of security actions for Alerting Comments feature ([#724](https://github.com/opensearch-project/common-utils/pull/724))
+
+### Enhancements
+* Updated pull request template to include API spec change in checklist ([#696](https://github.com/opensearch-project/common-utils/pull/696))
+
+### Documentation
+* Added 2.17.0.0 release notes ([#727](https://github.com/opensearch-project/common-utils/pull/727))

release-notes/opensearch-common-utils.release-notes-2.18.0.0.md

@@ -0,0 +1,13 @@
+## Version 2.18.0.0 2024-10-28
+
+Compatible with OpenSearch 2.18.0
+
+### Maintenance
+* Increment version to 2.18.0-SNAPSHOT ([#729](https://github.com/opensearch-project/common-utils/pull/729))
+* Update Gradle to 8.10.2 ([#746](https://github.com/opensearch-project/common-utils/pull/746))
+
+### Enhancements
+* changes to support dynamic deletion of doc-level monitor query indices ([#734](https://github.com/opensearch-project/common-utils/pull/734))
+
+### Documentation
+* Added 2.18.0.0 release notes. ([#750](https://github.com/opensearch-project/common-utils/pull/750))

src/main/kotlin/org/opensearch/commons/alerting/action/AlertingActions.kt

@@ -21,6 +21,9 @@ object AlertingActions {
     const val SUBSCRIBE_FINDINGS_ACTION_NAME = "cluster:admin/opensearch/alerting/findings/subscribe"
     const val GET_MONITOR_ACTION_NAME = "cluster:admin/opendistro/alerting/monitor/get"
     const val SEARCH_MONITORS_ACTION_NAME = "cluster:admin/opendistro/alerting/monitor/search"
+    const val INDEX_COMMENT_ACTION_NAME = "cluster:admin/opensearch/alerting/comments/write"
+    const val SEARCH_COMMENTS_ACTION_NAME = "cluster:admin/opensearch/alerting/comments/search"
+    const val DELETE_COMMENT_ACTION_NAME = "cluster:admin/opensearch/alerting/comments/delete"
 
     @JvmField
     val INDEX_MONITOR_ACTION_TYPE =
@@ -73,4 +76,16 @@ object AlertingActions {
     @JvmField
     val SEARCH_MONITORS_ACTION_TYPE =
         ActionType(SEARCH_MONITORS_ACTION_NAME, ::SearchResponse)
+
+    @JvmField
+    val INDEX_COMMENT_ACTION_TYPE =
+        ActionType(INDEX_COMMENT_ACTION_NAME, ::IndexCommentResponse)
+
+    @JvmField
+    val SEARCH_COMMENTS_ACTION_TYPE =
+        ActionType(SEARCH_COMMENTS_ACTION_NAME, ::SearchResponse)
+
+    @JvmField
+    val DELETE_COMMENT_ACTION_TYPE =
+        ActionType(DELETE_COMMENT_ACTION_NAME, ::DeleteCommentResponse)
 }

src/main/kotlin/org/opensearch/commons/alerting/action/DeleteCommentRequest.kt

@@ -0,0 +1,34 @@
+package org.opensearch.commons.alerting.action
+
+import org.opensearch.action.ActionRequest
+import org.opensearch.action.ActionRequestValidationException
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import java.io.IOException
+
+class DeleteCommentRequest : ActionRequest {
+    val commentId: String
+
+    constructor(commentId: String) : super() {
+        this.commentId = commentId
+    }
+
+    @Throws(IOException::class)
+    constructor(sin: StreamInput) : this(
+        commentId = sin.readString()
+    )
+
+    override fun validate(): ActionRequestValidationException? {
+        if (commentId.isBlank()) {
+            val exception = ActionRequestValidationException()
+            exception.addValidationError("comment id must not be blank")
+            return exception
+        }
+        return null
+    }
+
+    @Throws(IOException::class)
+    override fun writeTo(out: StreamOutput) {
+        out.writeString(commentId)
+    }
+}

src/main/kotlin/org/opensearch/commons/alerting/action/DeleteCommentResponse.kt

@@ -0,0 +1,32 @@
+package org.opensearch.commons.alerting.action
+
+import org.opensearch.commons.alerting.util.IndexUtils
+import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+
+class DeleteCommentResponse : BaseResponse {
+    var commentId: String
+
+    constructor(
+        id: String
+    ) : super() {
+        this.commentId = id
+    }
+
+    constructor(sin: StreamInput) : this(
+        sin.readString() // commentId
+    )
+
+    override fun writeTo(out: StreamOutput) {
+        out.writeString(commentId)
+    }
+
+    override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
+        return builder.startObject()
+            .field(IndexUtils._ID, commentId)
+            .endObject()
+    }
+}

src/main/kotlin/org/opensearch/commons/alerting/action/DocLevelMonitorFanOutAction.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.commons.alerting.action
+
+import org.opensearch.action.ActionType
+
+class DocLevelMonitorFanOutAction private constructor() : ActionType<DocLevelMonitorFanOutResponse>(NAME, ::DocLevelMonitorFanOutResponse) {
+    companion object {
+        val INSTANCE = DocLevelMonitorFanOutAction()
+        const val NAME = "cluster:admin/opensearch/alerting/monitor/doclevel/fanout"
+    }
+}