[Metrics UI] Convert layouts to use React components (#49134) (#50982)

* Convert layouts to use React compontents - This PR closes #48808 - Move all files under pages/metrics * Renaming layout files; Fixing some types; Removing unused types * Fixing naming issue * Fixing path * Fixing i18n stuff * [Metrics UI] Move toolbars under inventory models * Fixing imports; wrapping code in useMemo to optimize * removing unused imports * Removing prototype page
elastic · Nov 18, 2019 · c2a3991 · c2a3991
1 parent 141fc5c
commit c2a3991
Show file tree

Hide file tree

Showing 59 changed files with 1,390 additions and 1,184 deletions.
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/container/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/container/index.ts
@@ -4,13 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { layout } from './layout';
 import { metrics } from './metrics';
 import { InventoryModel } from '../types';
 
 export const container: InventoryModel = {
   id: 'container',
   requiredModules: ['docker'],
-  layout,
   metrics,
+  requiredMetrics: [
+    'containerOverview',
+    'containerCpuUsage',
+    'containerMemory',
+    'containerNetworkTraffic',
+    'containerDiskIOBytes',
+    'containerDiskIOOps',
+  ],
 };
diff --git a/...mmon/inventory_models/container/layout.ts → ...mon/inventory_models/container/layout.tsx b/...mmon/inventory_models/container/layout.ts → ...mon/inventory_models/container/layout.tsx
@@ -3,30 +3,32 @@
  * 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 { i18n } from '@kbn/i18n';
-import { InventoryDetailLayoutCreator } from '../types';
-import { nginxLayoutCreator } from '../shared/layouts/nginx';
+import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
+import { Section } from '../../../public/pages/metrics/components/section';
+import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { GaugesSectionVis } from '../../../public/pages/metrics/components/gauges_section_vis';
+import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
+import { withTheme } from '../../../../../common/eui_styled_components';
 
-export const layout: InventoryDetailLayoutCreator = theme => [
-  {
-    id: 'containerOverview',
-    label: i18n.translate('xpack.infra.metricDetailPage.containerMetricsLayout.layoutLabel', {
-      defaultMessage: 'Container',
-    }),
-    sections: [
-      {
-        id: 'containerOverview',
-        label: i18n.translate(
-          'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.sectionLabel',
-          {
-            defaultMessage: 'Overview',
-          }
-        ),
-        requires: ['docker.cpu', 'docker.memory', 'docker.network'],
-        type: 'gauges',
-        visConfig: {
-          seriesOverrides: {
+export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
+  <React.Fragment>
+    <Section
+      navLabel={i18n.translate('xpack.infra.metricDetailPage.containerMetricsLayout.layoutLabel', {
+        defaultMessage: 'Container',
+      })}
+      sectionLabel={i18n.translate(
+        'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.sectionLabel',
+        {
+          defaultMessage: 'Container Overview',
+        }
+      )}
+      metrics={metrics}
+    >
+      <SubSection id="containerOverview">
+        <GaugesSectionVis
+          seriesOverrides={{
             cpu: {
               name: i18n.translate(
                 'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.cpuUsageSeriesLabel',
@@ -71,62 +73,59 @@ export const layout: InventoryDetailLayoutCreator = theme => [
               formatter: 'bits',
               formatterTemplate: '{{value}}/s',
             },
-          },
-        },
-      },
-      {
-        id: 'containerCpuUsage',
-        label: i18n.translate(
+          }}
+        />
+      </SubSection>
+      <SubSection
+        id="containerCpuUsage"
+        label={i18n.translate(
           'xpack.infra.metricDetailPage.containerMetricsLayout.cpuUsageSection.sectionLabel',
           {
             defaultMessage: 'CPU Usage',
           }
-        ),
-        requires: ['docker.cpu'],
-        type: 'chart',
-        visConfig: {
-          stacked: true,
-          type: 'area',
-          formatter: 'percent',
-          seriesOverrides: {
+        )}
+      >
+        <ChartSectionVis
+          stacked={true}
+          type="area"
+          formatter="percent"
+          seriesOverrides={{
             cpu: { color: theme.eui.euiColorVis1 },
-          },
-        },
-      },
-      {
-        id: 'containerMemory',
-        label: i18n.translate(
+          }}
+        />
+      </SubSection>
+      <SubSection
+        id="containerMemory"
+        label={i18n.translate(
           'xpack.infra.metricDetailPage.containerMetricsLayout.memoryUsageSection.sectionLabel',
           {
             defaultMessage: 'Memory Usage',
           }
-        ),
-        requires: ['docker.memory'],
-        type: 'chart',
-        visConfig: {
-          stacked: true,
-          type: 'area',
-          formatter: 'percent',
-          seriesOverrides: {
+        )}
+      >
+        <ChartSectionVis
+          stacked={true}
+          type="area"
+          formatter="percent"
+          seriesOverrides={{
             memory: { color: theme.eui.euiColorVis1 },
-          },
-        },
-      },
-      {
-        id: 'containerNetworkTraffic',
-        label: i18n.translate(
+          }}
+        />
+      </SubSection>
+      <SubSection
+        id="containerNetworkTraffic"
+        label={i18n.translate(
           'xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.sectionLabel',
           {
             defaultMessage: 'Network Traffic',
           }
-        ),
-        requires: ['docker.network'],
-        type: 'chart',
-        visConfig: {
-          formatter: 'bits',
-          formatterTemplate: '{{value}}/s',
-          type: 'area',
-          seriesOverrides: {
+        )}
+      >
+        <ChartSectionVis
+          formatter="bits"
+          formatterTemplate="{{value}}/s"
+          type="area"
+          seriesOverrides={{
             rx: {
               color: theme.eui.euiColorVis1,
               name: i18n.translate(
@@ -145,24 +144,23 @@ export const layout: InventoryDetailLayoutCreator = theme => [
                 }
               ),
             },
-          },
-        },
-      },
-      {
-        id: 'containerDiskIOOps',
-        label: i18n.translate(
+          }}
+        />
+      </SubSection>
+      <SubSection
+        id="containerDiskIOOps"
+        label={i18n.translate(
           'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.sectionLabel',
           {
             defaultMessage: 'Disk IO (Ops)',
           }
-        ),
-        requires: ['docker.diskio'],
-        type: 'chart',
-        visConfig: {
-          formatter: 'number',
-          formatterTemplate: '{{value}}/s',
-          type: 'area',
-          seriesOverrides: {
+        )}
+      >
+        <ChartSectionVis
+          type="area"
+          formatterTemplate="{{value}}/s"
+          formatter="number"
+          seriesOverrides={{
             read: {
               color: theme.eui.euiColorVis1,
               name: i18n.translate(
@@ -181,24 +179,23 @@ export const layout: InventoryDetailLayoutCreator = theme => [
                 }
               ),
             },
-          },
-        },
-      },
-      {
-        id: 'containerDiskIOBytes',
-        label: i18n.translate(
+          }}
+        />
+      </SubSection>
+      <SubSection
+        id="containerDiskIOBytes"
+        label={i18n.translate(
           'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.sectionLabel',
           {
             defaultMessage: 'Disk IO (Bytes)',
           }
-        ),
-        requires: ['docker.diskio'],
-        type: 'chart',
-        visConfig: {
-          formatter: 'bytes',
-          formatterTemplate: '{{value}}/s',
-          type: 'area',
-          seriesOverrides: {
+        )}
+      >
+        <ChartSectionVis
+          type="area"
+          formatter="bytes"
+          formatterTemplate="{{value}}/s"
+          seriesOverrides={{
             read: {
               color: theme.eui.euiColorVis1,
               name: i18n.translate(
@@ -217,10 +214,9 @@ export const layout: InventoryDetailLayoutCreator = theme => [
                 }
               ),
             },
-          },
-        },
-      },
-    ],
-  },
-  ...nginxLayoutCreator(theme),
-];
+          }}
+        />
+      </SubSection>
+    </Section>
+  </React.Fragment>
+));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/container/metrics/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/container/metrics/index.ts
@@ -29,4 +29,5 @@ export const metrics: InventoryMetrics = {
     containerMemory,
   },
   snapshot: { cpu, memory, rx, tx },
+  defaultSnapshot: 'cpu',
 };
