feat(slo): Add range filter to slo indicators by default (elastic#166390

)
joeypoon · Sep 14, 2023 · e344865 · e344865
1 parent f3b280f
commit e344865
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 42 deletions.
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
@@ -45,11 +45,23 @@ export class HistogramTransformGenerator extends TransformGenerator {
   }
 
   private buildSource(slo: SLO, indicator: HistogramIndicator) {
-    const filter = getElastichsearchQueryOrThrow(indicator.params.filter);
     return {
       index: parseIndex(indicator.params.index),
       runtime_mappings: this.buildCommonRuntimeMappings(slo),
-      query: filter,
+      query: {
+        bool: {
+          filter: [
+            {
+              range: {
+                [indicator.params.timestampField]: {
+                  gte: `now-${slo.timeWindow.duration.format()}`,
+                },
+              },
+            },
+            getElastichsearchQueryOrThrow(indicator.params.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
@@ -40,11 +40,23 @@ export class KQLCustomTransformGenerator extends TransformGenerator {
   }
 
   private buildSource(slo: SLO, indicator: KQLCustomIndicator) {
-    const filter = getElastichsearchQueryOrThrow(indicator.params.filter);
     return {
       index: parseIndex(indicator.params.index),
       runtime_mappings: this.buildCommonRuntimeMappings(slo),
-      query: filter,
+      query: {
+        bool: {
+          filter: [
+            {
+              range: {
+                [indicator.params.timestampField]: {
+                  gte: `now-${slo.timeWindow.duration.format()}`,
+                },
+              },
+            },
+            getElastichsearchQueryOrThrow(indicator.params.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
@@ -43,11 +43,23 @@ export class MetricCustomTransformGenerator extends TransformGenerator {
   }
 
   private buildSource(slo: SLO, indicator: MetricCustomIndicator) {
-    const filter = getElastichsearchQueryOrThrow(indicator.params.filter);
     return {
       index: parseIndex(indicator.params.index),
       runtime_mappings: this.buildCommonRuntimeMappings(slo),
-      query: filter,
+      query: {
+        bool: {
+          filter: [
+            {
+              range: {
+                [indicator.params.timestampField]: {
+                  gte: `now-${slo.timeWindow.duration.format()}`,
+                },
+              },
+            },
+            getElastichsearchQueryOrThrow(indicator.params.filter),
+          ],
+        },
+      },
     };
   }