From 437adb58805e3b524851de4b9727d7e3951c3f4c Mon Sep 17 00:00:00 2001
From: Mat Schaffer <mat@elastic.co>
Date: Wed, 30 Mar 2022 00:13:35 +0900
Subject: [PATCH] [Stack Monitoring] Rename "APM & Fleet Server" to
 "Integrations Server" (#128574)

---
 .../dev_docs/how_to/running_components_from_source.md     | 2 +-
 .../monitoring/public/components/apm/apm_metrics.tsx      | 6 ++----
 .../public/components/cluster/overview/apm_panel.js       | 8 ++++----
 x-pack/plugins/monitoring/public/lib/apm_agent.ts         | 5 +++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/monitoring/dev_docs/how_to/running_components_from_source.md b/x-pack/plugins/monitoring/dev_docs/how_to/running_components_from_source.md
index fcb3bae429e7c..2008d913238f5 100644
--- a/x-pack/plugins/monitoring/dev_docs/how_to/running_components_from_source.md
+++ b/x-pack/plugins/monitoring/dev_docs/how_to/running_components_from_source.md
@@ -323,7 +323,7 @@ And start it with:
 ./apm-server -c apm-server.source.yml -e -d "*"
 ```
 
-Note that on cloud the APM server section will show up as "APM & Fleet Server", but the code paths are the same.
+Note that on cloud the APM server section will show up as "Integrations Server" (previously "APM & Fleet"), but the code paths are the same.
 
 ## Logstash
 
diff --git a/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx b/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx
index c4e5c51856013..2f6eea57b6090 100644
--- a/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx
+++ b/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx
@@ -22,8 +22,6 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 // @ts-ignore could not find declaration file
 import { MonitoringTimeseriesContainer } from '../chart';
-// @ts-ignore could not find declaration file
-import { Status } from './instance/status';
 import { checkAgentTypeMetric } from '../../lib/apm_agent';
 
 interface TitleType {
@@ -63,12 +61,12 @@ const getHeading = (isFleetTypeMetric: boolean) => {
   const titles: TitleType = {};
   if (isFleetTypeMetric) {
     titles.title = i18n.translate('xpack.monitoring.apm.metrics.topCharts.agentTitle', {
-      defaultMessage: 'APM & Fleet Server - Resource Usage',
+      defaultMessage: 'Integrations Server - Resource Usage',
     });
     titles.heading = (
       <FormattedMessage
         id="xpack.monitoring.apm.metrics.agentHeading"
-        defaultMessage="APM & Fleet Server"
+        defaultMessage="Integrations Server"
       />
     );
     return titles;
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js
index 2a2e6719ab268..24b1d508bb3c1 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js
@@ -39,14 +39,14 @@ const getServerTitle = (isFleetTypeMetric, total) => {
     linkLabel.link = (
       <FormattedMessage
         id="xpack.monitoring.cluster.overview.apmPanel.agentServersTotalLinkLabel"
-        defaultMessage="APM & Fleet Servers: {apmsTotal}"
+        defaultMessage="Integrations Servers: {apmsTotal}"
         values={{ apmsTotal }}
       />
     );
     linkLabel.aria = i18n.translate(
       'xpack.monitoring.cluster.overview.apmPanel.instancesAndFleetsTotalLinkAriaLabel',
       {
-        defaultMessage: 'APM and Fleet server instances: {apmsTotal}',
+        defaultMessage: 'Integrations server instances: {apmsTotal}',
         values: { apmsTotal },
       }
     );
@@ -73,7 +73,7 @@ const getServerTitle = (isFleetTypeMetric, total) => {
 const getOverviewTitle = (isFleetTypeMetric) => {
   if (isFleetTypeMetric) {
     return i18n.translate('xpack.monitoring.cluster.overview.apmPanel.overviewFleetLinkLabel', {
-      defaultMessage: 'APM & Fleet server overview',
+      defaultMessage: 'Integrations server overview',
     });
   }
   return i18n.translate('xpack.monitoring.cluster.overview.apmPanel.overviewLinkLabel', {
@@ -84,7 +84,7 @@ const getOverviewTitle = (isFleetTypeMetric) => {
 const getHeadingTitle = (isFleetTypeMetric) => {
   if (isFleetTypeMetric) {
     return i18n.translate('xpack.monitoring.cluster.overview.apmPanel.apmFleetTitle', {
-      defaultMessage: 'APM & Fleet server',
+      defaultMessage: 'Integrations server',
     });
   }
   return i18n.translate('xpack.monitoring.cluster.overview.apmPanel.apmTitle', {
diff --git a/x-pack/plugins/monitoring/public/lib/apm_agent.ts b/x-pack/plugins/monitoring/public/lib/apm_agent.ts
index 09419b7c91bf0..bf992cc560d1e 100644
--- a/x-pack/plugins/monitoring/public/lib/apm_agent.ts
+++ b/x-pack/plugins/monitoring/public/lib/apm_agent.ts
@@ -8,8 +8,9 @@
 import { Legacy } from '../legacy_shims';
 
 /**
- * Possible temporary work arround to establish if APM might also be monitoring fleet:
- * https://github.com/elastic/kibana/pull/95129/files#r604815886
+ * Checks if on cloud and >= 7.13
+ * In this configuration APM server should be running within elastic agent.
+ * See https://github.com/elastic/kibana/issues/97879 for details.
  */
 export const checkAgentTypeMetric = (versions?: string[]) => {
   if (!Legacy.shims.isCloud || !versions) {