fix(slo): use comma separarted list of source index for transform (el…

…astic#166294)
darnautov · Sep 13, 2023 · c0417f4 · c0417f4
1 parent a18c68f
commit c0417f4
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 15 deletions.
diff --git a/x-pack/plugins/observability/server/services/slo/fixtures/slo.ts b/x-pack/plugins/observability/server/services/slo/fixtures/slo.ts
@@ -58,7 +58,7 @@ export const createKQLCustomIndicator = (
 ): Indicator => ({
   type: 'sli.kql.custom',
   params: {
-    index: 'my-index*',
+    index: 'my-index*,my-other-index*',
     filter: 'labels.groupId: group-3',
     good: 'latency < 300',
     total: '',
@@ -72,7 +72,7 @@ export const createMetricCustomIndicator = (
 ): MetricCustomIndicator => ({
   type: 'sli.metric.custom',
   params: {
-    index: 'my-index*',
+    index: 'my-index*,my-other-index*',
     filter: 'labels.groupId: group-3',
     good: {
       metrics: [
@@ -95,7 +95,7 @@ export const createHistogramIndicator = (
 ): HistogramIndicator => ({
   type: 'sli.histogram.custom',
   params: {
-    index: 'my-index*',
+    index: 'my-index*,my-other-index*',
     filter: 'labels.groupId: group-3',
     good: {
       field: 'latency',

diff --git a/...servability/server/services/slo/transform_generators/__snapshots__/histogram.test.ts.snap b/...servability/server/services/slo/transform_generators/__snapshots__/histogram.test.ts.snap
diff --git a/...ervability/server/services/slo/transform_generators/__snapshots__/kql_custom.test.ts.snap b/...ervability/server/services/slo/transform_generators/__snapshots__/kql_custom.test.ts.snap
diff --git a/...ability/server/services/slo/transform_generators/__snapshots__/metric_custom.test.ts.snap b/...ability/server/services/slo/transform_generators/__snapshots__/metric_custom.test.ts.snap
diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/histogram.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/histogram.ts
@@ -14,7 +14,7 @@ import {
 
 import { InvalidTransformError } from '../../../errors';
 import { getSLOTransformTemplate } from '../../../assets/transform_templates/slo_transform_template';
-import { getElastichsearchQueryOrThrow, TransformGenerator } from '.';
+import { getElastichsearchQueryOrThrow, parseIndex, TransformGenerator } from '.';
 import {
   SLO_DESTINATION_INDEX_NAME,
   SLO_INGEST_PIPELINE_NAME,
@@ -47,7 +47,7 @@ export class HistogramTransformGenerator extends TransformGenerator {
   private buildSource(slo: SLO, indicator: HistogramIndicator) {
     const filter = getElastichsearchQueryOrThrow(indicator.params.filter);
     return {
-      index: indicator.params.index,
+      index: parseIndex(indicator.params.index),
       runtime_mappings: this.buildCommonRuntimeMappings(slo),
       query: filter,
     };

diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/kql_custom.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/kql_custom.ts
@@ -10,7 +10,7 @@ import { kqlCustomIndicatorSchema, timeslicesBudgetingMethodSchema } from '@kbn/
 
 import { InvalidTransformError } from '../../../errors';
 import { getSLOTransformTemplate } from '../../../assets/transform_templates/slo_transform_template';
-import { getElastichsearchQueryOrThrow, TransformGenerator } from '.';
+import { getElastichsearchQueryOrThrow, parseIndex, TransformGenerator } from '.';
 import {
   SLO_DESTINATION_INDEX_NAME,
   SLO_INGEST_PIPELINE_NAME,
@@ -42,7 +42,7 @@ export class KQLCustomTransformGenerator extends TransformGenerator {
   private buildSource(slo: SLO, indicator: KQLCustomIndicator) {
     const filter = getElastichsearchQueryOrThrow(indicator.params.filter);
     return {
-      index: indicator.params.index,
+      index: parseIndex(indicator.params.index),
       runtime_mappings: this.buildCommonRuntimeMappings(slo),
       query: filter,
     };

diff --git a/x-pack/plugins/observability/server/services/slo/transform_generators/metric_custom.ts b/x-pack/plugins/observability/server/services/slo/transform_generators/metric_custom.ts
@@ -10,7 +10,7 @@ import { metricCustomIndicatorSchema, timeslicesBudgetingMethodSchema } from '@k
 
 import { InvalidTransformError } from '../../../errors';
 import { getSLOTransformTemplate } from '../../../assets/transform_templates/slo_transform_template';
-import { getElastichsearchQueryOrThrow, TransformGenerator } from '.';
+import { getElastichsearchQueryOrThrow, parseIndex, TransformGenerator } from '.';
 import {
   SLO_DESTINATION_INDEX_NAME,
   SLO_INGEST_PIPELINE_NAME,
@@ -45,7 +45,7 @@ export class MetricCustomTransformGenerator extends TransformGenerator {
   private buildSource(slo: SLO, indicator: MetricCustomIndicator) {
     const filter = getElastichsearchQueryOrThrow(indicator.params.filter);
     return {
-      index: indicator.params.index,
+      index: parseIndex(indicator.params.index),
       runtime_mappings: this.buildCommonRuntimeMappings(slo),
       query: filter,
     };