Apply not_stale filter to all sub-filters, except stale.

elastic · Nov 22, 2024 · 1186417 · 1186417
1 parent b73f0c4
commit 1186417
Showing 1 changed file with 50 additions and 43 deletions.
diff --git a/x-pack/plugins/observability_solution/slo/server/services/get_slos_overview.ts b/x-pack/plugins/observability_solution/slo/server/services/get_slos_overview.ts
@@ -53,64 +53,71 @@ export class GetSLOsOverview {
       },
       body: {
         aggs: {
-          worst: {
-            top_hits: {
-              sort: {
-                errorBudgetRemaining: {
-                  order: 'asc',
-                },
-              },
-              _source: {
-                includes: ['sliValue', 'status', 'slo.id', 'slo.instanceId', 'slo.name'],
-              },
-              size: 1,
-            },
-          },
           stale: {
             filter: {
               range: {
                 summaryUpdatedAt: {
-                  lt: `now-${settings.staleThresholdInHours}h`,
+                  lt: 'now-48h',
                 },
               },
             },
-          },
-          violated: {
-            filter: {
-              term: {
-                status: 'VIOLATED',
+            aggs: {
+              by_status: {
+                terms: {
+                  field: 'status',
+                },
               },
             },
           },
-          healthy: {
+          not_stale: {
             filter: {
-              term: {
-                status: 'HEALTHY',
+              range: {
+                summaryUpdatedAt: {
+                  gte: 'now-48h',
+                },
               },
             },
             aggs: {
-              not_stale: {
-                filter: {
-                  range: {
-                    summaryUpdatedAt: {
-                      gte: 'now-48h',
+              worst: {
+                top_hits: {
+                  sort: {
+                    errorBudgetRemaining: {
+                      order: 'asc',
                     },
                   },
+                  _source: {
+                    includes: ['sliValue', 'status', 'slo.id', 'slo.instanceId', 'slo.name'],
+                  },
+                  size: 1,
                 },
               },
-            },
-          },
-          degrading: {
-            filter: {
-              term: {
-                status: 'DEGRADING',
+              violated: {
+                filter: {
+                  term: {
+                    status: 'VIOLATED',
+                  },
+                },
               },
-            },
-          },
-          noData: {
-            filter: {
-              term: {
-                status: 'NO_DATA',
+              healthy: {
+                filter: {
+                  term: {
+                    status: 'HEALTHY',
+                  },
+                },
+              },
+              degrading: {
+                filter: {
+                  term: {
+                    status: 'DEGRADING',
+                  },
+                },
+              },
+              noData: {
+                filter: {
+                  term: {
+                    status: 'NO_DATA',
+                  },
+                },
               },
             },
           },
@@ -142,10 +149,10 @@ export class GetSLOsOverview {
     const aggs = response.aggregations;
 
     return {
-      violated: aggs?.violated.doc_count ?? 0,
-      degrading: aggs?.degrading.doc_count ?? 0,
-      healthy: aggs?.healthy?.not_stale?.doc_count ?? 0,
-      noData: aggs?.noData.doc_count ?? 0,
+      violated: aggs?.not_stale?.violated.doc_count ?? 0,
+      degrading: aggs?.not_stale?.degrading.doc_count ?? 0,
+      healthy: aggs?.not_stale?.healthy?.doc_count ?? 0,
+      noData: aggs?.not_stale?.noData.doc_count ?? 0,
       stale: aggs?.stale.doc_count ?? 0,
       worst: {
         value: 0,