[APM] Remote Agent Config: Add additional (java) options

x-pack/legacy/plugins/apm/public/components/app/Main/route_config/index.tsx

@@ -23,6 +23,10 @@ import { resolveUrlParams } from '../../../../context/UrlParamsContext/resolveUr
 import { UNIDENTIFIED_SERVICE_NODES_LABEL } from '../../../../../../../../plugins/apm/common/i18n';
 import { TraceLink } from '../../TraceLink';
 import { CustomizeUI } from '../../Settings/CustomizeUI';
+import {
+  EditAgentConfigurationRouteHandler,
+  CreateAgentConfigurationRouteHandler
+} from './route_handlers/agent_configuration';
 
 const metricsBreadcrumb = i18n.translate('xpack.apm.breadcrumb.metricsTitle', {
   defaultMessage: 'Metrics'
@@ -101,12 +105,31 @@ export const routes: BreadcrumbRoute[] = [
     ),
     breadcrumb: i18n.translate(
       'xpack.apm.breadcrumb.settings.agentConfigurationTitle',
-      {
-        defaultMessage: 'Agent Configuration'
-      }
+      { defaultMessage: 'Agent Configuration' }
     ),
     name: RouteName.AGENT_CONFIGURATION
   },
+
+  {
+    exact: true,
+    path: '/settings/agent-configuration/create',
+    breadcrumb: i18n.translate(
+      'xpack.apm.breadcrumb.settings.createAgentConfigurationTitle',
+      { defaultMessage: 'Create Agent Configuration' }
+    ),
+    name: RouteName.AGENT_CONFIGURATION_CREATE,
+    component: () => <CreateAgentConfigurationRouteHandler />
+  },
+  {
+    exact: true,
+    path: '/settings/agent-configuration/edit',
+    breadcrumb: i18n.translate(
+      'xpack.apm.breadcrumb.settings.editAgentConfigurationTitle',
+      { defaultMessage: 'Edit Agent Configuration' }
+    ),
+    name: RouteName.AGENT_CONFIGURATION_EDIT,
+    component: () => <EditAgentConfigurationRouteHandler />
+  },
   {
     exact: true,
     path: '/services/:serviceName',

x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx

@@ -0,0 +1,56 @@
+/*
+ * 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 React from 'react';
+import { useFetcher } from '../../../../../hooks/useFetcher';
+import { history } from '../../../../../utils/history';
+import { Settings } from '../../../Settings';
+import { AgentConfigurationCreateEdit } from '../../../Settings/AgentConfigurations/AgentConfigurationCreateEdit';
+import { toQuery } from '../../../../shared/Links/url_helpers';
+
+export function EditAgentConfigurationRouteHandler() {
+  const { search } = history.location;
+
+  // typescript complains because `pageStop` does not exist in `APMQueryParams`
+  // Going forward we should move away from globally declared query params and this is a first step
+  // @ts-ignore
+  const { name, environment, pageStep } = toQuery(search);
+
+  const res = useFetcher(
+    callApmApi => {
+      return callApmApi({
+        pathname: '/api/apm/settings/agent-configuration/view',
+        params: { query: { name, environment } }
+      });
+    },
+    [name, environment]
+  );
+
+  return (
+    <Settings>
+      <AgentConfigurationCreateEdit
+        pageStep={pageStep || 'choose-settings-step'}
+        existingConfigResult={res}
+      />
+    </Settings>
+  );
+}
+
+export function CreateAgentConfigurationRouteHandler() {
+  const { search } = history.location;
+
+  // Ignoring here because we specifically DO NOT want to add the query params to the global route handler
+  // @ts-ignore
+  const { pageStep } = toQuery(search);
+
+  return (
+    <Settings>
+      <AgentConfigurationCreateEdit
+        pageStep={pageStep || 'choose-service-step'}
+      />
+    </Settings>
+  );
+}

x-pack/legacy/plugins/apm/public/components/app/Main/route_config/route_names.tsx

@@ -20,6 +20,8 @@ export enum RouteName {
   TRANSACTION_NAME = 'transaction_name',
   SETTINGS = 'settings',
   AGENT_CONFIGURATION = 'agent_configuration',
+  AGENT_CONFIGURATION_CREATE = 'agent_configuration_create',
+  AGENT_CONFIGURATION_EDIT = 'agent_configuration_edit',
   INDICES = 'indices',
   SERVICE_NODES = 'nodes',
   LINK_TO_TRACE = 'link_to_trace',