diff --git a/...tory/toolbars/container_toolbar_items.tsx → ...entory_models/container/toolbar_items.tsx b/...tory/toolbars/container_toolbar_items.tsx → ...entory_models/container/toolbar_items.tsx
@@ -6,11 +6,14 @@
 
 import React, { useMemo } from 'react';
 import { EuiFlexItem } from '@elastic/eui';
-import { ToolbarProps } from './toolbar';
-import { WaffleMetricControls } from '../../waffle/waffle_metric_controls';
-import { WaffleGroupByControls } from '../../waffle/waffle_group_by_controls';
-import { InfraSnapshotMetricType } from '../../../graphql/types';
-import { toMetricOpt, toGroupByOpt } from './toolbar_wrapper';
+import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
+import { WaffleMetricControls } from '../../../public/components/waffle/waffle_metric_controls';
+import { WaffleGroupByControls } from '../../../public/components/waffle/waffle_group_by_controls';
+import { InfraSnapshotMetricType } from '../../../public/graphql/types';
+import {
+  toMetricOpt,
+  toGroupByOpt,
+} from '../../../public/components/inventory/toolbars/toolbar_wrapper';
 
 export const ContainerToolbarItems = (props: ToolbarProps) => {
   const options = useMemo(

diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/host/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/host/index.ts
@@ -4,13 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { layout } from './layout';
 import { metrics } from './metrics';
 import { InventoryModel } from '../types';
+import {
+  aws as awsRequiredMetrics,
+  nginx as nginxRequireMetrics,
+} from '../shared/metrics/required_metrics';
 
 export const host: InventoryModel = {
   id: 'host',
   requiredModules: ['system'],
-  layout,
   metrics,
+  requiredMetrics: [
+    'hostSystemOverview',
+    'hostCpuUsage',
+    'hostLoad',
+    'hostMemoryUsage',
+    'hostNetworkTraffic',
+    'hostK8sOverview',
+    'hostK8sCpuCap',
+    'hostK8sMemoryCap',
+    'hostK8sDiskCap',
+    'hostK8sPodCap',
+    ...awsRequiredMetrics,
+    ...nginxRequireMetrics,
+  ],
 };