[Infra UI] Add APM Section to Node Detail Page

x-pack/legacy/plugins/apm/server/routes/services.ts

@@ -5,6 +5,7 @@
  */
 
 import * as t from 'io-ts';
+import { Legacy } from 'kibana';
 import { AgentName } from '../../typings/es_schemas/ui/fields/Agent';
 import { createApmTelementry, storeApmTelemetry } from '../lib/apm_telemetry';
 import { setupRequest } from '../lib/helpers/setup_request';
@@ -14,12 +15,8 @@ import { getServiceTransactionTypes } from '../lib/services/get_service_transact
 import { createRoute } from './create_route';
 import { uiFiltersRt, rangeRt } from './default_api_types';
 
-export const servicesRoute = createRoute(core => ({
-  path: '/api/apm/services',
-  params: {
-    query: t.intersection([uiFiltersRt, rangeRt])
-  },
-  handler: async req => {
+export const servicesRoute = createRoute(core => {
+  const handler = async (req: Legacy.Request) => {
     const setup = await setupRequest(req);
     const services = await getServices(setup);
     const { server } = core.http;
@@ -32,8 +29,18 @@ export const servicesRoute = createRoute(core => ({
     storeApmTelemetry(server, apmTelemetry);
 
     return services;
-  }
-}));
+  };
+  // The Infra UI needs to be able to make requests to this endpoint without
+  // going through the server's router (via server.inject).
+  core.http.server.expose('getServices', handler);
+  return {
+    path: '/api/apm/services',
+    params: {
+      query: t.intersection([uiFiltersRt, rangeRt])
+    },
+    handler
+  };
+});
 
 export const serviceAgentNameRoute = createRoute(() => ({
   path: '/api/apm/services/{serviceName}/agent_name',

x-pack/legacy/plugins/apm/server/routes/transaction_groups.ts

@@ -5,6 +5,7 @@
  */
 
 import * as t from 'io-ts';
+import { Legacy } from 'kibana';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getTransactionCharts } from '../lib/transactions/charts';
 import { getTransactionDistribution } from '../lib/transactions/distribution';
@@ -44,22 +45,23 @@ export const transactionGroupsRoute = createRoute(() => ({
   }
 }));
 
-export const transactionGroupsChartsRoute = createRoute(() => ({
-  path: '/api/apm/services/{serviceName}/transaction_groups/charts',
-  params: {
-    path: t.type({
-      serviceName: t.string
+export const transactionGroupsChartsRoute = createRoute(core => {
+  const PathRT = t.type({
+    serviceName: t.string
+  });
+  const QueryRT = t.intersection([
+    t.partial({
+      transactionType: t.string,
+      transactionName: t.string
     }),
-    query: t.intersection([
-      t.partial({
-        transactionType: t.string,
-        transactionName: t.string
-      }),
-      uiFiltersRt,
-      rangeRt
-    ])
-  },
-  handler: async (req, { path, query }) => {
+    uiFiltersRt,
+    rangeRt
+  ]);
+  interface Params {
+    path: t.TypeOf<typeof PathRT>;
+    query: t.TypeOf<typeof QueryRT>;
+  }
+  const handler = async (req: Legacy.Request, { path, query }: Params) => {
     const setup = await setupRequest(req);
     const { serviceName } = path;
     const { transactionType, transactionName } = query;
@@ -70,8 +72,19 @@ export const transactionGroupsChartsRoute = createRoute(() => ({
       transactionName,
       setup
     });
-  }
-}));
+  };
+  // The Infra UI needs to be able to make requests to this endpoint without
+  // going through the server's router (via server.inject).
+  core.http.server.expose('getTransactionGroupsCharts', handler);
+  return {
+    path: '/api/apm/services/{serviceName}/transaction_groups/charts',
+    params: {
+      path: PathRT,
+      query: QueryRT
+    },
+    handler
+  };
+});
 
 export const transactionGroupsDistributionRoute = createRoute(() => ({
   path: '/api/apm/services/{serviceName}/transaction_groups/distribution',

x-pack/legacy/plugins/infra/common/graphql/types.ts

@@ -590,6 +590,7 @@ export enum InfraMetric {
   nginxRequestRate = 'nginxRequestRate',
   nginxActiveConnections = 'nginxActiveConnections',
   nginxRequestsPerConnection = 'nginxRequestsPerConnection',
+  apmMetrics = 'apmMetrics',
   awsOverview = 'awsOverview',
   awsCpuUtilization = 'awsCpuUtilization',
   awsNetworkBytes = 'awsNetworkBytes',

x-pack/legacy/plugins/infra/common/http_api/apm_metrics_api.ts

@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import * as rt from 'io-ts';
+import { InfraWrappableRequest } from '../../server/lib/adapters/framework';
+import { InfraNodeTypeRT } from './common';
+
+export const InfraApmMetricsRequestRT = rt.type({
+  timeRange: rt.type({
+    min: rt.number,
+    max: rt.number,
+  }),
+  nodeId: rt.string,
+  nodeType: InfraNodeTypeRT,
+  sourceId: rt.string,
+});
+
+export const InfraApmMetricsTransactionTypeRT = rt.keyof({
+  request: null,
+  job: null,
+});
+
+export const InfraApmMetricsDataPointRT = rt.type({
+  timestamp: rt.number,
+  value: rt.union([rt.number, rt.null]),
+});
+
+export const InfraApmMetricsSeriesRT = rt.type({
+  id: rt.string,
+  data: rt.array(InfraApmMetricsDataPointRT),
+});
+
+export const InfraApmMetricsDataSetRT = rt.type({
+  id: rt.string,
+  type: InfraApmMetricsTransactionTypeRT,
+  series: rt.array(InfraApmMetricsSeriesRT),
+});
+
+export const InfraApmMetricsServiceRT = rt.type({
+  id: rt.string,
+  dataSets: rt.array(InfraApmMetricsDataSetRT),
+  agentName: rt.string,
+  avgResponseTime: rt.number,
+  errorsPerMinute: rt.number,
+  transactionsPerMinute: rt.number,
+});
+
+export const InfraApmMetricsRT = rt.type({
+  id: rt.literal('apmMetrics'),
+  services: rt.array(InfraApmMetricsServiceRT),
+});
+
+export const APMDataPointRT = rt.type({
+  x: rt.number,
+  y: rt.union([rt.number, rt.null]),
+});
+
+export const APMTpmBucketsRT = rt.type({
+  key: rt.string,
+  dataPoints: rt.array(APMDataPointRT),
+});
+
+export const APMChartResponseRT = rt.type({
+  apmTimeseries: rt.intersection([
+    rt.type({
+      responseTimes: rt.type({
+        avg: rt.array(APMDataPointRT),
+        p95: rt.array(APMDataPointRT),
+        p99: rt.array(APMDataPointRT),
+      }),
+      tpmBuckets: rt.array(APMTpmBucketsRT),
+    }),
+    rt.partial({
+      overallAvgDuration: rt.union([rt.number, rt.null]),
+    }),
+  ]),
+});
+
+export const APMServiceResponseRT = rt.type({
+  hasHistoricalData: rt.boolean,
+  hasLegacyData: rt.boolean,
+  items: rt.array(
+    rt.type({
+      agentName: rt.string,
+      avgResponseTime: rt.number,
+      environments: rt.array(rt.string),
+      errorsPerMinute: rt.number,
+      serviceName: rt.string,
+      transactionsPerMinute: rt.number,
+    })
+  ),
+});
+
+export type InfraApmMetricsRequest = rt.TypeOf<typeof InfraApmMetricsRequestRT>;
+
+export type InfraApmMetricsRequestWrapped = InfraWrappableRequest<InfraApmMetricsRequest>;
+
+export type InfraApmMetrics = rt.TypeOf<typeof InfraApmMetricsRT>;
+
+export type InfraApmMetricsService = rt.TypeOf<typeof InfraApmMetricsServiceRT>;
+
+export type InfraApmMetricsSeries = rt.TypeOf<typeof InfraApmMetricsSeriesRT>;
+
+export type InfraApmMetricsDataPoint = rt.TypeOf<typeof InfraApmMetricsDataPointRT>;
+
+export type InfraApmMetricsTransactionType = rt.TypeOf<typeof InfraApmMetricsTransactionTypeRT>;
+
+export type InfraApmMetricsDataSet = rt.TypeOf<typeof InfraApmMetricsDataSetRT>;
+
+export type APMDataPoint = rt.TypeOf<typeof APMDataPointRT>;
+
+export type APMTpmBuckets = rt.TypeOf<typeof APMTpmBucketsRT>;
+
+export type APMChartResponse = rt.TypeOf<typeof APMChartResponseRT>;

x-pack/legacy/plugins/infra/common/http_api/common.ts

@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import * as rt from 'io-ts';
+
+export const InfraNodeTypeRT = rt.keyof({
+  host: null,
+  container: null,
+  pod: null,
+});
+
+export type InfraNodeType = rt.TypeOf<typeof InfraNodeTypeRT>;

x-pack/legacy/plugins/infra/common/http_api/index.ts

@@ -6,3 +6,4 @@
 
 export * from './log_analysis';
 export * from './metadata_api';
+export * from './apm_metrics_api';

x-pack/legacy/plugins/infra/common/http_api/metadata_api.ts

@@ -6,16 +6,11 @@
 
 import * as rt from 'io-ts';
 import { InfraWrappableRequest } from '../../server/lib/adapters/framework';
-
-export const InfraMetadataNodeTypeRT = rt.keyof({
-  host: null,
-  pod: null,
-  container: null,
-});
+import { InfraNodeTypeRT } from './common';
 
 export const InfraMetadataRequestRT = rt.type({
   nodeId: rt.string,
-  nodeType: InfraMetadataNodeTypeRT,
+  nodeType: InfraNodeTypeRT,
   sourceId: rt.string,
 });
 
@@ -98,5 +93,3 @@ export type InfraMetadataMachine = rt.TypeOf<typeof InfraMetadataMachineRT>;
 export type InfraMetadataHost = rt.TypeOf<typeof InfraMetadataHostRT>;
 
 export type InfraMetadataOS = rt.TypeOf<typeof InfraMetadataOSRT>;
-
-export type InfraMetadataNodeType = rt.TypeOf<typeof InfraMetadataNodeTypeRT>;

x-pack/legacy/plugins/infra/server/routes/metadata/lib/get_id_field_name.ts → x-pack/legacy/plugins/infra/common/utils/get_apm_field_name.ts

@@ -4,9 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { InfraSourceConfiguration } from '../../../lib/sources';
+import { InfraSourceConfiguration } from '../graphql/types';
+import { InfraNodeType } from '../http_api/common';
 
-export const getIdFieldName = (sourceConfiguration: InfraSourceConfiguration, nodeType: string) => {
+export const getApmFieldName = (
+  sourceConfiguration: InfraSourceConfiguration,
+  nodeType: InfraNodeType
+) => {
+  return nodeType === 'host' ? 'host.hostname' : getIdFieldName(sourceConfiguration, nodeType);
+};
+
+export const getIdFieldName = (
+  sourceConfiguration: InfraSourceConfiguration,
+  nodeType: InfraNodeType
+) => {
   switch (nodeType) {
     case 'host':
       return sourceConfiguration.fields.host;

x-pack/legacy/plugins/infra/package.json

@@ -8,12 +8,11 @@
     "build-graphql-types": "node scripts/generate_types_from_graphql.js"
   },
   "devDependencies": {
-    "@types/boom": "7.2.1",
     "@types/lodash": "^4.14.110"
   },
   "dependencies": {
     "@types/color": "^3.0.0",
     "boom": "7.3.0",
     "lodash": "^4.17.15"
   }
-}
+}