APM observability fetch data

elastic · Jun 23, 2020 · 679ccd7 · 679ccd7
1 parent be59683
commit 679ccd7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 38 deletions.
diff --git a/x-pack/plugins/apm/public/services/rest/observability_dashboard.ts b/x-pack/plugins/apm/public/services/rest/observability_dashboard.ts
@@ -5,54 +5,56 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FetchData } from '../../../../observability/public/typings/data_handler';
+import { sum } from 'lodash';
+import {
+  ApmFetchDataResponse,
+  FetchData,
+} from '../../../../observability/public/typings/data_handler';
 import { callApmApi } from './createCallApmApi';
 
-export const fetchData: FetchData = async ({
+export const fetchData: FetchData<ApmFetchDataResponse> = async ({
   startTime,
   endTime,
   bucketSize,
 }) => {
-  const serviceCountPromise = callApmApi({
-    pathname: '/api/apm/observability-dashboard/service-count',
+  const data = await callApmApi({
+    pathname: '/api/apm/observability-dashboard',
     params: { query: { start: startTime, end: endTime, bucketSize } },
   });
 
-  const transactionCoordinatesPromise = callApmApi({
-    pathname: '/api/apm/observability-dashboard/transactions',
-    params: { query: { start: startTime, end: endTime, bucketSize } },
-  });
-
-  const [serviceCount, transactionCoordinates] = await Promise.all([
-    serviceCountPromise,
-    transactionCoordinatesPromise,
-  ]);
+  const { serviceCount, transactionCoordinates } = data;
 
   return {
     title: i18n.translate('xpack.apm.observabilityDashboard.title', {
       defaultMessage: 'APM',
     }),
     appLink: '/app/apm',
-    stats: [
-      {
+    stats: {
+      services: {
         label: i18n.translate(
           'xpack.apm.observabilityDashboard.stats.services',
           { defaultMessage: 'Services' }
         ),
         value: serviceCount,
       },
-    ],
-    series: [
-      {
-        key: 'transactions',
+      transactions: {
+        label: i18n.translate(
+          'xpack.apm.observabilityDashboard.stats.transactions',
+          { defaultMessage: 'Transactions' }
+        ),
+        value: sum(transactionCoordinates.map((coordinates) => coordinates.y)),
+      },
+    },
+    series: {
+      transactions: {
         label: i18n.translate(
           'xpack.apm.observabilityDashboard.chart.transactions',
           { defaultMessage: 'Transactions' }
         ),
         color: 'euiColorVis1',
         coordinates: transactionCoordinates,
       },
-    ],
+    },
   };
 };
 

diff --git a/x-pack/plugins/apm/server/lib/observability_dashboard/get_service_count.ts b/x-pack/plugins/apm/server/lib/observability_dashboard/get_service_count.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { rangeFilter } from '../../../common/utils/range_filter';
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
-import { rangeFilter } from '../helpers/range_filter';
 
 export async function getServiceCount({
   setup,

diff --git a/x-pack/plugins/apm/server/routes/create_apm_api.ts b/x-pack/plugins/apm/server/routes/create_apm_api.ts
@@ -78,8 +78,7 @@ import {
 } from './rum_client';
 import {
   observabilityDashboardHasDataRoute,
-  observabilityDashboardServiceCountRoute,
-  observabilityDashboardTransactionsRoute,
+  observabilityDashboardDataRoute,
 } from './observability_dashboard';
 
 const createApmApi = () => {
@@ -169,8 +168,7 @@ const createApmApi = () => {
 
     // Observability dashboard
     .add(observabilityDashboardHasDataRoute)
-    .add(observabilityDashboardServiceCountRoute)
-    .add(observabilityDashboardTransactionsRoute);
+    .add(observabilityDashboardDataRoute);
 
   return api;
 };

diff --git a/x-pack/plugins/apm/server/routes/observability_dashboard.ts b/x-pack/plugins/apm/server/routes/observability_dashboard.ts
@@ -19,27 +19,20 @@ export const observabilityDashboardHasDataRoute = createRoute(() => ({
   },
 }));
 
-export const observabilityDashboardServiceCountRoute = createRoute(() => ({
-  path: '/api/apm/observability-dashboard/service-count',
-  params: {
-    query: t.intersection([rangeRt, t.type({ bucketSize: t.string })]),
-  },
-  handler: async ({ context, request }) => {
-    const setup = await setupRequest(context, request);
-    return await getServiceCount({ setup });
-  },
-}));
-export const observabilityDashboardTransactionsRoute = createRoute(() => ({
-  path: '/api/apm/observability-dashboard/transactions',
+export const observabilityDashboardDataRoute = createRoute(() => ({
+  path: '/api/apm/observability-dashboard',
   params: {
     query: t.intersection([rangeRt, t.type({ bucketSize: t.string })]),
   },
   handler: async ({ context, request }) => {
     const setup = await setupRequest(context, request);
     const { bucketSize } = context.params.query;
-    return await getTransactionCoordinates({
+    const serviceCount = await getServiceCount({ setup });
+    const transactionCoordinates = await getTransactionCoordinates({
       setup,
       bucketSize,
     });
+
+    return { serviceCount, transactionCoordinates };
   },
 }));