Skip to content

[SLO]: Include spaceID in SLI documents #214278

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

Merged
baileycash-elastic merged 4 commits into from
Mar 13, 2025
Merged

[SLO]: Include spaceID in SLI documents #214278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95e33b9
add space id to ingest pipeline
baileycash-elastic Mar 12, 2025
31fd0b0
add spaceId to sli mapping
baileycash-elastic Mar 12, 2025
3c206bd
update snapshots
baileycash-elastic Mar 12, 2025
4668bfd
fix broken imports
baileycash-elastic Mar 13, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ponent_templates/slI_mappings_template.ts → ...ponent_templates/sli_mappings_template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ export const SLI_MAPPINGS_TEMPLATE: ClusterPutComponentTemplateRequest = {
},
},
},
spaceId: {
type: 'keyword',
},
// Synthetics specific fields
monitor: {
properties: {
Expand Down
0 ...ponent_templates/slI_settings_template.ts → ...ponent_templates/sli_settings_template.ts
View file
Open in desktop
File renamed without changes.
8 changes: 7 additions & 1 deletion ...lutions/observability/plugins/slo/server/assets/ingest_templates/sli_pipeline_template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '../../../common/constants';
import { SLODefinition } from '../../domain/models';

export const getSLIPipelineTemplate = (slo: SLODefinition) => ({
export const getSLIPipelineTemplate = (slo: SLODefinition, spaceId: string) => ({
id: getSLOPipelineId(slo.id, slo.revision),
description: `Ingest pipeline for SLO rollup data [id: ${slo.id}, revision: ${slo.revision}]`,
processors: [
Expand Down Expand Up @@ -41,6 +41,12 @@ export const getSLIPipelineTemplate = (slo: SLODefinition) => ({
value: slo.revision,
},
},
{
set: {
field: 'spaceId',
value: spaceId,
},
},
{
date_index_name: {
field: '@timestamp',
Expand Down
6 changes: 6 additions & 0 deletions ...solutions/observability/plugins/slo/server/services/__snapshots__/create_slo.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .../solutions/observability/plugins/slo/server/services/__snapshots__/reset_slo.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions x-pack/solutions/observability/plugins/slo/server/services/create_slo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class CreateSLO {
const rollupTransformId = getSLOTransformId(slo.id, slo.revision);
const summaryTransformId = getSLOSummaryTransformId(slo.id, slo.revision);
try {
const sloPipelinePromise = this.createPipeline(getSLIPipelineTemplate(slo));
const sloPipelinePromise = this.createPipeline(getSLIPipelineTemplate(slo, this.spaceId));
rollbackOperations.push(() => this.deletePipeline(getSLOPipelineId(slo.id, slo.revision)));

const rollupTransformPromise = this.transformManager.install(slo);
Expand Down Expand Up @@ -181,7 +181,7 @@ export class CreateSLO {
validateSLO(slo);

const rollUpTransform = await this.transformManager.inspect(slo);
const rollUpPipeline = getSLIPipelineTemplate(slo);
const rollUpPipeline = getSLIPipelineTemplate(slo, this.spaceId);
const summaryPipeline = getSummaryPipelineTemplate(slo, this.spaceId, this.basePath);
const summaryTransform = await this.summaryTransformManager.inspect(slo);
const temporaryDoc = createTempSummaryDocument(slo, this.spaceId, this.basePath);
Expand Down
2 changes: 1 addition & 1 deletion x-pack/solutions/observability/plugins/slo/server/services/reset_slo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class ResetSLO {
await retryTransientEsErrors(
() =>
this.scopedClusterClient.asSecondaryAuthUser.ingest.putPipeline(
getSLIPipelineTemplate(slo)
getSLIPipelineTemplate(slo, this.spaceId)
),
{ logger: this.logger }
);
Expand Down
4 changes: 2 additions & 2 deletions x-pack/solutions/observability/plugins/slo/server/services/resource_installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
SUMMARY_DESTINATION_INDEX_NAME,
SUMMARY_TEMP_INDEX_NAME,
} from '../../common/constants';
import { SLI_MAPPINGS_TEMPLATE } from '../assets/component_templates/slI_mappings_template';
import { SLI_SETTINGS_TEMPLATE } from '../assets/component_templates/slI_settings_template';
import { SLI_MAPPINGS_TEMPLATE } from '../assets/component_templates/sli_mappings_template';
import { SLI_SETTINGS_TEMPLATE } from '../assets/component_templates/sli_settings_template';
import { SUMMARY_MAPPINGS_TEMPLATE } from '../assets/component_templates/summary_mappings_template';
import { SUMMARY_SETTINGS_TEMPLATE } from '../assets/component_templates/summary_settings_template';
import { SLI_INDEX_TEMPLATE } from '../assets/index_templates/sli_index_template';
Expand Down
2 changes: 1 addition & 1 deletion x-pack/solutions/observability/plugins/slo/server/services/update_slo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export class UpdateSLO {
await retryTransientEsErrors(
() =>
this.scopedClusterClient.asSecondaryAuthUser.ingest.putPipeline(
getSLIPipelineTemplate(updatedSlo)
getSLIPipelineTemplate(updatedSlo, this.spaceId)
),
{ logger: this.logger }
);
Expand Down