From aa98be5508cdf9ebd28665dff6c57f718c40fe5e Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Fri, 28 Jun 2024 03:11:42 +1000
Subject: [PATCH] [8.14] Allow setting of Monitoring CCS and Screenshotting
 Sandbox via env vars (#187018) (#187079)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.14`:
- [Allow setting of Monitoring CCS and Screenshotting Sandbox via env
vars (#187018)](https://github.com/elastic/kibana/pull/187018)

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

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

<!--BACKPORT [{"author":{"name":"Chris
Sampson","email":"12159006+ChrisSamo632@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-06-27T15:43:08Z","message":"Allow
setting of Monitoring CCS and Screenshotting Sandbox via env vars
(#187018)\n\n## Summary\r\n\r\n#183795\r\n\r\nAllow configuration of
monitoring.ui.ccs.enabled
and\r\nxpack.screenshotting.browser.chromium.disableSandbox settings
via\r\nenvironment variables in the kibana-docker startup script within
the\r\nofficial Kibana Docker Image.\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n\r\n### Risk Matrix\r\n\r\nDelete this section if it is not
applicable to this PR.\r\n\r\n\r\n\r\n### For maintainers\r\n\r\n- [ ]
This was checked for breaking API changes and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"8713ea3cd611a5db681143880d5267f5a940de42","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:fix","💝community","backport:prev-minor","v8.15.0"],"title":"Allow
setting of Monitoring CCS and Screenshotting Sandbox via env
vars","number":187018,"url":"https://github.com/elastic/kibana/pull/187018","mergeCommit":{"message":"Allow
setting of Monitoring CCS and Screenshotting Sandbox via env vars
(#187018)\n\n## Summary\r\n\r\n#183795\r\n\r\nAllow configuration of
monitoring.ui.ccs.enabled
and\r\nxpack.screenshotting.browser.chromium.disableSandbox settings
via\r\nenvironment variables in the kibana-docker startup script within
the\r\nofficial Kibana Docker Image.\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n\r\n### Risk Matrix\r\n\r\nDelete this section if it is not
applicable to this PR.\r\n\r\n\r\n\r\n### For maintainers\r\n\r\n- [ ]
This was checked for breaking API changes and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"8713ea3cd611a5db681143880d5267f5a940de42"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/187018","number":187018,"mergeCommit":{"message":"Allow
setting of Monitoring CCS and Screenshotting Sandbox via env vars
(#187018)\n\n## Summary\r\n\r\n#183795\r\n\r\nAllow configuration of
monitoring.ui.ccs.enabled
and\r\nxpack.screenshotting.browser.chromium.disableSandbox settings
via\r\nenvironment variables in the kibana-docker startup script within
the\r\nofficial Kibana Docker Image.\r\n\r\n\r\n###
Checklist\r\n\r\nDelete any items that are not applicable to this
PR.\r\n\r\n\r\n### Risk Matrix\r\n\r\nDelete this section if it is not
applicable to this PR.\r\n\r\n\r\n\r\n### For maintainers\r\n\r\n- [ ]
This was checked for breaking API changes and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"8713ea3cd611a5db681143880d5267f5a940de42"}}]}]
BACKPORT-->

Co-authored-by: Chris Sampson <12159006+ChrisSamo632@users.noreply.github.com>
---
 .../docker_generator/resources/base/bin/kibana-docker           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 64f94aed60cf6..a82b87c954c51 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -117,6 +117,7 @@ kibana_vars=(
     monitoring.cluster_alerts.email_notifications.email_address
     monitoring.kibana.collection.enabled
     monitoring.kibana.collection.interval
+    monitoring.ui.ccs.enabled
     monitoring.ui.container.elasticsearch.enabled
     monitoring.ui.container.logstash.enabled
     monitoring.ui.elasticsearch.hosts
@@ -360,6 +361,7 @@ kibana_vars=(
     xpack.reporting.roles.allow
     xpack.reporting.roles.enabled
     xpack.ruleRegistry.write.enabled
+    xpack.screenshotting.browser.chromium.disableSandbox
     xpack.security.accessAgreement.message
     xpack.security.audit.appender.fileName
     xpack.security.audit.appender.layout.highlight