[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version #199777
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jedrazb
changed the title
jedrazb
added
v9.0.0
v8.17.0
v8.16.1
backport
release_note:skip
sphilipse
approved these changes
Nov 13, 2024
|
@elasticmachine merge upstream |
|
Starting backport for target branches: 8.16, 8.x https://github.com/elastic/kibana/actions/runs/11890254716 |
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]Async chunks
Page load bundle
History
|
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Nov 18, 2024
… in kea, fix connector img version (elastic#199777) ## Summary PR is a bugfix to dynamically populate the `version` of the connectors docker image shown in the onboarding. It's hardcoded to `8.15.0` now .... Ideally we want to backport this to 8.16.1 + Changes: - Given that we are already getting [kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65) from the [backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212), I'm saving the version in `KibanaLogic` reducer and use it to popuale the docker image version - I realised that because of [this change](elastic@664c1a0#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95) ~10 months ago, we stopped passing plugin data, due to `if (!this.config.host) return; // No API to call` therefore I removed this line to fix this. Why I think it's safe to merge? - It was only added 10 months ago, before things were working without this extra if statement - The backend logic handles the non-existent host: see [here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61) - We are guaranteed that other config fields exist, see [config schema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42) <img width="1204" alt="Screenshot 2024-11-13 at 10 51 36" src="https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321"> ### Checklist Delete any items that are not applicable to this PR. - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) --------- Co-authored-by: kibanamachine <[email protected]> Co-authored-by: Elastic Machine <[email protected]> (cherry picked from commit 5d00a0a)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Nov 18, 2024
… in kea, fix connector img version (elastic#199777) ## Summary PR is a bugfix to dynamically populate the `version` of the connectors docker image shown in the onboarding. It's hardcoded to `8.15.0` now .... Ideally we want to backport this to 8.16.1 + Changes: - Given that we are already getting [kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65) from the [backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212), I'm saving the version in `KibanaLogic` reducer and use it to popuale the docker image version - I realised that because of [this change](elastic@664c1a0#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95) ~10 months ago, we stopped passing plugin data, due to `if (!this.config.host) return; // No API to call` therefore I removed this line to fix this. Why I think it's safe to merge? - It was only added 10 months ago, before things were working without this extra if statement - The backend logic handles the non-existent host: see [here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61) - We are guaranteed that other config fields exist, see [config schema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42) <img width="1204" alt="Screenshot 2024-11-13 at 10 51 36" src="https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321"> ### Checklist Delete any items that are not applicable to this PR. - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) --------- Co-authored-by: kibanamachine <[email protected]> Co-authored-by: Elastic Machine <[email protected]> (cherry picked from commit 5d00a0a)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Nov 18, 2024
…version in kea, fix connector img version (#199777) (#200528) # Backport This will backport the following commits from `main` to `8.16`: - [[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)](#199777) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jedr Blaszyk","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-18T10:13:19Z","message":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)\n\n## Summary\r\n\r\nPR is a bugfix to dynamically populate the `version` of the connectors\r\ndocker image shown in the onboarding. It's hardcoded to `8.15.0` now\r\n....\r\n\r\nIdeally we want to backport this to 8.16.1 +\r\n\r\nChanges:\r\n- Given that we are already getting\r\n[kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65)\r\nfrom the\r\n[backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212),\r\nI'm saving the version in `KibanaLogic` reducer and use it to popuale\r\nthe docker image version\r\n- I realised that because of [this\r\nchange](https://github.com/elastic/kibana/commit/664c1a0a08003f82cb88c9b4a51f194fbb42cd84#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95)\r\n~10 months ago, we stopped passing plugin data, due to `if\r\n(!this.config.host) return; // No API to call` therefore I removed this\r\nline to fix this. Why I think it's safe to merge?\r\n- It was only added 10 months ago, before things were working without\r\nthis extra if statement\r\n- The backend logic handles the non-existent host: see\r\n[here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61)\r\n- We are guaranteed that other config fields exist, see [config\r\nschema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42)\r\n\r\n<img width=\"1204\" alt=\"Screenshot 2024-11-13 at 10 51 36\"\r\nsrc=\"https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321\">\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"5d00a0a098930b2292ea7777cd1ee9f46a91a778","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:skip","v9.0.0","v8.17.0","v8.16.1"],"title":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version","number":199777,"url":"https://github.com/elastic/kibana/pull/199777","mergeCommit":{"message":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)\n\n## Summary\r\n\r\nPR is a bugfix to dynamically populate the `version` of the connectors\r\ndocker image shown in the onboarding. It's hardcoded to `8.15.0` now\r\n....\r\n\r\nIdeally we want to backport this to 8.16.1 +\r\n\r\nChanges:\r\n- Given that we are already getting\r\n[kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65)\r\nfrom the\r\n[backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212),\r\nI'm saving the version in `KibanaLogic` reducer and use it to popuale\r\nthe docker image version\r\n- I realised that because of [this\r\nchange](https://github.com/elastic/kibana/commit/664c1a0a08003f82cb88c9b4a51f194fbb42cd84#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95)\r\n~10 months ago, we stopped passing plugin data, due to `if\r\n(!this.config.host) return; // No API to call` therefore I removed this\r\nline to fix this. Why I think it's safe to merge?\r\n- It was only added 10 months ago, before things were working without\r\nthis extra if statement\r\n- The backend logic handles the non-existent host: see\r\n[here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61)\r\n- We are guaranteed that other config fields exist, see [config\r\nschema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42)\r\n\r\n<img width=\"1204\" alt=\"Screenshot 2024-11-13 at 10 51 36\"\r\nsrc=\"https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321\">\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"5d00a0a098930b2292ea7777cd1ee9f46a91a778"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199777","number":199777,"mergeCommit":{"message":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)\n\n## Summary\r\n\r\nPR is a bugfix to dynamically populate the `version` of the connectors\r\ndocker image shown in the onboarding. It's hardcoded to `8.15.0` now\r\n....\r\n\r\nIdeally we want to backport this to 8.16.1 +\r\n\r\nChanges:\r\n- Given that we are already getting\r\n[kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65)\r\nfrom the\r\n[backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212),\r\nI'm saving the version in `KibanaLogic` reducer and use it to popuale\r\nthe docker image version\r\n- I realised that because of [this\r\nchange](https://github.com/elastic/kibana/commit/664c1a0a08003f82cb88c9b4a51f194fbb42cd84#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95)\r\n~10 months ago, we stopped passing plugin data, due to `if\r\n(!this.config.host) return; // No API to call` therefore I removed this\r\nline to fix this. Why I think it's safe to merge?\r\n- It was only added 10 months ago, before things were working without\r\nthis extra if statement\r\n- The backend logic handles the non-existent host: see\r\n[here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61)\r\n- We are guaranteed that other config fields exist, see [config\r\nschema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42)\r\n\r\n<img width=\"1204\" alt=\"Screenshot 2024-11-13 at 10 51 36\"\r\nsrc=\"https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321\">\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"5d00a0a098930b2292ea7777cd1ee9f46a91a778"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Jedr Blaszyk <[email protected]>
kibanamachine
added a commit
that referenced
this pull request
Nov 18, 2024
…ersion in kea, fix connector img version (#199777) (#200529) # Backport This will backport the following commits from `main` to `8.x`: - [[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)](#199777) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Jedr Blaszyk","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-18T10:13:19Z","message":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)\n\n## Summary\r\n\r\nPR is a bugfix to dynamically populate the `version` of the connectors\r\ndocker image shown in the onboarding. It's hardcoded to `8.15.0` now\r\n....\r\n\r\nIdeally we want to backport this to 8.16.1 +\r\n\r\nChanges:\r\n- Given that we are already getting\r\n[kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65)\r\nfrom the\r\n[backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212),\r\nI'm saving the version in `KibanaLogic` reducer and use it to popuale\r\nthe docker image version\r\n- I realised that because of [this\r\nchange](https://github.com/elastic/kibana/commit/664c1a0a08003f82cb88c9b4a51f194fbb42cd84#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95)\r\n~10 months ago, we stopped passing plugin data, due to `if\r\n(!this.config.host) return; // No API to call` therefore I removed this\r\nline to fix this. Why I think it's safe to merge?\r\n- It was only added 10 months ago, before things were working without\r\nthis extra if statement\r\n- The backend logic handles the non-existent host: see\r\n[here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61)\r\n- We are guaranteed that other config fields exist, see [config\r\nschema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42)\r\n\r\n<img width=\"1204\" alt=\"Screenshot 2024-11-13 at 10 51 36\"\r\nsrc=\"https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321\">\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"5d00a0a098930b2292ea7777cd1ee9f46a91a778","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:skip","v9.0.0","v8.17.0","v8.16.1"],"title":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version","number":199777,"url":"https://github.com/elastic/kibana/pull/199777","mergeCommit":{"message":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)\n\n## Summary\r\n\r\nPR is a bugfix to dynamically populate the `version` of the connectors\r\ndocker image shown in the onboarding. It's hardcoded to `8.15.0` now\r\n....\r\n\r\nIdeally we want to backport this to 8.16.1 +\r\n\r\nChanges:\r\n- Given that we are already getting\r\n[kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65)\r\nfrom the\r\n[backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212),\r\nI'm saving the version in `KibanaLogic` reducer and use it to popuale\r\nthe docker image version\r\n- I realised that because of [this\r\nchange](https://github.com/elastic/kibana/commit/664c1a0a08003f82cb88c9b4a51f194fbb42cd84#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95)\r\n~10 months ago, we stopped passing plugin data, due to `if\r\n(!this.config.host) return; // No API to call` therefore I removed this\r\nline to fix this. Why I think it's safe to merge?\r\n- It was only added 10 months ago, before things were working without\r\nthis extra if statement\r\n- The backend logic handles the non-existent host: see\r\n[here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61)\r\n- We are guaranteed that other config fields exist, see [config\r\nschema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42)\r\n\r\n<img width=\"1204\" alt=\"Screenshot 2024-11-13 at 10 51 36\"\r\nsrc=\"https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321\">\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"5d00a0a098930b2292ea7777cd1ee9f46a91a778"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199777","number":199777,"mergeCommit":{"message":"[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)\n\n## Summary\r\n\r\nPR is a bugfix to dynamically populate the `version` of the connectors\r\ndocker image shown in the onboarding. It's hardcoded to `8.15.0` now\r\n....\r\n\r\nIdeally we want to backport this to 8.16.1 +\r\n\r\nChanges:\r\n- Given that we are already getting\r\n[kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65)\r\nfrom the\r\n[backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212),\r\nI'm saving the version in `KibanaLogic` reducer and use it to popuale\r\nthe docker image version\r\n- I realised that because of [this\r\nchange](https://github.com/elastic/kibana/commit/664c1a0a08003f82cb88c9b4a51f194fbb42cd84#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95)\r\n~10 months ago, we stopped passing plugin data, due to `if\r\n(!this.config.host) return; // No API to call` therefore I removed this\r\nline to fix this. Why I think it's safe to merge?\r\n- It was only added 10 months ago, before things were working without\r\nthis extra if statement\r\n- The backend logic handles the non-existent host: see\r\n[here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61)\r\n- We are guaranteed that other config fields exist, see [config\r\nschema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42)\r\n\r\n<img width=\"1204\" alt=\"Screenshot 2024-11-13 at 10 51 36\"\r\nsrc=\"https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321\">\r\n\r\n### Checklist\r\n\r\nDelete any items that are not applicable to this PR.\r\n\r\n\r\n- [ ] [Unit or functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere updated or added to match the most common scenarios\r\n- [ ] If a plugin configuration key changed, check if it needs to be\r\nallowlisted in the cloud and added to the [docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"5d00a0a098930b2292ea7777cd1ee9f46a91a778"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Jedr Blaszyk <[email protected]>
CAWilson94
pushed a commit
to CAWilson94/kibana
that referenced
this pull request
Dec 12, 2024
… in kea, fix connector img version (elastic#199777) ## Summary PR is a bugfix to dynamically populate the `version` of the connectors docker image shown in the onboarding. It's hardcoded to `8.15.0` now .... Ideally we want to backport this to 8.16.1 + Changes: - Given that we are already getting [kibanaVersion](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/index.tsx#L65) from the [backend](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/plugin.ts#L212), I'm saving the version in `KibanaLogic` reducer and use it to popuale the docker image version - I realised that because of [this change](elastic@664c1a0#diff-19a48c92980fd550e48c5e1d4d1f9a2bec4d309909b7cfa693264c92b387fe3dR95) ~10 months ago, we stopped passing plugin data, due to `if (!this.config.host) return; // No API to call` therefore I removed this line to fix this. Why I think it's safe to merge? - It was only added 10 months ago, before things were working without this extra if statement - The backend logic handles the non-existent host: see [here](https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts#L45-L61) - We are guaranteed that other config fields exist, see [config schema](https://github.com/elastic/kibana/blob/d276b4899533b0bde2038c7fedfed7c30a74a80b/x-pack/plugins/enterprise_search/server/index.ts#L16-L42) <img width="1204" alt="Screenshot 2024-11-13 at 10 51 36" src="https://github.com/user-attachments/assets/dbd2395b-00e5-4331-a9be-cb2a87133321"> ### Checklist Delete any items that are not applicable to this PR. - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) --------- Co-authored-by: kibanamachine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
PR is a bugfix to dynamically populate the
versionof the connectors docker image shown in the onboarding. It's hardcoded to8.15.0now ....Ideally we want to backport this to 8.16.1 +
Changes:
KibanaLogicreducer and use it to popuale the docker image versionif (!this.config.host) return; // No API to calltherefore I removed this line to fix this. Why I think it's safe to merge?Checklist
Delete any items that are not applicable to this PR.