[Watcher] Fix logic that determines watch error state (#67952)

Co-authored-by: Elastic Machine <[email protected]>
elastic · Jun 12, 2020 · fc572c9 · fc572c9
1 parent 1277934
commit fc572c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/x-pack/plugins/watcher/server/models/action_status/__tests__/action_status.js b/x-pack/plugins/watcher/server/models/action_status/__tests__/action_status.js
@@ -85,6 +85,7 @@ describe('action_status', () => {
       beforeEach(() => {
         upstreamJson = {
           id: 'my-action',
+          lastCheckedRawFormat: '2017-03-01T20:55:49.679Z',
           actionStatusJson: {
             ack: {
               timestamp: '2017-03-01T20:56:58.442Z',
@@ -107,7 +108,7 @@ describe('action_status', () => {
       });
 
       describe(`correctly calculates ACTION_STATES.ERROR`, () => {
-        it('lastExecutionSuccessful is equal to false', () => {
+        it('lastExecutionSuccessful is equal to false and it is the most recent execution', () => {
           upstreamJson.actionStatusJson.last_execution.successful = false;
           const actionStatus = ActionStatus.fromUpstreamJson(upstreamJson);
           expect(actionStatus.state).to.be(ACTION_STATES.ERROR);

diff --git a/x-pack/plugins/watcher/server/models/action_status/action_status.js b/x-pack/plugins/watcher/server/models/action_status/action_status.js
@@ -15,7 +15,9 @@ export class ActionStatus {
     this.id = props.id;
     this.actionStatusJson = props.actionStatusJson;
     this.errors = props.errors;
+    this.lastCheckedRawFormat = props.lastCheckedRawFormat;
 
+    this.lastExecutionRawFormat = get(this.actionStatusJson, 'last_execution.timestamp');
     this.lastAcknowledged = getMoment(get(this.actionStatusJson, 'ack.timestamp'));
     this.lastExecution = getMoment(get(this.actionStatusJson, 'last_execution.timestamp'));
     this.lastExecutionSuccessful = get(this.actionStatusJson, 'last_execution.successful');
@@ -30,7 +32,10 @@ export class ActionStatus {
     const actionStatusJson = this.actionStatusJson;
     const ackState = actionStatusJson.ack.state;
 
-    if (this.lastExecutionSuccessful === false) {
+    if (
+      this.lastExecutionSuccessful === false &&
+      this.lastCheckedRawFormat === this.lastExecutionRawFormat
+    ) {
       return ACTION_STATES.ERROR;
     }
 

diff --git a/x-pack/plugins/watcher/server/models/watch_status/watch_status.js b/x-pack/plugins/watcher/server/models/watch_status/watch_status.js
@@ -43,6 +43,7 @@ export class WatchStatus {
         id,
         actionStatusJson,
         errors: this.watchErrors.actions && this.watchErrors.actions[id],
+        lastCheckedRawFormat: get(this.watchStatusJson, 'last_checked'),
       };
       return ActionStatus.fromUpstreamJson(json);
     });