Merge branch 'main' into log-types

opensearch-project · Apr 4, 2024 · c4a5c8b · c4a5c8b
2 parents 1bd4e66 + 801b6ec
commit c4a5c8b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -16,6 +16,7 @@ jobs:
     # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
     if: >
       github.event.pull_request.merged
+      && github.repository == 'opensearch-project/documentation-website'
       && (
         github.event.action == 'closed'
         || (
@@ -38,3 +39,12 @@ jobs:
         with:
           github_token: ${{ steps.github_app_token.outputs.token }}
           head_template: backport/backport-<%= number %>-to-<%= base %>
+
+      - name: Label new backport PR with backport-automerge label
+        run: |
+          PR_BRANCH=backport/backport-${{ github.event.pull_request.number }}-to-`echo ${{ github.event.label.name }} | cut -d ' ' -f2`
+          PR_NUMBER=`gh pr list -R opensearch-project/documentation-website --json "number,headRefName" --state open | jq -r ".[] | select(.headRefName == \"$PR_BRANCH\") | .number"`
+          echo "Update Backport PR '#$PR_NUMBER' on branch '$PR_BRANCH' with 'backport-automerge' label"
+          gh issue edit -R opensearch-project/documentation-website $PR_NUMBER --add-label backport-automerge
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/delete_merged_branch.yml b/.github/workflows/delete_merged_branch.yml
@@ -8,7 +8,7 @@ jobs:
   delete-branch:
     runs-on: ubuntu-latest
     if: |
-      startsWith(github.event.pull_request.head.repo.full_name, 'opensearch-project/documentation-website') &&
+      github.repository == 'opensearch-project/documentation-website' &&
       ${{ !startsWith(github.event.pull_request.head.ref, 'main') }} &&
       ${{ !startsWith(github.event.pull_request.head.ref, '1.') }} &&
       ${{ !startsWith(github.event.pull_request.head.ref, '2.') }} &&

diff --git a/_ml-commons-plugin/agents-tools/agents-tools-tutorial.md b/_ml-commons-plugin/agents-tools/agents-tools-tutorial.md
@@ -365,10 +365,11 @@ Only superadmin users can register a hidden agent. To register a hidden agent, y
 curl -k --cert ./kirk.pem --key ./kirk-key.pem -XGET 'https://localhost:9200/.opendistro_security/_search'
 ```
 
-All agents created by a superadmin user are automatically registered as hidden. To register a hidden agent, send a request to the `_register` endpoint:
+All agents created by a superadmin user are automatically registered as hidden. Only the superadmin user can view hidden agent details and delete hidden agents.
+To register a hidden agent, send a request to the `_register` endpoint:
 
 ```bash
-curl -k --cert ./kirk.pem --key ./kirk-key.pem -X POST 'https://localhost:9200/_plugins/_ml/models/_register' -H 'Content-Type: application/json' -d '
+curl -k --cert ./kirk.pem --key ./kirk-key.pem -X POST 'https://localhost:9200/_plugins/_ml/agents/_register' -H 'Content-Type: application/json' -d '
 {
   "name": "Test_Agent_For_RAG",
   "type": "flow",