[8.x] [Infra] Display "Add metrics" callout for all contain…

…ers without metrics (#202220) (#202465) # Backport This will backport the following commits from `main` to `8.x`: - [[Infra] Display "Add metrics" callout for all containers without metrics (#202220)](#202220)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Irene Blanco <[email protected]>
elastic · Dec 2, 2024 · 3082d5a · 3082d5a
1 parent 7ed5b12
commit 3082d5a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/...rvability_solution/infra/public/components/asset_details/add_metrics_callout/constants.ts b/...rvability_solution/infra/public/components/asset_details/add_metrics_callout/constants.ts
@@ -62,7 +62,7 @@ const containerDefaultActions = (
   return {
     actions: {
       primary: {
-        href: locator?.getRedirectUrl({ category: OnboardingFlow.Infra }),
+        href: locator?.getRedirectUrl({ category: OnboardingFlow.Hosts }),
         label: defaultPrimaryActionLabel,
       },
       link: {

diff --git a/...ability_solution/infra/public/components/asset_details/tabs/metrics/container_metrics.tsx b/...ability_solution/infra/public/components/asset_details/tabs/metrics/container_metrics.tsx
@@ -14,6 +14,7 @@ import { MetricsTemplate } from './metrics_template';
 import { DockerCharts, KubernetesContainerCharts } from '../../charts';
 import { DOCKER_METRIC_TYPES, INTEGRATIONS, KUBERNETES_METRIC_TYPES } from '../../constants';
 import { useIntegrationCheck } from '../../hooks/use_integration_check';
+import { AddMetricsCallout } from '../../add_metrics_callout';
 
 export const ContainerMetrics = () => {
   const ref = useRef<HTMLDivElement>(null);
@@ -29,7 +30,7 @@ export const ContainerMetrics = () => {
   });
 
   if (!isDockerContainer && !isKubernetesContainer) {
-    return null;
+    return <AddMetricsCallout id="containerMetrics" />;
   }
 
   return (

diff --git a/...s/observability_solution/infra/public/components/asset_details/tabs/overview/overview.tsx b/...s/observability_solution/infra/public/components/asset_details/tabs/overview/overview.tsx
@@ -27,8 +27,6 @@ import { AddMetricsCallout } from '../../add_metrics_callout';
 import { AddMetricsCalloutKey } from '../../add_metrics_callout/constants';
 import { useEntitySummary } from '../../hooks/use_entity_summary';
 import { isMetricsSignal } from '../../utils/get_data_stream_types';
-import { INTEGRATIONS } from '../../constants';
-import { useIntegrationCheck } from '../../hooks/use_integration_check';
 
 export const Overview = () => {
   const { dateRange } = useDatePickerContext();
@@ -50,10 +48,6 @@ export const Overview = () => {
     `infra.dismissedAddMetricsCallout.${addMetricsCalloutId}`,
     false
   );
-  const isDockerContainer = useIntegrationCheck({ dependsOn: INTEGRATIONS.docker });
-  const isKubernetesContainer = useIntegrationCheck({
-    dependsOn: INTEGRATIONS.kubernetesContainer,
-  });
 
   const metadataSummarySection = isFullPageView ? (
     <MetadataSummaryList metadata={metadata} loading={metadataLoading} assetType={asset.type} />
@@ -74,13 +68,7 @@ export const Overview = () => {
       return false;
     }
 
-    const { type } = asset;
-    const baseCondition = !isMetricsSignal(dataStreams);
-
-    const isRelevantContainer =
-      type === 'container' && (isDockerContainer || isKubernetesContainer);
-
-    return baseCondition && (type === 'host' || isRelevantContainer);
+    return !isMetricsSignal(dataStreams);
   };
 
   const showAddMetricsCallout = shouldShowCallout();

diff --git a/...plugins/observability_solution/infra/public/components/shared/templates/no_data_config.ts b/...plugins/observability_solution/infra/public/components/shared/templates/no_data_config.ts
@@ -18,7 +18,7 @@ import { noMetricIndicesPromptDescription, noMetricIndicesPromptTitle } from '..
 
 export enum OnboardingFlow {
   Infra = 'infra',
-  Hosts = 'logs',
+  Hosts = 'host',
 }
 
 interface NoDataConfigDetails {

diff --git a/x-pack/test/functional/apps/infra/hosts_view.ts b/x-pack/test/functional/apps/infra/hosts_view.ts
@@ -342,7 +342,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           const currentUrl = await browser.getCurrentUrl();
           const parsedUrl = new URL(currentUrl);
           const baseUrl = `${parsedUrl.protocol}//${parsedUrl.host}`;
-          const expectedUrlPattern = `${baseUrl}/app/observabilityOnboarding/?category=logs`;
+          const expectedUrlPattern = `${baseUrl}/app/observabilityOnboarding/?category=host`;
           expect(currentUrl).to.equal(expectedUrlPattern);
         });
       });