forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[APM] Use excluded data tiers setting (elastic#192373)
closes [elastic#190559](elastic#190559) ## Summary This PR updates the ES clients in APM to respect the excluded tier configuration. When this config is set, the ES clients will automatically add a filter to exclude the specified tiers from queries. <img width="600" alt="image" src="https://github.com/user-attachments/assets/9b0de76d-242c-4343-bc30-d5c787316f59"> All queries in APM should have the `_tier` filter (via `get_apm_events_client`) <img width="600" alt="image" src="https://github.com/user-attachments/assets/c525602f-f239-4be8-99c4-65d617962656"> This change also affects alerting (via `alerting_es_client`) <img width="600" alt="image" src="https://github.com/user-attachments/assets/750df4d7-5b49-4de5-9294-7afedf11d7e5"> And it impacts the alerts column (via `get_apm_alert_client`) <img width="600" alt="image" src="https://github.com/user-attachments/assets/44bd9129-1e72-4a3a-af32-d42a9cd9164d"> ### What won't automatically add a filter for `_tier` - Embeddables - ML queries ### How to test - Set the config in Advanced Settings to exclude `data_frozen` and `data_cold` (optional) - Navigate to APM and check the query `Inspect` to see if the filter is present. - Click through APM to confirm things still work. - Create one of each type of APM alerts - Without the config set, queries should not include the `_tier` filter` --------- Co-authored-by: Elastic Machine <[email protected]> (cherry picked from commit ee5ef81) # Conflicts: # x-pack/packages/observability/observability_utils/es/queries/exclude_frozen_query.ts # x-pack/plugins/cloud_integrations/cloud_experiments/public/launch_darkly_client/index.ts # x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts # x-pack/plugins/observability_solution/apm/server/lib/helpers/get_apm_event_client.ts # x-pack/plugins/observability_solution/apm/server/lib/helpers/tier_filter.ts # x-pack/plugins/observability_solution/apm_data_access/server/lib/helpers/create_es_client/create_apm_event_client/index.ts # x-pack/plugins/observability_solution/apm_data_access/server/lib/helpers/index.ts # x-pack/plugins/observability_solution/apm_data_access/tsconfig.json # x-pack/plugins/observability_solution/observability/server/ui_settings.ts
- Loading branch information
1 parent
e290e90
commit 167bbf0
Showing
23 changed files
with
980 additions
and
97 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
x-pack/packages/observability/observability_utils/es/queries/exclude_tiers_query.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import type { estypes } from '@elastic/elasticsearch'; | ||
|
||
export function excludeTiersQuery( | ||
excludedDataTiers: Array<'data_frozen' | 'data_cold' | 'data_warm' | 'data_hot'> | ||
): estypes.QueryDslQueryContainer[] { | ||
return [ | ||
{ | ||
bool: { | ||
must_not: [ | ||
{ | ||
terms: { | ||
_tier: excludedDataTiers, | ||
}, | ||
}, | ||
], | ||
}, | ||
}, | ||
]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.