Skip to content

Commit

Permalink
[8.x] [Entity Analytics][Entity Store] Clear error on second entity e…
Browse files Browse the repository at this point in the history
…ngine init API call (#202903) (#202936)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Entity Analytics][Entity Store] Clear error on second entity engine
init API call (#202903)](#202903)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Mark
Hopkin","email":"mark.hopkin@elastic.co"},"sourceCommit":{"committedDate":"2024-12-04T14:06:56Z","message":"[Entity
Analytics][Entity Store] Clear error on second entity engine init API
call (#202903)\n\n## Summary\n\nIf the first call to init an entity
engine fails, we add the `error`\nproperty to the engine status, if we
then call the API a second time\nthis error was not being wiped. This PR
resets the error on the second\ncall.\n\n### Test steps\n\n- Do not
visit the UI of a kibana so that the security default data view\ndoes
not exist\n- Call the init API for an entity engine e,g host\n- Call the
engine status API, notice the status has an error\n- Visait the security
solution UI and wait for the data view to be\ncreated\n- Re-call the
init API and notice the error has
gone","sha":"9997dabf90f3dd36c0577a8d6f6e10dd5dc88054","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","Team:
SecuritySolution","Team:Entity
Analytics","backport:version","v8.17.0","v8.18.0"],"title":"[Entity
Analytics][Entity Store] Clear error on second entity engine init API
call","number":202903,"url":"https://github.com/elastic/kibana/pull/202903","mergeCommit":{"message":"[Entity
Analytics][Entity Store] Clear error on second entity engine init API
call (#202903)\n\n## Summary\n\nIf the first call to init an entity
engine fails, we add the `error`\nproperty to the engine status, if we
then call the API a second time\nthis error was not being wiped. This PR
resets the error on the second\ncall.\n\n### Test steps\n\n- Do not
visit the UI of a kibana so that the security default data view\ndoes
not exist\n- Call the init API for an entity engine e,g host\n- Call the
engine status API, notice the status has an error\n- Visait the security
solution UI and wait for the data view to be\ncreated\n- Re-call the
init API and notice the error has
gone","sha":"9997dabf90f3dd36c0577a8d6f6e10dd5dc88054"}},"sourceBranch":"main","suggestedTargetBranches":["8.17","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/202903","number":202903,"mergeCommit":{"message":"[Entity
Analytics][Entity Store] Clear error on second entity engine init API
call (#202903)\n\n## Summary\n\nIf the first call to init an entity
engine fails, we add the `error`\nproperty to the engine status, if we
then call the API a second time\nthis error was not being wiped. This PR
resets the error on the second\ncall.\n\n### Test steps\n\n- Do not
visit the UI of a kibana so that the security default data view\ndoes
not exist\n- Call the init API for an entity engine e,g host\n- Call the
engine status API, notice the status has an error\n- Visait the security
solution UI and wait for the data view to be\ncreated\n- Re-call the
init API and notice the error has
gone","sha":"9997dabf90f3dd36c0577a8d6f6e10dd5dc88054"}},{"branch":"8.17","label":"v8.17.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Mark Hopkin <mark.hopkin@elastic.co>
  • Loading branch information
kibanamachine and hop-dev authored Dec 4, 2024
1 parent 0d1d013 commit ab8c3cc
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export class EngineDescriptorClient {
const old = engineDescriptor.saved_objects[0].attributes;
const update = {
...old,
error: undefined, // if the engine is being re-initialized, clear any previous error
status: ENGINE_STATUS.INSTALLING,
filter,
fieldHistoryLength,
Expand Down

0 comments on commit ab8c3cc

Please sign in to comment.