fix conflicts after metric_data_access has been moved to observabilit…

…y_solution
elastic · May 2, 2024 · 6f1973f · 6f1973f
1 parent da0639f
commit 6f1973f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/...lution/infra/public/pages/metrics/hosts/components/host_details_flyout/flyout_wrapper.tsx b/...lution/infra/public/pages/metrics/hosts/components/host_details_flyout/flyout_wrapper.tsx
@@ -10,7 +10,7 @@ import { useSourceContext } from '../../../../../containers/metrics_source';
 import { useUnifiedSearchContext } from '../../hooks/use_unified_search';
 import type { HostNodeRow } from '../../hooks/use_hosts_table';
 import { AssetDetails } from '../../../../../components/asset_details';
-import { commonFlyoutTabs } from '../../../../../common/asset_details_config/asset_details_tabs';
+import { hostDetailsTabs } from '../../../../../common/asset_details_config/asset_details_tabs';
 
 export interface Props {
   node: HostNodeRow;
@@ -32,7 +32,7 @@ export const FlyoutWrapper = ({ node: { name }, closeFlyout }: Props) => {
           showActionsColumn: true,
         },
       }}
-      tabs={commonFlyoutTabs}
+      tabs={hostDetailsTabs}
       links={['nodeDetails']}
       renderMode={{
         mode: 'flyout',

diff --git a/...ry_models/container/metrics/charts/cpu.ts → ...ry_models/container/metrics/charts/cpu.ts b/...ry_models/container/metrics/charts/cpu.ts → ...ry_models/container/metrics/charts/cpu.ts
diff --git a/..._models/container/metrics/charts/index.ts → ..._models/container/metrics/charts/index.ts b/..._models/container/metrics/charts/index.ts → ..._models/container/metrics/charts/index.ts
diff --git a/...models/container/metrics/charts/memory.ts → ...models/container/metrics/charts/memory.ts b/...models/container/metrics/charts/memory.ts → ...models/container/metrics/charts/memory.ts
diff --git a/..._models/container/metrics/formulas/cpu.ts → ..._models/container/metrics/formulas/cpu.ts b/..._models/container/metrics/formulas/cpu.ts → ..._models/container/metrics/formulas/cpu.ts
diff --git a/...odels/container/metrics/formulas/index.ts → ...odels/container/metrics/formulas/index.ts b/...odels/container/metrics/formulas/index.ts → ...odels/container/metrics/formulas/index.ts
diff --git a/...dels/container/metrics/formulas/memory.ts → ...dels/container/metrics/formulas/memory.ts b/...dels/container/metrics/formulas/memory.ts → ...dels/container/metrics/formulas/memory.ts
diff --git a/...rvability_solution/metrics_data_access/common/inventory_models/container/metrics/index.ts b/...rvability_solution/metrics_data_access/common/inventory_models/container/metrics/index.ts
@@ -10,18 +10,17 @@ import { cpu } from './snapshot/cpu';
 import { memory } from './snapshot/memory';
 import { rx } from './snapshot/rx';
 import { tx } from './snapshot/tx';
-
-import { containerOverview } from './tsvb/container_overview';
-import { containerCpuUsage } from './tsvb/container_cpu_usage';
 import { containerCpuKernel } from './tsvb/container_cpu_kernel';
+import { containerCpuUsage } from './tsvb/container_cpu_usage';
 import { containerDiskIOOps } from './tsvb/container_diskio_ops';
 import { containerDiskIOBytes } from './tsvb/container_disk_io_bytes';
-import { containerMemory } from './tsvb/container_memory';
-import { containerNetworkTraffic } from './tsvb/container_network_traffic';
-import { containerK8sOverview } from './tsvb/container_k8s_overview';
 import { containerK8sCpuUsage } from './tsvb/container_k8s_cpu_usage';
 import { containerK8sMemoryUsage } from './tsvb/container_k8s_memory_usage';
-import { ContainerFormulas } from './formulas';
+import { containerK8sOverview } from './tsvb/container_k8s_overview';
+import { containerMemory } from './tsvb/container_memory';
+import { containerNetworkTraffic } from './tsvb/container_network_traffic';
+import { containerOverview } from './tsvb/container_overview';
+import type { ContainerFormulas } from './formulas';
 import { ContainerCharts } from './charts';
 
 const containerSnapshotMetrics = { cpu, memory, rx, tx };