Revert "[7.x] [Metrics UI] Add inventory metric threshold alerts (#64292

) (#65287)" This reverts commit d6b19b7.
elastic · May 5, 2020 · 305a821 · 305a821
1 parent 1fed9f0
commit 305a821
Show file tree

Hide file tree

Showing 58 changed files with 497 additions and 1,995 deletions.
diff --git a/x-pack/plugins/infra/common/formatters/snapshot_metric_formats.ts b/x-pack/plugins/infra/common/formatters/snapshot_metric_formats.ts
diff --git a/x-pack/plugins/infra/common/formatters/types.ts b/x-pack/plugins/infra/common/formatters/types.ts
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
@@ -11,29 +11,27 @@ import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_
 import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
-export const ec2MetricTypes: SnapshotMetricType[] = [
-  'cpu',
-  'rx',
-  'tx',
-  'diskIOReadBytes',
-  'diskIOWriteBytes',
-];
-
-export const ec2groupByFields = [
-  'cloud.availability_zone',
-  'cloud.machine.type',
-  'aws.ec2.instance.image.id',
-  'aws.ec2.instance.state.name',
-];
-
 export const AwsEC2ToolbarItems = (props: ToolbarProps) => {
+  const metricTypes: SnapshotMetricType[] = [
+    'cpu',
+    'rx',
+    'tx',
+    'diskIOReadBytes',
+    'diskIOWriteBytes',
+  ];
+  const groupByFields = [
+    'cloud.availability_zone',
+    'cloud.machine.type',
+    'aws.ec2.instance.image.id',
+    'aws.ec2.instance.state.name',
+  ];
   return (
     <>
       <CloudToolbarItems {...props} />
       <MetricsAndGroupByToolbarItems
         {...props}
-        metricTypes={ec2MetricTypes}
-        groupByFields={ec2groupByFields}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
       />
     </>
   );

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
@@ -11,28 +11,26 @@ import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_
 import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
-export const rdsMetricTypes: SnapshotMetricType[] = [
-  'cpu',
-  'rdsConnections',
-  'rdsQueriesExecuted',
-  'rdsActiveTransactions',
-  'rdsLatency',
-];
-
-export const rdsGroupByFields = [
-  'cloud.availability_zone',
-  'aws.rds.db_instance.class',
-  'aws.rds.db_instance.status',
-];
-
 export const AwsRDSToolbarItems = (props: ToolbarProps) => {
+  const metricTypes: SnapshotMetricType[] = [
+    'cpu',
+    'rdsConnections',
+    'rdsQueriesExecuted',
+    'rdsActiveTransactions',
+    'rdsLatency',
+  ];
+  const groupByFields = [
+    'cloud.availability_zone',
+    'aws.rds.db_instance.class',
+    'aws.rds.db_instance.status',
+  ];
   return (
     <>
       <CloudToolbarItems {...props} />
       <MetricsAndGroupByToolbarItems
         {...props}
-        metricTypes={rdsMetricTypes}
-        groupByFields={rdsGroupByFields}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
       />
     </>
   );

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
@@ -11,24 +11,22 @@ import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_
 import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
-export const s3MetricTypes: SnapshotMetricType[] = [
-  's3BucketSize',
-  's3NumberOfObjects',
-  's3TotalRequests',
-  's3DownloadBytes',
-  's3UploadBytes',
-];
-
-export const s3GroupByFields = ['cloud.region'];
-
 export const AwsS3ToolbarItems = (props: ToolbarProps) => {
+  const metricTypes: SnapshotMetricType[] = [
+    's3BucketSize',
+    's3NumberOfObjects',
+    's3TotalRequests',
+    's3DownloadBytes',
+    's3UploadBytes',
+  ];
+  const groupByFields = ['cloud.region'];
   return (
     <>
       <CloudToolbarItems {...props} />
       <MetricsAndGroupByToolbarItems
         {...props}
-        metricTypes={s3MetricTypes}
-        groupByFields={s3GroupByFields}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
       />
     </>
   );

diff --git a/x-pack/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
@@ -11,23 +11,22 @@ import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_
 import { CloudToolbarItems } from '../shared/components/cloud_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
-export const sqsMetricTypes: SnapshotMetricType[] = [
-  'sqsMessagesVisible',
-  'sqsMessagesDelayed',
-  'sqsMessagesSent',
-  'sqsMessagesEmpty',
-  'sqsOldestMessage',
-];
-export const sqsGroupByFields = ['cloud.region'];
-
 export const AwsSQSToolbarItems = (props: ToolbarProps) => {
+  const metricTypes: SnapshotMetricType[] = [
+    'sqsMessagesVisible',
+    'sqsMessagesDelayed',
+    'sqsMessagesSent',
+    'sqsMessagesEmpty',
+    'sqsOldestMessage',
+  ];
+  const groupByFields = ['cloud.region'];
   return (
     <>
       <CloudToolbarItems {...props} />
       <MetricsAndGroupByToolbarItems
         {...props}
-        metricTypes={sqsMetricTypes}
-        groupByFields={sqsGroupByFields}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
       />
     </>
   );

diff --git a/x-pack/plugins/infra/common/inventory_models/container/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/container/toolbar_items.tsx
@@ -10,22 +10,21 @@ import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/compo
 import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
-export const containerMetricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'rx', 'tx'];
-export const containerGroupByFields = [
-  'host.name',
-  'cloud.availability_zone',
-  'cloud.machine.type',
-  'cloud.project.id',
-  'cloud.provider',
-  'service.type',
-];
-
 export const ContainerToolbarItems = (props: ToolbarProps) => {
+  const metricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'rx', 'tx'];
+  const groupByFields = [
+    'host.name',
+    'cloud.availability_zone',
+    'cloud.machine.type',
+    'cloud.project.id',
+    'cloud.provider',
+    'service.type',
+  ];
   return (
     <MetricsAndGroupByToolbarItems
       {...props}
-      metricTypes={containerMetricTypes}
-      groupByFields={containerGroupByFields}
+      metricTypes={metricTypes}
+      groupByFields={groupByFields}
     />
   );
 };
diff --git a/x-pack/plugins/infra/common/inventory_models/host/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/host/toolbar_items.tsx
@@ -10,27 +10,20 @@ import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/compo
 import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
-export const hostMetricTypes: SnapshotMetricType[] = [
-  'cpu',
-  'memory',
-  'load',
-  'rx',
-  'tx',
-  'logRate',
-];
-export const hostGroupByFields = [
-  'cloud.availability_zone',
-  'cloud.machine.type',
-  'cloud.project.id',
-  'cloud.provider',
-  'service.type',
-];
 export const HostToolbarItems = (props: ToolbarProps) => {
+  const metricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'load', 'rx', 'tx', 'logRate'];
+  const groupByFields = [
+    'cloud.availability_zone',
+    'cloud.machine.type',
+    'cloud.project.id',
+    'cloud.provider',
+    'service.type',
+  ];
   return (
     <MetricsAndGroupByToolbarItems
       {...props}
-      metricTypes={hostMetricTypes}
-      groupByFields={hostGroupByFields}
+      metricTypes={metricTypes}
+      groupByFields={groupByFields}
     />
   );
 };
diff --git a/x-pack/plugins/infra/common/inventory_models/pod/toolbar_items.tsx b/x-pack/plugins/infra/common/inventory_models/pod/toolbar_items.tsx
@@ -10,15 +10,14 @@ import { ToolbarProps } from '../../../public/pages/metrics/inventory_view/compo
 import { MetricsAndGroupByToolbarItems } from '../shared/components/metrics_and_groupby_toolbar_items';
 import { SnapshotMetricType } from '../types';
 
-export const podMetricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'rx', 'tx'];
-export const podGroupByFields = ['kubernetes.namespace', 'kubernetes.node.name', 'service.type'];
-
 export const PodToolbarItems = (props: ToolbarProps) => {
+  const metricTypes: SnapshotMetricType[] = ['cpu', 'memory', 'rx', 'tx'];
+  const groupByFields = ['kubernetes.namespace', 'kubernetes.node.name', 'service.type'];
   return (
     <MetricsAndGroupByToolbarItems
       {...props}
-      metricTypes={podMetricTypes}
-      groupByFields={podGroupByFields}
+      metricTypes={metricTypes}
+      groupByFields={groupByFields}
     />
   );
 };
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_dropdown.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { AlertFlyout } from './alert_flyout';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
-export const MetricsAlertDropdown = () => {
+export const AlertDropdown = () => {
   const [popoverOpen, setPopoverOpen] = useState(false);
   const [flyoutVisible, setFlyoutVisible] = useState(false);
   const kibana = useKibana();