resolve PR comments

elastic · Aug 12, 2020 · fb3a7a9 · fb3a7a9
1 parent ab427f5
commit fb3a7a9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/x-pack/plugins/alerts/README.md b/x-pack/plugins/alerts/README.md
@@ -514,7 +514,7 @@ Params:
 
 |Property|Description|Type|
 |---|---|---|
-|id|The id of the alert whose state you're trying to get.|string|
+|id|The id of the alert whose status you're trying to get.|string|
 
 Query:
 

diff --git a/x-pack/plugins/alerts/server/alerts_client.ts b/x-pack/plugins/alerts/server/alerts_client.ts
@@ -285,9 +285,7 @@ export class AlertsClient {
   }
 
   public async getAlertStatus({ id, dateStart }: GetAlertStatusParams): Promise<AlertStatus> {
-    const eventLogClient = await this.getEventLogClient();
-
-    this.logger.debug('getAlertStatus(): getting the alert');
+    this.logger.debug(`getAlertStatus(): getting alert ${id}`);
     const alert = await this.get({ id });
     await this.authorization.ensureAuthorized(
       alert.alertTypeId,
@@ -301,7 +299,9 @@ export class AlertsClient {
     const defaultDateStart = new Date(dateNow.valueOf() - durationMillis);
     const parsedDateStart = parseDate(dateStart, 'dateStart', defaultDateStart);
 
-    this.logger.debug('getAlertStatus(): search the event log');
+    const eventLogClient = await this.getEventLogClient();
+
+    this.logger.debug(`getAlertStatus(): search the event log for alert ${id}`);
     let events: IEvent[];
     try {
       const queryResults = await eventLogClient.findEventsBySavedObject('alert', id, {
@@ -313,7 +313,9 @@ export class AlertsClient {
       });
       events = queryResults.data;
     } catch (err) {
-      this.logger.debug(`alertsClient.getAlertStatus(): error searching event log: ${err.message}`);
+      this.logger.debug(
+        `alertsClient.getAlertStatus(): error searching event log for alert ${id}: ${err.message}`
+      );
       events = [];
     }
 
@@ -323,31 +325,6 @@ export class AlertsClient {
       dateStart: parsedDateStart.toISOString(),
       dateEnd: dateNow.toISOString(),
     });
-
-    function parseDate(
-      dateString: string | undefined,
-      propertyName: string,
-      defaultValue: Date
-    ): Date {
-      if (dateString === undefined) {
-        return defaultValue;
-      }
-
-      const parsedDate = parseIsoOrRelativeDate(dateString);
-      if (parsedDate === undefined) {
-        throw Boom.badRequest(
-          i18n.translate('xpack.alerts.alertsClient.getAlertStatus.invalidDate', {
-            defaultMessage: 'Invalid date for parameter {field}: "{dateValue}"',
-            values: {
-              field: propertyName,
-              dateValue: dateString,
-            },
-          })
-        );
-      }
-
-      return parsedDate;
-    }
   }
 
   public async find({
@@ -966,3 +943,24 @@ export class AlertsClient {
     return truncate(`Alerting: ${alertTypeId}/${alertName}`, { length: 256 });
   }
 }
+
+function parseDate(dateString: string | undefined, propertyName: string, defaultValue: Date): Date {
+  if (dateString === undefined) {
+    return defaultValue;
+  }
+
+  const parsedDate = parseIsoOrRelativeDate(dateString);
+  if (parsedDate === undefined) {
+    throw Boom.badRequest(
+      i18n.translate('xpack.alerts.alertsClient.getAlertStatus.invalidDate', {
+        defaultMessage: 'Invalid date for parameter {field}: "{dateValue}"',
+        values: {
+          field: propertyName,
+          dateValue: dateString,
+        },
+      })
+    );
+  }
+
+  return parsedDate;
+}
diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner.ts b/x-pack/plugins/alerts/server/task_runner/task_runner.ts
@@ -355,8 +355,13 @@ interface GenerateNewAndResolvedInstanceEventsParams {
 }
 
 function generateNewAndResolvedInstanceEvents(params: GenerateNewAndResolvedInstanceEventsParams) {
-  const { eventLogger, alertId, namespace } = params;
-  const { currentAlertInstanceIds, originalAlertInstanceIds } = params;
+  const {
+    eventLogger,
+    alertId,
+    namespace,
+    currentAlertInstanceIds,
+    originalAlertInstanceIds,
+  } = params;
 
   const newIds = without(currentAlertInstanceIds, ...originalAlertInstanceIds);
   const resolvedIds = without(originalAlertInstanceIds, ...currentAlertInstanceIds);