diff --git a/x-pack/plugins/monitoring/common/types/alerts.ts b/x-pack/plugins/monitoring/common/types/alerts.ts index 1f68b0c55a046..bbd217169469d 100644 --- a/x-pack/plugins/monitoring/common/types/alerts.ts +++ b/x-pack/plugins/monitoring/common/types/alerts.ts @@ -32,6 +32,7 @@ export interface CommonAlertState { export interface CommonAlertFilter { nodeUuid?: string; shardId?: string; + shardIndex?: string; } export interface CommonAlertParamDetail { diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx index 6259d329729f7..21f9fd10f0806 100644 --- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx +++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx @@ -76,6 +76,11 @@ export const ElasticsearchCcrShardPage: React.FC = () => { fetch: services.http.fetch, alertTypeIds: [RULE_CCR_READ_EXCEPTIONS], clusterUuid, + filters: [ + { + shardId, + }, + ], timeRange: { min: bounds.min.valueOf(), max: bounds.max.valueOf(), diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx index 995e3b69149ce..86dba4e2f921c 100644 --- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx +++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx @@ -54,6 +54,11 @@ export const ElasticsearchIndexAdvancedPage: React.FC = () => { const alertsResponse = await fetchAlerts({ fetch: services.http.fetch, alertTypeIds: [RULE_LARGE_SHARD_SIZE], + filters: [ + { + shardIndex: index, + }, + ], clusterUuid, timeRange: { min: bounds.min.valueOf(), diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx index 469df42264b6d..b73fee0c963cc 100644 --- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx +++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx @@ -74,6 +74,11 @@ export const ElasticsearchIndexPage: React.FC = () => { const alertsResponse = await fetchAlerts({ fetch: services.http.fetch, alertTypeIds: [RULE_LARGE_SHARD_SIZE], + filters: [ + { + shardIndex: index, + }, + ], clusterUuid, timeRange: { min: bounds.min.valueOf(), diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx index fcaca9822a9e2..9c0f5f4627b01 100644 --- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx +++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx @@ -78,6 +78,11 @@ export const ElasticsearchNodeAdvancedPage: React.FC = () => { RULE_DISK_USAGE, RULE_MEMORY_USAGE, ], + filters: [ + { + nodeUuid: node, + }, + ], timeRange: { min: bounds.min.valueOf(), max: bounds.max.valueOf(), diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx index 5e86d637e4c45..f5ae4dc29b28e 100644 --- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx +++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx @@ -92,6 +92,7 @@ export const ElasticsearchNodePage: React.FC = () => { RULE_DISK_USAGE, RULE_MEMORY_USAGE, ], + filters: [{ nodeUuid: node }], clusterUuid, timeRange: { min: bounds.min.valueOf(),