From dab964a065c1bd8ef625a0913bed7f1651aca030 Mon Sep 17 00:00:00 2001
From: Phillip Burch <phillip.burch@live.com>
Date: Thu, 14 May 2020 10:30:01 -0500
Subject: [PATCH 1/3] Fix alignment and allow clearing metric value

---
 .../alerting/inventory/expression.tsx         | 72 ++++++++++++-------
 .../components/alerting/inventory/metric.tsx  | 16 ++---
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx b/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
index c2ee552e31553..c2df776545574 100644
--- a/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
@@ -185,6 +185,31 @@ export const Expressions: React.FC<Props> = props => {
     [onFilterChange]
   );
 
+  const preFillAlertCriteria = useCallback(() => {
+    const md = alertsContext.metadata;
+    if (md && md.options) {
+      setAlertParams('criteria', [
+        {
+          ...defaultExpression,
+          metric: md.options.metric!.type,
+        } as InventoryMetricConditions,
+      ]);
+    } else {
+      setAlertParams('criteria', [defaultExpression]);
+    }
+  }, [alertsContext.metadata, setAlertParams]);
+
+  const preFillAlertFilter = useCallback(() => {
+    const md = alertsContext.metadata;
+    if (md && md.filter) {
+      setAlertParams('filterQueryText', md.filter);
+      setAlertParams(
+        'filterQuery',
+        convertKueryToElasticSearchQuery(md.filter, derivedIndexPattern) || ''
+      );
+    }
+  }, [alertsContext.metadata, derivedIndexPattern, setAlertParams]);
+
   useEffect(() => {
     const md = alertsContext.metadata;
     if (!alertParams.nodeType) {
@@ -195,31 +220,19 @@ export const Expressions: React.FC<Props> = props => {
       }
     }
 
-    if (!alertParams.criteria) {
-      if (md && md.options) {
-        setAlertParams('criteria', [
-          {
-            ...defaultExpression,
-            metric: md.options.metric!.type,
-          } as InventoryMetricConditions,
-        ]);
-      } else {
-        setAlertParams('criteria', [defaultExpression]);
-      }
+    if (alertParams.criteria && alertParams.criteria.length) {
+      setTimeSize(alertParams.criteria[0].timeSize);
+      setTimeUnit(alertParams.criteria[0].timeUnit);
+    } else {
+      preFillAlertCriteria();
     }
 
     if (!alertParams.filterQuery) {
-      if (md && md.filter) {
-        setAlertParams('filterQueryText', md.filter);
-        setAlertParams(
-          'filterQuery',
-          convertKueryToElasticSearchQuery(md.filter, derivedIndexPattern) || ''
-        );
-      }
+      preFillAlertFilter();
     }
 
     if (!alertParams.sourceId) {
-      setAlertParams('sourceId', source?.id);
+      setAlertParams('sourceId', source?.id || 'default');
     }
   }, [alertsContext.metadata, derivedIndexPattern, defaultExpression, source]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -235,11 +248,13 @@ export const Expressions: React.FC<Props> = props => {
         </h4>
       </EuiText>
       <StyledExpression>
-        <NodeTypeExpression
-          options={nodeTypes}
-          value={alertParams.nodeType || 'host'}
-          onChange={updateNodeType}
-        />
+        <StyledExpressionRow>
+          <NodeTypeExpression
+            options={nodeTypes}
+            value={alertParams.nodeType || 'host'}
+            onChange={updateNodeType}
+          />
+        </StyledExpressionRow>
       </StyledExpression>
       <EuiSpacer size={'xs'} />
       {alertParams.criteria &&
@@ -426,7 +441,14 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = props => {
             </StyledExpression>
             {metric && (
               <StyledExpression>
-                <div style={{ display: 'flex', alignItems: 'center', height: '100%' }}>
+                <div
+                  style={{
+                    display: 'flex',
+                    alignItems: 'center',
+                    height: '100%',
+                    paddingTop: '4px',
+                  }}
+                >
                   <div>{metricUnit[metric]?.label || ''}</div>
                 </div>
               </StyledExpression>
diff --git a/x-pack/plugins/infra/public/components/alerting/inventory/metric.tsx b/x-pack/plugins/infra/public/components/alerting/inventory/metric.tsx
index faafdf1b81eed..2c72c658ce093 100644
--- a/x-pack/plugins/infra/public/components/alerting/inventory/metric.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/inventory/metric.tsx
@@ -24,7 +24,7 @@ interface Props {
   metric?: { value: SnapshotMetricType; text: string };
   metrics: Array<{ value: string; text: string }>;
   errors: IErrorObject;
-  onChange: (metric: SnapshotMetricType) => void;
+  onChange: (metric?: SnapshotMetricType) => void;
   popupPosition?:
     | 'upCenter'
     | 'upLeft'
@@ -65,11 +65,11 @@ export const MetricExpression = ({ metric, metrics, errors, onChange, popupPosit
             }
           )}
           value={metric?.text || firstFieldOption.text}
-          isActive={aggFieldPopoverOpen || !metric}
+          isActive={Boolean(aggFieldPopoverOpen || (errors.metric && errors.metric.length > 0))}
           onClick={() => {
             setAggFieldPopoverOpen(true);
           }}
-          color={metric ? 'secondary' : 'danger'}
+          color={errors.metric?.length ? 'danger' : 'secondary'}
         />
       }
       isOpen={aggFieldPopoverOpen}
@@ -89,16 +89,12 @@ export const MetricExpression = ({ metric, metrics, errors, onChange, popupPosit
         </ClosablePopoverTitle>
         <EuiFlexGroup>
           <EuiFlexItem grow={false} className="actOf__aggFieldContainer">
-            <EuiFormRow
-              fullWidth
-              isInvalid={errors.metric.length > 0 && metric !== undefined}
-              error={errors.metric}
-            >
+            <EuiFormRow fullWidth isInvalid={errors.metric.length > 0} error={errors.metric}>
               <EuiComboBox
                 fullWidth
                 singleSelection={{ asPlainText: true }}
                 data-test-subj="availablefieldsOptionsComboBox"
-                isInvalid={errors.metric.length > 0 && metric !== undefined}
+                isInvalid={errors.metric.length > 0}
                 placeholder={firstFieldOption.text}
                 options={availablefieldsOptions}
                 noSuggestions={!availablefieldsOptions.length}
@@ -110,6 +106,8 @@ export const MetricExpression = ({ metric, metrics, errors, onChange, popupPosit
                   if (selectedOptions.length > 0) {
                     onChange(selectedOptions[0].value as SnapshotMetricType);
                     setAggFieldPopoverOpen(false);
+                  } else {
+                    onChange();
                   }
                 }}
               />

From 06c87bb14c17356ee8aa8db774655a1f455125a9 Mon Sep 17 00:00:00 2001
From: Phillip Burch <phillip.burch@live.com>
Date: Thu, 14 May 2020 11:11:53 -0500
Subject: [PATCH 2/3] Add rds latency formatter

---
 .../formatters/snapshot_metric_formats.ts     |  4 ++++
 .../alerting/inventory/expression.tsx         | 24 +++++++++----------
 .../lib/create_inventory_metric_formatter.ts  |  4 ++++
 3 files changed, 20 insertions(+), 12 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
index 8b4ae27cb3061..841528d3910b2 100644
--- a/x-pack/plugins/infra/common/formatters/snapshot_metric_formats.ts
+++ b/x-pack/plugins/infra/common/formatters/snapshot_metric_formats.ts
@@ -70,4 +70,8 @@ export const METRIC_FORMATTERS: MetricFormatters = {
     formatter: InfraFormatterType.number,
     template: '{{value}} seconds',
   },
+  ['rdsLatency']: {
+    formatter: InfraFormatterType.number,
+    template: '{{value}} ms',
+  },
 };
diff --git a/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx b/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
index c2df776545574..d4101e36ea172 100644
--- a/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
@@ -440,18 +440,17 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = props => {
               />
             </StyledExpression>
             {metric && (
-              <StyledExpression>
-                <div
-                  style={{
-                    display: 'flex',
-                    alignItems: 'center',
-                    height: '100%',
-                    paddingTop: '4px',
-                  }}
-                >
-                  <div>{metricUnit[metric]?.label || ''}</div>
-                </div>
-              </StyledExpression>
+              <div
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  height: '100%',
+                  paddingTop: '4px',
+                  paddingBottom: '4px',
+                }}
+              >
+                <EuiText size={'s'}>{metricUnit[metric]?.label || ''}</EuiText>
+              </div>
             )}
           </StyledExpressionRow>
         </EuiFlexItem>
@@ -524,4 +523,5 @@ const metricUnit: Record<string, { label: string }> = {
   s3UploadBytes: { label: 'bytes' },
   s3DownloadBytes: { label: 'bytes' },
   sqsOldestMessage: { label: 'seconds' },
+  rdsLatency: { label: 'ms' },
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_inventory_metric_formatter.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_inventory_metric_formatter.ts
index f8c7a10f12831..479c292035ae5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_inventory_metric_formatter.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_inventory_metric_formatter.ts
@@ -71,6 +71,10 @@ const METRIC_FORMATTERS: MetricFormatters = {
     formatter: InfraFormatterType.number,
     template: '{{value}} seconds',
   },
+  ['rdsLatency']: {
+    formatter: InfraFormatterType.number,
+    template: '{{value}} ms',
+  },
 };
 
 export const createInventoryMetricFormatter = (metric: SnapshotMetricInput) => (

From 662aed39169ffa27d1e7445b287704ec2be17f75 Mon Sep 17 00:00:00 2001
From: Phillip Burch <phillip.burch@live.com>
Date: Thu, 14 May 2020 11:20:33 -0500
Subject: [PATCH 3/3] Simplify css

---
 .../public/components/alerting/inventory/expression.tsx     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx b/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
index d4101e36ea172..93380b839d8ca 100644
--- a/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/inventory/expression.tsx
@@ -442,11 +442,7 @@ export const ExpressionRow: React.FC<ExpressionRowProps> = props => {
             {metric && (
               <div
                 style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  height: '100%',
-                  paddingTop: '4px',
-                  paddingBottom: '4px',
+                  alignSelf: 'center',
                 }}
               >
                 <EuiText size={'s'}>{metricUnit[metric]?.label || ''}</EuiText>