Skip to content
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

Jump to bottom

[Obs AI Assistant] Fall back to request.url for kibana function #173717

Merged
merged 20 commits into from
Dec 22, 2023
Merged

[Obs AI Assistant] Fall back to request.url for kibana function #173717

merged 20 commits into from
Dec 22, 2023

Conversation

dgieselaar
Copy link
Member

@dgieselaar dgieselaar commented Dec 20, 2023 •
edited by kibanamachine
Loading

null

@dgieselaar dgieselaar requested a review from a team as a code owner December 20, 2023 09:32
@apmmachine
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • /oblt-deploy-serverless : Deploy a serverless Kibana instance using the Observability test environments.
  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@dgieselaar dgieselaar added the ci:cloud-deploy Create or update a Cloud deployment label Dec 20, 2023
@dgieselaar
Copy link
Member Author

@elasticmachine merge upstream

@dgieselaar dgieselaar added the ci:cloud-persist-deployment Persist cloud deployment indefinitely label Dec 20, 2023
miltonhultgren
miltonhultgren approved these changes Dec 20, 2023
View reviewed changes
x-pack/plugins/observability_ai_assistant/server/functions/kibana.ts Outdated
Comment on lines 81 to 83
httpsAgent: new https.Agent({
rejectUnauthorized: false,
}),
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm assuming we think this is safe because the request is coming from within Kibana to Kibana itself, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, but I'm mostly just testing still. Should have mentioned that.

miltonhultgren
miltonhultgren reviewed Dec 22, 2023
View reviewed changes
x-pack/plugins/observability_ai_assistant/server/functions/kibana.ts Outdated
Comment on lines 67 to 68
resources.logger.info(JSON.stringify(request.url));
resources.logger.info(JSON.stringify(request.headers, null));
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe debug?

Copy link
Member Author

Choose a reason for hiding this comment

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

I need to inspect the cloud deployment. I'll remove the statements entirely (because this leaks security details 😛)

@dgieselaar dgieselaar added release_note:skip Skip the PR/issue when compiling release notes v8.12.0 v8.12.1 labels Dec 22, 2023
@dgieselaar dgieselaar enabled auto-merge (squash) December 22, 2023 11:02
@kibana-ci
Copy link
Collaborator

kibana-ci commented Dec 22, 2023 •
edited
Loading

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@dgieselaar dgieselaar merged commit 31b7380 into elastic:main Dec 22, 2023
45 checks passed
@dgieselaar dgieselaar deleted the obs-ai-assistant-kibana-ssl branch December 22, 2023 11:59
@kibanamachine kibanamachine mentioned this pull request Dec 22, 2023
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Dec 22, 2023
@dgieselaar
[Obs AI Assistant] Fall back to request.url for kibana fn (elastic#17…
76995c4 
…3717)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Justin Kambic <jk@elastic.co>
(cherry picked from commit 31b7380)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.12

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 Dec 22, 2023
@kibanamachine @dgieselaar
[8.12] [Obs AI Assistant] Fall back to request.url for kibana fn (#17…
159afe4 
…3717) (#173916)

# Backport

This will backport the following commits from `main` to `8.12`:
- [[Obs AI Assistant] Fall back to request.url for kibana fn
(#173717)](#173717)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Dario
Gieselaar","email":"dario.gieselaar@elastic.co"},"sourceCommit":{"committedDate":"2023-12-22T11:54:44Z","message":"[Obs
AI Assistant] Fall back to request.url for kibana fn
(#173717)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by:
Justin Kambic
<jk@elastic.co>","sha":"31b7380c107550774bbb93d643a9446434f8b0a9","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","ci:cloud-deploy","ci:cloud-persist-deployment","v8.12.0","v8.12.1","v8.13.0"],"number":173717,"url":"#173717
AI Assistant] Fall back to request.url for kibana fn
(#173717)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by:
Justin Kambic
<jk@elastic.co>","sha":"31b7380c107550774bbb93d643a9446434f8b0a9"}},"sourceBranch":"main","suggestedTargetBranches":["8.12"],"targetPullRequestStates":[{"branch":"8.12","label":"v8.12.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"#173717
AI Assistant] Fall back to request.url for kibana fn
(#173717)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>\r\nCo-authored-by:
Justin Kambic
<jk@elastic.co>","sha":"31b7380c107550774bbb93d643a9446434f8b0a9"}}]}]
BACKPORT-->

Co-authored-by: Dario Gieselaar <dario.gieselaar@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miltonhultgren miltonhultgren miltonhultgren approved these changes

Assignees
No one assigned
Labels
ci:cloud-deploy Create or update a Cloud deployment ci:cloud-persist-deployment Persist cloud deployment indefinitely release_note:skip Skip the PR/issue when compiling release notes v8.12.0 v8.12.1 v8.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dgieselaar @apmmachine @kibana-ci @kibanamachine @miltonhultgren @justinkambic