Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Stack Monitoring] Use doc ID to deduplicate shard allocations #143963

Merged
merged 8 commits into from
Nov 17, 2022
Merged

[Stack Monitoring] Use doc ID to deduplicate shard allocations #143963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21ea2ba
[Stack Monitoring] Use doc ID to deduplicate shard allocations
miltonhultgren Oct 25, 2022
629cd40
Merge branch 'main' of github.com:elastic/kibana into sm-shard-alloca…
miltonhultgren Nov 9, 2022
5bf272c
Fix failing unit test in get_shard_allocation
miltonhultgren Nov 10, 2022
51335c6
Merge branch 'main' of github.com:elastic/kibana into sm-shard-alloca…
miltonhultgren Nov 10, 2022
3cdb371
Fix type check
miltonhultgren Nov 10, 2022
b27e252
Merge branch 'main' into sm-shard-allocations
miltonhultgren Nov 14, 2022
01ed1db
Merge branch 'main' into sm-shard-allocations
kibanamachine Nov 16, 2022
45d374d
Merge branch 'main' into sm-shard-allocations
miltonhultgren Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/plugins/monitoring/common/types/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface ElasticsearchResponse {
}

export interface ElasticsearchResponseHit {
_id: string;
_index: string;
_source: ElasticsearchSource;
inner_hits?: {
Expand Down
5 changes: 4 additions & 1 deletion x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ describe('get_shard_allocation', () => {
describe('handleResponse', () => {
it('deduplicates shards', () => {
const nextTimestamp = '2018-07-06T00:00:01.259Z';
const hits = shards.map((shard) => {
const hits = shards.map((shard, index) => {
return {
_id: `STATE_UUID:${shard.node}:${shard.index}:s${shard.shard}:${
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this s in s${shard.shard} intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's to mirror the JSON data which looks like shard: 0, and to match with p or r1, "shard 0, primary", "shard 1, replica 2" etc.

shard.primary ? 'p' : `r${index}`
}`,
_source: {
...exampleShardSource,
shard,
Expand Down
5 changes: 2 additions & 3 deletions x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -48,7 +47,7 @@ export function handleResponse(response: ElasticsearchResponse) {
shard: shardNumber,
state: legacyShard?.state ?? mbShard?.shard?.state,
});
uniqueShards.add(shardId);
uniqueShards.add(hit._id);
}
}

Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/monitoring/server/lib/logstash/get_node_info.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jest.mock('../../static_globals', () => ({
// deletes, adds, or updates the properties based on a default object
function createResponseObjHit(params?: HitParams[]): ElasticsearchResponseHit {
const defaultResponseObj: ElasticsearchResponseHit = {
_id: '123123a',
_index: 'index',
_source: {
cluster_uuid: '123',
Expand Down