[backport to 2.x] rebase main (#1180)

* rebase main Signed-off-by: Kaituo Li <[email protected]> * rebase main Signed-off-by: Kaituo Li <[email protected]> --------- Signed-off-by: Kaituo Li <[email protected]>
opensearch-project · Mar 27, 2024 · f0dd4e6 · f0dd4e6
1 parent 976846d
commit f0dd4e6
Show file tree

Hide file tree

Showing 497 changed files with 16,834 additions and 11,708 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/anomaly-detection
+* @jmazanec15 @jngz-es @kaituo @saratvemulapalli @ohltyler @vamshin @VijayanB @ylwu-amzn @amitgalitz @sudiptoguha @jackiehanyang @sean-zheng-amazon @dbwiddis @owaiskazi19 @joshpalis
+
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: GitHub App token
         id: github_app_token
-        uses: tibdex/github-app-token@v2.0.0
+        uses: tibdex/github-app-token@v2.1.0
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   backport:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -15,7 +16,7 @@ jobs:
     steps:
       - name: GitHub App token
         id: github_app_token
-        uses: tibdex/github-app-token@v2.0.0
+        uses: tibdex/github-app-token@v2.1.0
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
@@ -25,4 +26,5 @@ jobs:
         uses: VachaShah/[email protected]
         with:
           github_token: ${{ steps.github_app_token.outputs.token }}
-          branch_name: backport/backport-${{ github.event.number }}
+          head_template: backport/backport-<%= number %>-to-<%= base %>
+          failure_labels: backport-failed
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: GitHub App token
         id: github_app_token
-        uses: tibdex/github-app-token@v2.0.0
+        uses: tibdex/github-app-token@v2.1.0
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}

diff --git a/.github/workflows/test_build_multi_platform.yml b/.github/workflows/test_build_multi_platform.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Build and Run Tests
         run: |
-          ./gradlew build
+          ./gradlew build -x spotlessJava
       - name: Publish to Maven Local
         run: |
           ./gradlew publishToMavenLocal
@@ -91,7 +91,7 @@ jobs:
         run: |
           chown -R 1000:1000 `pwd`
           su `id -un 1000` -c "./gradlew assemble &&
-                               ./gradlew build &&
+                               ./gradlew build -x spotlessJava &&
                                ./gradlew publishToMavenLocal &&
                                ./gradlew integTest -PnumNodes=3"
       - name: Upload Coverage Report
@@ -127,7 +127,7 @@ jobs:
           ./gradlew assemble
       - name: Build and Run Tests
         run: |
-          ./gradlew build -Dtest.logs=true
+          ./gradlew build -x spotlessJava
       - name: Publish to Maven Local
         run: |
           ./gradlew publishToMavenLocal

diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
@@ -16,8 +16,6 @@ jobs:
 
     name: Security test workflow for Anomaly Detection
     runs-on: ubuntu-latest
-    env:
-      JENKINS_URL: build.ci.opensearch.org
 
     steps:
       - name: Setup Java ${{ matrix.java }}
@@ -26,22 +24,22 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      # anomaly-detection
+      # time-series-analytics
       - name: Checkout AD
         uses: actions/checkout@v4
 
       - name: Build Anomaly Detection
         run: |
           ./gradlew assemble
       # example of variables:
-      # plugin = opensearch-anomaly-detection-2.4.0.0-SNAPSHOT.zip
-      # version = 2.4.0, plugin_version = 2.4.0.0, qualifier = SNAPSHOT
+      # plugin = opensearch-time-series-analytics-2.10.0.0-SNAPSHOT.zip
+      # version = 2.10.0, plugin_version = 2.10.0.0, qualifier = SNAPSHOT
       - name: Pull and Run Docker
         run: |
           plugin=`basename $(ls build/distributions/*.zip)`
-          version=`echo $plugin|awk -F- '{print $4}'| cut -d. -f 1-3`
-          plugin_version=`echo $plugin|awk -F- '{print $4}'| cut -d. -f 1-4`
-          qualifier=`echo $plugin|awk -F- '{print $5}'| cut -d. -f 1-1`
+          version=`echo $plugin|awk -F- '{print $5}'| cut -d. -f 1-3`
+          plugin_version=`echo $plugin|awk -F- '{print $5}'| cut -d. -f 1-4`
+          qualifier=`echo $plugin|awk -F- '{print $6}'| cut -d. -f 1-1`
 
           if $qualifier!=SNAPSHOT
           then
