Merge remote-tracking branch 'origin/main' into async-flush

fcofdez · Nov 27, 2023 · c1a703f · c1a703f
2 parents c4494ab + 37b7dd9
commit c1a703f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/docs/changelog/102636.yaml b/docs/changelog/102636.yaml
@@ -0,0 +1,5 @@
+pr: 102636
+summary: Revert non-semantic `NodeInfo`
+area: Infra/Core
+type: regression
+issues: []
diff --git a/docs/reference/modules/cluster/shards_allocation.asciidoc b/docs/reference/modules/cluster/shards_allocation.asciidoc
@@ -183,6 +183,13 @@ The minimum improvement in weight which triggers a rebalancing shard movement.
 Defaults to `1.0f`. Raising this value will cause {es} to stop rebalancing
 shards sooner, leaving the cluster in a more unbalanced state.
 
-NOTE: Regardless of the result of the balancing algorithm, rebalancing might
+[NOTE]
+====
+* It is not recommended to adjust the values of the heuristics settings. The
+default values are generally good, and although different values may improve
+the current balance, it is possible that they create problems in the future
+if the cluster or workload changes.
+* Regardless of the result of the balancing algorithm, rebalancing might
 not be allowed due to allocation rules such as forced awareness and allocation
 filtering.
+====
diff --git a/server/src/main/java/org/elasticsearch/node/NodeService.java b/server/src/main/java/org/elasticsearch/node/NodeService.java
@@ -10,6 +10,7 @@
 
 import org.elasticsearch.Build;
 import org.elasticsearch.TransportVersion;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.node.info.ComponentVersionNumber;
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
@@ -117,7 +118,8 @@ public NodeInfo info(
         boolean indices
     ) {
         return new NodeInfo(
-            Build.current().version(),
+            // TODO: revert to Build.current().version() when Kibana is updated
+            Version.CURRENT.toString(),
             TransportVersion.current(),
             IndexVersion.current(),
             findComponentVersions(),