opensearch-project#4971 Resolving merge conflicts.

Signed-off-by: jzonthemtn <[email protected]>
jzonthemtn · Oct 2, 2024 · 3e5f0f6 · 3e5f0f6
1 parent d0abadc
commit 3e5f0f6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/osd-increment-plugin-versions.yml b/.github/workflows/osd-increment-plugin-versions.yml
@@ -41,6 +41,7 @@ jobs:
           - {repo: security-dashboards-plugin}
           - {repo: dashboards-search-relevance}
           - {repo: opensearch-dashboards-functional-test}
+          - {repo: user-behavior-insights}
         branch:
           - 1.x
           - '1.3'

diff --git a/.github/workflows/osd-release-issues.yml b/.github/workflows/osd-release-issues.yml
@@ -54,6 +54,7 @@ jobs:
           - {repo: security-dashboards-plugin}
           - {repo: dashboards-search-relevance}
           - {repo: opensearch-dashboards-functional-test}
+          - {repo: user-behavior-insights}
         release_version: ${{ fromJson(needs.list-manifest-versions.outputs.matrix) }}
     steps:
       - name: GitHub App token

diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml
@@ -238,3 +238,9 @@ components:
       - anomaly-detection
       - sql
       - ml-commons
+  - name: user-behavior-insights
+    repository: https://github.com/opensearch-project/user-behavior-insights.git
+    ref: main
+    platforms:
+      - linux
+      - windows
diff --git a/tools/vulnerability-scan/wss-scan.config b/tools/vulnerability-scan/wss-scan.config
@@ -1,4 +1,3 @@
 baseDirPath=$(pwd)
 gitBasePath=https://github.com/opensearch-project/
-gitRepos=OpenSearch,OpenSearch-Dashboards,alerting,alerting-dashboards-plugin,anomaly-detection,anomaly-detection-dashboards-plugin,asynchronous-search,common-utils,cross-cluster-replication,dashboards-reports,dashboards-visualizations,data-prepper,index-management,index-management-dashboards-plugin,job-scheduler,k-NN,opensearch-java,opensearch-js,opensearch-py,opensearch-dsl-py,performance-analyzer,performance-analyzer-rca,perftop,security,security-dashboards-plugin,sql,observability,opensearch-build,ml-commons,notifications,geospatial,dashboards-maps,neural-search,security-analytics,security-analytics-dashboards-plugin,dashboards-search-relevance,opensearch-migrations,sql-jdbc,sql-odbc,sql-cli,dashboards-query-workbench,dashboards-observability,dashboards-reporting,dashboards-notifications,opensearch-ai-flow-dashboards,dashboards-assistant,query-insights,dashboards-flow-framework,opensearch-system-templates,foundation-website,automation-app
-
+gitRepos=OpenSearch,OpenSearch-Dashboards,alerting,alerting-dashboards-plugin,anomaly-detection,anomaly-detection-dashboards-plugin,asynchronous-search,common-utils,cross-cluster-replication,dashboards-reports,dashboards-visualizations,data-prepper,index-management,index-management-dashboards-plugin,job-scheduler,k-NN,opensearch-java,opensearch-js,opensearch-py,opensearch-dsl-py,performance-analyzer,performance-analyzer-rca,perftop,security,security-dashboards-plugin,sql,observability,opensearch-build,ml-commons,notifications,geospatial,dashboards-maps,neural-search,security-analytics,security-analytics-dashboards-plugin,dashboards-search-relevance,opensearch-migrations,sql-jdbc,sql-odbc,sql-cli,dashboards-query-workbench,dashboards-observability,dashboards-reporting,dashboards-notifications,opensearch-ai-flow-dashboards,dashboards-assistant,query-insights,dashboards-flow-framework,opensearch-system-templates,foundation-website,automation-app,user-behavior-insights