Skip to content

Commit

Permalink
[8.x] Allow elasticsearch.publicBaseUrl to be set using an environmen…
Browse files Browse the repository at this point in the history
…t variable (#193716) (#193860)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Allow elasticsearch.publicBaseUrl to be set using an environment
variable (#193716)](#193716)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Sander
Philipse","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-23T16:43:45Z","message":"Allow
elasticsearch.publicBaseUrl to be set using an environment variable
(#193716)\n\n## Summary\r\n\r\nAllows users to set
`elasticsearch.publicBaseUrl` with a\r\nELASTICSEARCH_PUBLICBASEURL
environment
variable.","sha":"be8002215411633cfe913d3110ae74d64092c580","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","v8.16.0","backport:version"],"number":193716,"url":"https://github.com/elastic/kibana/pull/193716","mergeCommit":{"message":"Allow
elasticsearch.publicBaseUrl to be set using an environment variable
(#193716)\n\n## Summary\r\n\r\nAllows users to set
`elasticsearch.publicBaseUrl` with a\r\nELASTICSEARCH_PUBLICBASEURL
environment
variable.","sha":"be8002215411633cfe913d3110ae74d64092c580"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193716","number":193716,"mergeCommit":{"message":"Allow
elasticsearch.publicBaseUrl to be set using an environment variable
(#193716)\n\n## Summary\r\n\r\nAllows users to set
`elasticsearch.publicBaseUrl` with a\r\nELASTICSEARCH_PUBLICBASEURL
environment
variable.","sha":"be8002215411633cfe913d3110ae74d64092c580"}},{"branch":"8.x","label":"v8.16.0","labelRegex":"^v8.16.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
  • Loading branch information
sphilipse authored Sep 24, 2024
1 parent cb857bf commit e294ce9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ kibana_vars=(
elasticsearch.logQueries
elasticsearch.password
elasticsearch.pingTimeout
elasticsearch.publicBaseUrl
elasticsearch.requestHeadersWhitelist
elasticsearch.requestTimeout
elasticsearch.serviceAccountToken
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/cloud/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export interface CloudSetup {

export interface PublicElasticsearchConfigType {
/**
* The URL to the Elasticsearch cluster, derived from xpack.elasticsearch.publicBaseUrl if populated
* The URL to the Elasticsearch cluster, derived from elasticsearch.publicBaseUrl if populated
* Otherwise this is based on the cloudId
* If neither is populated, this will be undefined
*/
Expand Down

0 comments on commit e294ce9

Please sign in to comment.