[Stack Monitoring] Use doc ID to deduplicate shard allocations

elastic · Oct 25, 2022 · 21ea2ba · 21ea2ba
1 parent 37454b7
commit 21ea2ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/x-pack/plugins/monitoring/common/types/es.ts b/x-pack/plugins/monitoring/common/types/es.ts
@@ -17,6 +17,7 @@ export interface ElasticsearchResponse {
 }
 
 export interface ElasticsearchResponseHit {
+  _id: string;
   _index: string;
   _source: ElasticsearchSource;
   inner_hits?: {

diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.ts b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.ts
@@ -36,9 +36,8 @@ export function handleResponse(response: ElasticsearchResponse) {
         mbShard?.shard?.relocating_node?.id ?? legacyShard?.relocating_node ?? null;
       const node = mbShard?.node?.id ?? legacyShard?.node;
       // note: if the request is for a node, then it's enough to deduplicate without primary, but for indices it displays both
-      const shardId = `${index}-${shardNumber}-${primary}-${relocatingNode}-${node}`;
 
-      if (!uniqueShards.has(shardId)) {
+      if (!uniqueShards.has(hit._id)) {
         // @ts-ignore
         shards.push({
           index,
@@ -48,7 +47,7 @@ export function handleResponse(response: ElasticsearchResponse) {
           shard: shardNumber,
           state: legacyShard?.state ?? mbShard?.shard?.state,
         });
-        uniqueShards.add(shardId);
+        uniqueShards.add(hit._id);
       }
     }