Merged local branch (#99157)

x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx

@@ -65,6 +65,7 @@ const getHeading = (isFleetTypeMetric: boolean) => {
         defaultMessage="APM & Fleet Server"
       />
     );
+    return titles;
   }
   titles.title = i18n.translate('xpack.monitoring.apm.metrics.topCharts.title', {
     defaultMessage: 'APM Server - Resource Usage',

x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js

@@ -50,6 +50,7 @@ const getServerTitle = (isFleetTypeMetric, total) => {
         values: { apmsTotal },
       }
     );
+    return linkLabel;
   }
   linkLabel.link = (
     <FormattedMessage

x-pack/plugins/monitoring/public/lib/apm_agent.ts

@@ -15,12 +15,14 @@ export const checkAgentTypeMetric = (versions?: string[]) => {
   if (!Legacy.shims.isCloud || !versions) {
     return false;
   }
+  let criteriaPassed = false;
   versions.forEach((version) => {
     const [major, minor] = version.split('.');
     const majorInt = Number(major);
     if (majorInt > 7 || (majorInt === 7 && Number(minor) >= 13)) {
-      return true;
+      criteriaPassed = true;
+      return;
     }
   });
-  return false;
+  return criteriaPassed;
 };