Merge remote-tracking branch 'upstream/main' into update-meta-os

peterzhuamazon · peterzhuamazon · commit de07b1cd648c · 2025-11-03T15:36:05.000-05:00
Signed-off-by: Peter Zhu &lt;zhujiaxi@amazon.com&gt;
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @dblock @saratvemulapalli @tlfeng @VachaShah @ohltyler
+* @saratvemulapalli @VachaShah @ohltyler
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,5 @@
 /ml-commons/
 /geospatial/
 /opensearch-oci-object-storage/
+/search-relevance/
 .DS_Store
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -6,8 +6,13 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 | Maintainer         | GitHub ID                                               | Affiliation |
 | ------------------ | ------------------------------------------------------- | ----------- |
-| Daniel Doubrovkine | [dblock](https://github.com/dblock)                     | Independent |
 | Sarat Vemulapalli  | [saratvemulapalli](https://github.com/saratvemulapalli) | Amazon      |
-| Tianli Feng        | [tlfeng](https://github.com/tlfeng)                     | Amazon      |
 | Tyler Ohlsen       | [ohltyler](https://github.com/ohltyler)                 | Amazon      |
 | Vacha Shah         | [VachaShah](https://github.com/vachashah)               | Amazon      |
+
+## Emeritus
+
+| Maintainer         | GitHub ID                                               | Affiliation |
+| ------------------ | ------------------------------------------------------- | ----------- |
+| Daniel Doubrovkine | [dblock](https://github.com/dblock)                     | Independent |
+| Tianli Feng        | [tlfeng](https://github.com/tlfeng)                     | Amazon      |
diff --git a/WORKFLOWS.md b/WORKFLOWS.md
@@ -99,8 +99,8 @@ In order to onboard, follow the below steps:
             name = "Snapshots"
             url = "https://aws.oss.sonatype.org/content/repositories/snapshots"
             credentials {
-                username "$System.env.SONATYPE_USERNAME"
-                password "$System.env.SONATYPE_PASSWORD"
+                username System.getenv("SONATYPE_USERNAME")
+                password System.getenv("SONATYPE_PASSWORD")
             }
         }
     }
diff --git a/dashboards-plugins/.gitignore b/dashboards-plugins/.gitignore
@@ -13,3 +13,4 @@ securityAnalyticsDashboards/
 mlCommonsDashboards/
 assistantDashboards/
 flowFrameworkDashboards/
+queryInsightsDashboards/
diff --git a/plugins/.meta b/plugins/.meta
@@ -26,7 +26,7 @@
     "opensearch-remote-metadata-sdk": "git@github.com:opensearch-project/opensearch-remote-metadata-sdk.git",
     "opensearch-learning-to-rank-base": "git@github.com:opensearch-project/opensearch-learning-to-rank-base.git",
     "query-insights": "git@github.com:opensearch-project/query-insights.git",
-    "user-behavior-insights": "git@github.com:opensearch-project/user-behavior-insights.git",
-    "search-relevance": "git@github.com:opensearch-project/search-relevance.git"
+    "search-relevance": "git@github.com:opensearch-project/search-relevance.git",
+    "user-behavior-insights": "git@github.com:opensearch-project/user-behavior-insights.git"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @dblock @saratvemulapalli @tlfeng @VachaShah @ohltyler`
	`1`	`+* @saratvemulapalli @VachaShah @ohltyler`
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ In order to onboard, follow the below steps:`
`99`	`99`	`name = "Snapshots"`
`100`	`100`	`url = "https://aws.oss.sonatype.org/content/repositories/snapshots"`
`101`	`101`	`credentials {`
`102`		`- username "$System.env.SONATYPE_USERNAME"`
`103`		`- password "$System.env.SONATYPE_PASSWORD"`
	`102`	`+ username System.getenv("SONATYPE_USERNAME")`
	`103`	`+ password System.getenv("SONATYPE_PASSWORD")`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"opensearch-remote-metadata-sdk": "git@github.com:opensearch-project/opensearch-remote-metadata-sdk.git",`
`27`	`27`	`"opensearch-learning-to-rank-base": "git@github.com:opensearch-project/opensearch-learning-to-rank-base.git",`
`28`	`28`	`"query-insights": "git@github.com:opensearch-project/query-insights.git",`
`29`		`- "user-behavior-insights": "git@github.com:opensearch-project/user-behavior-insights.git",`
`30`		`- "search-relevance": "git@github.com:opensearch-project/search-relevance.git"`
	`29`	`+ "search-relevance": "git@github.com:opensearch-project/search-relevance.git",`
	`30`	`+ "user-behavior-insights": "git@github.com:opensearch-project/user-behavior-insights.git"`
`31`	`31`	`}`
`32`	`32`	`}`