Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 12, 2020
Merged

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

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46f2a01
fix logic that determines watch error state
alisonelizabeth Jun 2, 2020
8643782
Merge branch 'master' of github.com:elastic/kibana into bugfix/watche…
alisonelizabeth Jun 2, 2020
0fad3e6
update tests
alisonelizabeth Jun 2, 2020
175045e
Merge branch 'master' into bugfix/watcher_status
elasticmachine Jun 4, 2020
edcfd34
Merge branch 'master' into bugfix/watcher_status
elasticmachine Jun 7, 2020
d1000b2
Merge branch 'master' into bugfix/watcher_status
elasticmachine Jun 9, 2020
3d71644
Merge branch 'master' of github.com:elastic/kibana into bugfix/watche…
alisonelizabeth Jun 11, 2020
82ec5ca
address review feedback
alisonelizabeth Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion x-pack/plugins/watcher/server/models/action_status/__tests__/action_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -107,8 +108,10 @@ 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;
upstreamJson.actionStatusJson.last_execution.timestamp =
Copy link
Contributor

@jloleysens jloleysens Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure what this assignment is doing?

Copy link
Contributor Author

@alisonelizabeth alisonelizabeth Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what I was going for there either 😂 . Removed.

upstreamJson.actionStatusJson.last_execution.timestamp;
const actionStatus = ActionStatus.fromUpstreamJson(upstreamJson);
expect(actionStatus.state).to.be(ACTION_STATES.ERROR);
});
Expand Down
7 changes: 6 additions & 1 deletion x-pack/plugins/watcher/server/models/action_status/action_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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
) {
Comment on lines +35 to +38
Copy link
Contributor

@jloleysens jloleysens Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From this it looks like lastExecutionSuccessful can be false but we have an edge case where lastCheckedRawFormat come after that? I.o.w. the last execution could be successful even though the lastExecutionSuccessful field is false?

Copy link
Contributor Author

@alisonelizabeth alisonelizabeth Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the watch only "executes" when the condition is met, but the watch condition is checked on a given interval. So the last time it was executed could be false, but the next time it is checked the condition may not be met so it doesn't execute. Does that make sense? I also tried to explain this in the PR description, but I'm probably not doing the best job so let me know if you need me to clarify more 😅 .

return ACTION_STATES.ERROR;
}

Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/watcher/server/models/watch_status/watch_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down