maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Include rule type id in alerting executor error message (#106775) (#107025)

Browse source 
* Include rule type id in generic executor error message

* Add spaceId to message

* Fix formatting

Co-authored-by: Mike Côté <mikecote@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2021-07-28 13:04:18 -04:00 committed by GitHub
parent 1b545df3f3
commit 30e4054e50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
View file

@ -2257,7 +2257,13 @@ describe('Task Runner', () => {
}),
},
},
mockedTaskInstance,
{
...mockedTaskInstance,
params: {
...mockedTaskInstance.params,
spaceId: 'foo',
},
},
taskRunnerFactoryInitializerParams
);
rulesClient.get.mockResolvedValue(mockedAlertTypeSavedObject);
@ -2278,7 +2284,7 @@ describe('Task Runner', () => {
}
`);
expect(taskRunnerFactoryInitializerParams.logger.error).toHaveBeenCalledWith(
`Executing Alert \"1\" has resulted in Error: params invalid: [param1]: expected value of type [string] but got [undefined]`
`Executing Alert foo:test:1 has resulted in Error: params invalid: [param1]: expected value of type [string] but got [undefined]`
);
});
@ -3054,7 +3060,13 @@ describe('Task Runner', () => {
const taskRunner = new TaskRunner(
alertType,
mockedTaskInstance,
{
...mockedTaskInstance,
params: {
...mockedTaskInstance.params,
spaceId: 'foo',
},
},
taskRunnerFactoryInitializerParams
);
@ -3071,12 +3083,12 @@ describe('Task Runner', () => {
return taskRunner.run().catch((ex) => {
expect(ex).toMatchInlineSnapshot(`[Error: Saved object [alert/1] not found]`);
expect(logger.debug).toHaveBeenCalledWith(
`Executing Alert "1" has resulted in Error: Saved object [alert/1] not found`
`Executing Alert foo:test:1 has resulted in Error: Saved object [alert/1] not found`
);
expect(logger.warn).toHaveBeenCalledTimes(1);
expect(logger.warn).nthCalledWith(
1,
`Unable to execute rule "1" because Saved object [alert/1] not found - this rule will not be rescheduled. To restart rule execution, try disabling and re-enabling this rule.`
`Unable to execute rule "1" in the "foo" space because Saved object [alert/1] not found - this rule will not be rescheduled. To restart rule execution, try disabling and re-enabling this rule.`
);
expect(isUnrecoverableError(ex)).toBeTruthy();
});
@ -3112,7 +3124,7 @@ describe('Task Runner', () => {
return taskRunner.run().catch((ex) => {
expect(ex).toMatchInlineSnapshot(`[Error: Saved object [alert/1] not found]`);
expect(logger.debug).toHaveBeenCalledWith(
`Executing Alert "1" has resulted in Error: Saved object [alert/1] not found`
`Executing Alert test space:test:1 has resulted in Error: Saved object [alert/1] not found`
);
expect(logger.warn).toHaveBeenCalledTimes(1);
expect(logger.warn).nthCalledWith(

6
x-pack/plugins/alerting/server/task_runner/task_runner.ts
View file

@ -615,9 +615,9 @@ export class TaskRunner<
};
},
(err: ElasticsearchError) => {
const message = `Executing Alert "${alertId}" has resulted in Error: ${getEsErrorMessage(
err
)}`;
const message = `Executing Alert ${spaceId}:${
this.alertType.id
}:${alertId} has resulted in Error: ${getEsErrorMessage(err)}`;
if (isAlertSavedObjectNotFoundError(err, alertId)) {
this.logger.debug(message);
} else {