Filter alerts counts with timerage

elastic · Jan 26, 2023 · ea7c2c5 · ea7c2c5
1 parent d2a6594
commit ea7c2c5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
@@ -213,6 +213,9 @@ function useTabs({ selectedTab }: { selectedTab: Tab['key'] }) {
     query: queryFromUrl,
   } = useApmParams(`/services/{serviceName}/${selectedTab}` as const);
 
+  const { rangeFrom, rangeTo } = queryFromUrl;
+  const { start, end } = useTimeRange({ rangeFrom, rangeTo });
+
   const { data: serviceAlertsCount = { alertsCount: 0 } } = useFetcher(
     (callApmApi) => {
       return callApmApi(
@@ -222,11 +225,15 @@ function useTabs({ selectedTab }: { selectedTab: Tab['key'] }) {
             path: {
               serviceName,
             },
+            query: {
+              start,
+              end,
+            },
           },
         }
       );
     },
-    [serviceName]
+    [serviceName, start, end]
   );
 
   const query = omit(

diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_service_alerts.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_service_alerts.ts
@@ -9,7 +9,11 @@ import {
   AggregationsCardinalityAggregate,
   AggregationsFilterAggregate,
 } from '@elastic/elasticsearch/lib/api/types';
-import { kqlQuery } from '@kbn/observability-plugin/server';
+import {
+  kqlQuery,
+  termQuery,
+  rangeQuery,
+} from '@kbn/observability-plugin/server';
 import {
   ALERT_RULE_PRODUCER,
   ALERT_STATUS,
@@ -37,23 +41,28 @@ export async function getServicesAlerts({
   maxNumServices = MAX_NUMBER_OF_SERVICES,
   serviceGroup,
   serviceName,
+  start,
+  end,
 }: {
   apmAlertsClient: ApmAlertsClient;
   kuery?: string;
   maxNumServices?: number;
   serviceGroup?: ServiceGroup | null;
   serviceName?: string;
+  start: number;
+  end: number;
 }) {
   const params = {
     size: 0,
     query: {
       bool: {
         filter: [
-          { term: { [ALERT_RULE_PRODUCER]: 'apm' } },
-          { term: { [ALERT_STATUS]: ALERT_STATUS_ACTIVE } },
+          ...termQuery(ALERT_RULE_PRODUCER, 'apm'),
+          ...termQuery(ALERT_STATUS, ALERT_STATUS_ACTIVE),
+          ...rangeQuery(start, end),
           ...kqlQuery(kuery),
           ...serviceGroupQuery(serviceGroup),
-          ...(serviceName ? [{ term: { [SERVICE_NAME]: serviceName } }] : []),
+          ...termQuery(SERVICE_NAME, serviceName),
         ],
       },
     },

diff --git a/x-pack/plugins/apm/server/routes/services/route.ts b/x-pack/plugins/apm/server/routes/services/route.ts
@@ -1220,6 +1220,7 @@ const serviceAlertsRoute = createApmServerRoute({
     path: t.type({
       serviceName: t.string,
     }),
+    query: rangeRt,
   }),
   options: { tags: ['access:apm'] },
   handler: async (
@@ -1229,13 +1230,17 @@ const serviceAlertsRoute = createApmServerRoute({
     alertsCount: number;
   }> => {
     const { params } = resources;
-
+    const {
+      query: { start, end },
+    } = params;
     const { serviceName } = params.path;
 
     const apmAlertsClient = await getApmAlertsClient(resources);
     const servicesAlerts = await getServicesAlerts({
       serviceName,
       apmAlertsClient,
+      start,
+      end,
     });
 
     return servicesAlerts.length > 0