Merge remote-tracking branch 'upstream/main' into fix_max_score

Author: gaobinlong

CHANGELOG.md

@@ -7,8 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Added
 - Add support for Warm Indices Write Block on Flood Watermark breach ([#18375](https://github.com/opensearch-project/OpenSearch/pull/18375))
 - Add support for custom index name resolver from cluster plugin ([#18593](https://github.com/opensearch-project/OpenSearch/pull/18593))
+- Rename WorkloadGroupTestUtil to WorkloadManagementTestUtil ([#18709](https://github.com/opensearch-project/OpenSearch/pull/18709))
 - Disallow resize for Warm Index, add Parameterized ITs for close in remote store ([#18686](https://github.com/opensearch-project/OpenSearch/pull/18686))
 - Ability to run Code Coverage with Gradle and produce the jacoco reports locally ([#18509](https://github.com/opensearch-project/OpenSearch/issues/18509))
+- [Workload Management] Update logging and Javadoc, rename QueryGroup to WorkloadGroup ([#18711](https://github.com/opensearch-project/OpenSearch/issues/18711))
 - Add NodeResourceUsageStats to ClusterInfo ([#18480](https://github.com/opensearch-project/OpenSearch/issues/18472))
 - Introduce SecureHttpTransportParameters experimental API (to complement SecureTransportParameters counterpart) ([#18572](https://github.com/opensearch-project/OpenSearch/issues/18572))
 - Create equivalents of JSM's AccessController in the java agent ([#18346](https://github.com/opensearch-project/OpenSearch/issues/18346))
@@ -41,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.bouncycastle:bcpkix-fips` from 2.0.7 to 2.0.8 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
 - Bump `org.bouncycastle:bcpg-fips` from 2.0.10 to 2.0.11 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
 - Bump `com.password4j:password4j` from 1.8.2 to 1.8.3 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
+- Bump `com.azure:azure-core` from 1.55.3 to 1.55.5 ([#18691](https://github.com/opensearch-project/OpenSearch/pull/18691))
 
 ### Deprecated
 
@@ -56,6 +59,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix the backward compatibility regression with COMPLEMENT for Regexp queries introduced in OpenSearch 3.0 ([#18640](https://github.com/opensearch-project/OpenSearch/pull/18640))
 - Fix Replication lag computation ([#18602](https://github.com/opensearch-project/OpenSearch/pull/18602))
 - Fix max_score is null when sorting on score firstly ([#18715](https://github.com/opensearch-project/OpenSearch/pull/18715))
+- Fixed Staggered merge -  load average replace with AverageTrackers, some Default thresholds modified ([#18666](https://github.com/opensearch-project/OpenSearch/pull/18666))
 
 ### Security
 

modules/autotagging-commons/common/src/main/java/org/opensearch/rule/autotagging/Rule.java

@@ -31,7 +31,7 @@
  * of a rule. The indexed view may differ in representation.
  * {
  *     "id": "fwehf8302582mglfio349==",
- *     "description": "Assign Query Group for Index Logs123"
+ *     "description": "Assign Workload Group for Index Logs123"
  *     "index_pattern": ["logs123"],
  *     "workload_group": "dev_workload_group_id",
  *     "updated_at": "01-10-2025T21:23:21.456Z"

plugins/repository-azure/build.gradle

@@ -44,7 +44,7 @@ opensearchplugin {
 }
 
 dependencies {
-  api 'com.azure:azure-core:1.55.3'
+  api 'com.azure:azure-core:1.55.5'
   api 'com.azure:azure-json:1.5.0'
   api 'com.azure:azure-xml:1.2.0'
   api 'com.azure:azure-storage-common:12.29.0'

plugins/repository-azure/licenses/azure-core-1.55.3.jar.sha1

@@ -0,0 +1 @@
+93227034496e2a0dc0b7babcbba57f5a6bb8b4cb

plugins/repository-azure/licenses/azure-core-1.55.5.jar.sha1

@@ -7,6 +7,6 @@
  */
 
 /**
- * Package for the action classes related to query groups in WorkloadManagementPlugin
+ * Package for the action classes related to workload groups in WorkloadManagementPlugin
  */
 package org.opensearch.plugin.wlm.action;

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/package-info.java

@@ -7,6 +7,6 @@
  */
 
 /**
- * Package for the rest classes related to query groups in WorkloadManagementPlugin
+ * Package for the rest classes related to workload groups in WorkloadManagementPlugin
  */
 package org.opensearch.plugin.wlm.rest;

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rest/package-info.java

@@ -54,7 +54,7 @@ public class WorkloadGroupPersistenceService {
     /**
      *  max WorkloadGroup count setting name
      */
-    public static final String QUERY_GROUP_COUNT_SETTING_NAME = "node.workload_group.max_count";
+    public static final String WORKLOAD_GROUP_COUNT_SETTING_NAME = "node.workload_group.max_count";
     /**
      * default max workloadGroup count on any node at any given point in time
      */
@@ -67,7 +67,7 @@ public class WorkloadGroupPersistenceService {
      *  max WorkloadGroup count setting
      */
     public static final Setting<Integer> MAX_QUERY_GROUP_COUNT = Setting.intSetting(
-        QUERY_GROUP_COUNT_SETTING_NAME,
+        WORKLOAD_GROUP_COUNT_SETTING_NAME,
         DEFAULT_MAX_QUERY_GROUP_COUNT_VALUE,
         0,
         WorkloadGroupPersistenceService::validateMaxWorkloadGroupCount,
@@ -116,7 +116,7 @@ public void setMaxWorkloadGroupCount(int newMaxWorkloadGroupCount) {
      */
     private static void validateMaxWorkloadGroupCount(int maxWorkloadGroupCount) {
         if (maxWorkloadGroupCount > DEFAULT_MAX_QUERY_GROUP_COUNT_VALUE || maxWorkloadGroupCount < MIN_QUERY_GROUP_COUNT_VALUE) {
-            throw new IllegalArgumentException(QUERY_GROUP_COUNT_SETTING_NAME + " should be in range [1-100].");
+            throw new IllegalArgumentException(WORKLOAD_GROUP_COUNT_SETTING_NAME + " should be in range [1-100].");
         }
     }
 
@@ -162,7 +162,7 @@ ClusterState saveWorkloadGroupInClusterState(final WorkloadGroup workloadGroup,
 
         // check if maxWorkloadGroupCount will breach
         if (existingWorkloadGroups.size() == maxWorkloadGroupCount) {
-            logger.warn("{} value exceeded its assigned limit of {}.", QUERY_GROUP_COUNT_SETTING_NAME, maxWorkloadGroupCount);
+            logger.warn("{} value exceeded its assigned limit of {}.", WORKLOAD_GROUP_COUNT_SETTING_NAME, maxWorkloadGroupCount);
             throw new IllegalStateException("Can't create more than " + maxWorkloadGroupCount + " WorkloadGroups in the system.");
         }
 

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/service/WorkloadGroupPersistenceService.java

@@ -7,6 +7,6 @@
  */
 
 /**
- * Package for the service classes related to query groups in WorkloadManagementPlugin
+ * Package for the service classes related to workload groups in WorkloadManagementPlugin
  */
 package org.opensearch.plugin.wlm.service;

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/service/package-info.java

@@ -138,7 +138,7 @@ public void testGetFeatureTypeReturnsWorkloadGroupFeatureType() {
         assertEquals("workload_group", featureType.getName());
     }
 
-    public void testGetSettingsIncludesMaxQueryGroupCount() {
+    public void testGetSettingsIncludesMaxWorkloadGroupCount() {
         List<?> settings = plugin.getSettings();
         assertTrue(settings.contains(WorkloadGroupPersistenceService.MAX_QUERY_GROUP_COUNT));
     }