@@ -57,6 +55,7 @@ jobs:
           then
             echo "FROM opensearchstaging/opensearch:$docker_version" >> Dockerfile
             echo "RUN if [ -d /usr/share/opensearch/plugins/opensearch-anomaly-detection ]; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-anomaly-detection; fi" >> Dockerfile
+            echo "RUN if [ -d /usr/share/opensearch/plugins/opensearch-time-series-analytics ]; then /usr/share/opensearch/bin/opensearch-plugin remove opensearch-time-series-analytics; fi" >> Dockerfile
             echo "ADD anomaly-detection/build/distributions/$plugin /tmp/" >> Dockerfile
             echo "RUN /usr/share/opensearch/bin/opensearch-plugin install --batch file:/tmp/$plugin" >> Dockerfile
             docker build -t opensearch-ad:test .

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -4,16 +4,28 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer              | GitHub ID                                               | Affiliation |
-| ----------------------- | ------------------------------------------------------- | ----------- |
-| Hanguang Zhang          | [zhanghg08](https://github.com/zhanghg08)               | Amazon      |
-| Jack Mazanec            | [jmazanec15](https://github.com/jmazanec15)             | Amazon      |
-| Jing Zhang              | [jngz-es](https://github.com/jngz-es)                   | Amazon      |
-| Kaituo Li               | [kaituo](https://github.com/kaituo)                     | Amazon      |
-| Lai Jiang               | [wnbts](https://github.com/wnbts)                       | Amazon      |
-| Sarat Vemulapalli       | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
-| Tyler Ohlsen            | [ohltyler](https://github.com/ohltyler)                 | Amazon      |
-| Vamshi Vijay Nakkirtha  | [vamshin](https://github.com/vamshin)                   | Amazon      |
-| Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)                 | Amazon      |
-| Yaliang Wu              | [ylwu-amzn](https://github.com/ylwu-amzn)               | Amazon      |
-| Yizhe Liu               | [yizheliu-amazon](https://github.com/yizheliu-amazon)   | Amazon      |
+| Maintainer              | GitHub ID                                                | Affiliation |
+| ----------------------- | ---------------------------------------------------------| ----------- |
+| Jack Mazanec            | [jmazanec15](https://github.com/jmazanec15)              | Amazon      |
+| Jing Zhang              | [jngz-es](https://github.com/jngz-es)                    | Amazon      |
+| Kaituo Li               | [kaituo](https://github.com/kaituo)                      | Amazon      |
+| Sarat Vemulapalli       | [saratvemulapalli](https://github.com/saratvemulapalli)  | Amazon      |
+| Tyler Ohlsen            | [ohltyler](https://github.com/ohltyler)                  | Amazon      |
+| Vamshi Vijay Nakkirtha  | [vamshin](https://github.com/vamshin)                    | Amazon      |
+| Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)                  | Amazon      |
+| Yaliang Wu              | [ylwu-amzn](https://github.com/ylwu-amzn)                | Amazon      |
+| Amit Galitzky           | [amitgalitz](https://github.com/amitgalitz)              | Amazon      |
+| Sudipto Guha            | [sudiptoguha](https://github.com/sudiptoguha)            | Amazon      |
+| Jackie Han              | [jackiehanyang](https://github.com/jackiehanyang)        | Amazon      |
+| Sean Zheng              | [sean-zheng-amazon](https://github.com/sean-zheng-amazon)| Amazon      |
+| Dan Widdis              | [dbwiddis](https://github.com/dbwiddis)                  | Amazon      |
+| Owais Kazi              | [owaiskazi19](https://github.com/owaiskazi19)            | Amazon      |
+| Josh Palis              | [joshpalis](https://github.com/joshpalis)                | Amazon      |
+
+## Emeritus
+
+| Maintainer     | GitHub ID                                             | Affiliation |
+| -------------- | ----------------------------------------------------- | ----------- |
+| Hanguang Zhang | [zhanghg08](https://github.com/zhanghg08)             | Amazon      |
+| Yizhe Liu      | [yizheliu-amazon](https://github.com/yizheliu-amazon) | Amazon      |
+| Lai Jiang      | [wnbts](https://github.com/wnbts)                     | Amazon      |