Skip to content

Commit

Permalink
[APM] Remove observability:searchExcludedDataTiers from serverless (e…
Browse files Browse the repository at this point in the history
…lastic#196380)

fixes [elastic#196378](elastic#196378)

## Summary

"Excluded data tiers from search" removed from serverless.

<img width="600" alt="image"
src="https://github.com/user-attachments/assets/7d93dc20-936c-459f-bc21-3da6ea6f30fd">

Still present in stateful

<img width="600" alt="image"
src="https://github.com/user-attachments/assets/aed6efb2-8eb3-44a1-aa64-17433d1ce94c">


**Bonus:**

Removed the `_tier` filter noise, when the config was not set

| Before | After |
| -------| ----- |
|<img width="600" alt="image"
src="https://github.com/user-attachments/assets/b66aa65c-db5a-4879-a7ea-df675ae6790a">|<img
width="600" alt="image"
src="https://github.com/user-attachments/assets/a4ff722d-e311-4d0e-8b7d-660a9d456b71">|

Co-authored-by: Elastic Machine <[email protected]>
  • Loading branch information
crespocarlos and elasticmachine authored Oct 17, 2024
1 parent aff7ab3 commit bad11ab
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,4 @@ export const OBSERVABILITY_PROJECT_SETTINGS = [
settings.OBSERVABILITY_AI_ASSISTANT_SIMULATED_FUNCTION_CALLING,
settings.OBSERVABILITY_AI_ASSISTANT_SEARCH_CONNECTOR_INDEX_PATTERN,
settings.OBSERVABILITY_LOGS_DATA_ACCESS_LOG_SOURCES_ID,
settings.OBSERVABILITY_SEARCH_EXCLUDED_DATA_TIERS,
];
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class APMEventClient {
/** @deprecated Use {@link excludedDataTiers} instead.
* See https://www.elastic.co/guide/en/kibana/current/advanced-options.html **/
private readonly includeFrozen: boolean;
private readonly excludedDataTiers?: DataTier[];
private readonly excludedDataTiers: DataTier[];
private readonly inspectableEsQueriesMap?: WeakMap<KibanaRequest, InspectResponse>;

constructor(config: APMEventClientConfig) {
Expand All @@ -112,7 +112,7 @@ export class APMEventClient {
this.request = config.request;
this.indices = config.indices;
this.includeFrozen = config.options.includeFrozen;
this.excludedDataTiers = config.options.excludedDataTiers;
this.excludedDataTiers = config.options.excludedDataTiers ?? [];
this.inspectableEsQueriesMap = config.options.inspectableEsQueriesMap;
}

Expand Down Expand Up @@ -167,7 +167,7 @@ export class APMEventClient {
indices: this.indices,
});

if (this.excludedDataTiers) {
if (this.excludedDataTiers.length > 0) {
filters.push(...excludeTiersQuery(this.excludedDataTiers));
}

Expand Down Expand Up @@ -207,7 +207,8 @@ export class APMEventClient {
// Reusing indices configured for errors since both events and errors are stored as logs.
const index = processorEventsToIndex([ProcessorEvent.error], this.indices);

const filter = this.excludedDataTiers ? excludeTiersQuery(this.excludedDataTiers) : undefined;
const filter =
this.excludedDataTiers.length > 0 ? excludeTiersQuery(this.excludedDataTiers) : undefined;

const searchParams = {
...omit(params, 'body'),
Expand Down Expand Up @@ -249,7 +250,7 @@ export class APMEventClient {
indices: this.indices,
});

if (this.excludedDataTiers) {
if (this.excludedDataTiers.length > 0) {
filters.push(...excludeTiersQuery(this.excludedDataTiers));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export function getDataTierFilterCombined({
excludedDataTiers,
}: {
filter?: QueryDslQueryContainer;
excludedDataTiers?: DataTier[];
excludedDataTiers: DataTier[];
}): QueryDslQueryContainer | undefined {
if (!filter) {
return excludedDataTiers ? excludeTiersQuery(excludedDataTiers)[0] : undefined;
return excludedDataTiers.length > 0 ? excludeTiersQuery(excludedDataTiers)[0] : undefined;
}

return !excludedDataTiers
Expand Down

0 comments on commit bad11ab

Please sign in to comment.