Use open/closed and constants

smith · smith · commit 395d096a14e2 · 2021-05-25T08:41:25.000-05:00
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx
@@ -66,16 +66,16 @@ export function AlertsTable(props: AlertsTableProps) {
 
         return active ? (
           <EuiIconTip
-            content={i18n.translate('xpack.observability.alertsTable.statusActiveDescription', {
-              defaultMessage: 'Active',
+            content={i18n.translate('xpack.observability.alertsTable.statusOpenDescription', {
+              defaultMessage: 'Open',
             })}
             color="danger"
             type="alert"
           />
         ) : (
           <EuiIconTip
-            content={i18n.translate('xpack.observability.alertsTable.statusRecoveredDescription', {
-              defaultMessage: 'Recovered',
+            content={i18n.translate('xpack.observability.alertsTable.statusClosedDescription', {
+              defaultMessage: 'Closed',
             })}
             type="check"
           />
diff --git a/x-pack/plugins/observability/public/pages/alerts/index.tsx b/x-pack/plugins/observability/public/pages/alerts/index.tsx
@@ -17,7 +17,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import {
   ALERT_START,
-  EVENT_ACTION,
+  ALERT_STATUS,
   RULE_ID,
   RULE_NAME,
 } from '@kbn/rule-data-utils/target/technical_field_names';
@@ -112,7 +112,7 @@ export function AlertsPage({ routeParams }: AlertsPageProps) {
                   },
                 })
               : undefined,
-            active: parsedFields[EVENT_ACTION] !== 'close',
+            active: parsedFields[ALERT_STATUS] !== 'closed',
             start: new Date(parsedFields[ALERT_START]!).getTime(),
           };
         });
diff --git a/x-pack/plugins/observability/public/pages/alerts/status_filter.tsx b/x-pack/plugins/observability/public/pages/alerts/status_filter.tsx
@@ -19,7 +19,7 @@ export function StatusFilter({ status = 'open', onChange }: StatusFilterProps) {
   return (
     <EuiFilterGroup
       aria-label={i18n.translate('xpack.observability.alerts.statusFilterAriaLabel', {
-        defaultMessage: 'Filter alerts by active and recovered status',
+        defaultMessage: 'Filter alerts by open and closed status',
       })}
     >
       <EuiFilterButton
@@ -28,8 +28,8 @@ export function StatusFilter({ status = 'open', onChange }: StatusFilterProps) {
         onClick={() => onChange('open')}
         withNext={true}
       >
-        {i18n.translate('xpack.observability.alerts.statusFilter.activeButtonLabel', {
-          defaultMessage: 'Active',
+        {i18n.translate('xpack.observability.alerts.statusFilter.openButtonLabel', {
+          defaultMessage: 'Open',
         })}
       </EuiFilterButton>
       <EuiFilterButton
@@ -38,8 +38,8 @@ export function StatusFilter({ status = 'open', onChange }: StatusFilterProps) {
         onClick={() => onChange('closed')}
         withNext={true}
       >
-        {i18n.translate('xpack.observability.alerts.statusFilter.recoveredButtonLabel', {
-          defaultMessage: 'Recovered',
+        {i18n.translate('xpack.observability.alerts.statusFilter.closedButtonLabel', {
+          defaultMessage: 'Closed',
         })}
       </EuiFilterButton>
       <EuiFilterButton
diff --git a/x-pack/plugins/observability/server/utils/queries.test.ts b/x-pack/plugins/observability/server/utils/queries.test.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ALERT_STATUS } from '@kbn/rule-data-utils/target/technical_field_names';
 import * as queries from './queries';
 
 describe('queries', () => {
@@ -19,7 +20,7 @@ describe('queries', () => {
       it('returns a query for open', () => {
         expect(queries.alertStatusQuery('open')).toEqual([
           {
-            term: { 'kibana.rac.alert.status': 'open' },
+            term: { [ALERT_STATUS]: 'open' },
           },
         ]);
       });
@@ -29,7 +30,7 @@ describe('queries', () => {
       it('returns a query for closed', () => {
         expect(queries.alertStatusQuery('closed')).toEqual([
           {
-            term: { 'kibana.rac.alert.status': 'closed' },
+            term: { [ALERT_STATUS]: 'closed' },
           },
         ]);
       });
diff --git a/x-pack/plugins/observability/server/utils/queries.ts b/x-pack/plugins/observability/server/utils/queries.ts
@@ -6,6 +6,7 @@
  */
 
 import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { ALERT_STATUS } from '@kbn/rule-data-utils/target/technical_field_names';
 import { esKuery } from '../../../../../src/plugins/data/server';
 import { AlertStatus } from '../../common/typings';
 
@@ -14,7 +15,7 @@ export function alertStatusQuery(status: AlertStatus) {
     return [];
   }
 
-  return [{ term: { 'kibana.rac.alert.status': status } }];
+  return [{ term: { [ALERT_STATUS]: status } }];
 }
 
 export function rangeQuery(start?: number, end?: number, field = '@timestamp'): QueryContainer[] {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`*/`
`7`	`7`
`8`	`8`	`import { QueryContainer } from '@elastic/elasticsearch/api/types';`
	`9`	`+import { ALERT_STATUS } from '@kbn/rule-data-utils/target/technical_field_names';`
`9`	`10`	`import { esKuery } from '../../../../../src/plugins/data/server';`
`10`	`11`	`import { AlertStatus } from '../../common/typings';`
`11`	`12`
`@@ -14,7 +15,7 @@ export function alertStatusQuery(status: AlertStatus) {`
`14`	`15`	`return [];`
`15`	`16`	`}`
`16`	`17`
`17`		`- return [{ term: { 'kibana.rac.alert.status': status } }];`
	`18`	`+ return [{ term: { [ALERT_STATUS]: status } }];`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`export function rangeQuery(start?: number, end?: number, field = '@timestamp'): QueryContainer[] {`