From c31783367e8c28380fcce90b7820590ce4720967 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Mon, 9 Jan 2023 13:17:59 -0500
Subject: [PATCH 1/4] [7.17] [DOCS] Update macOS install instructions (#148484)
 (#148575)

# Backport

This will backport the following commits from `main` to `7.17`:
- [[DOCS] Update macOS install instructions
(#148484)](https://github.com/elastic/kibana/pull/148484)

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

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

<!--BACKPORT
[{"author":{"name":"gchaps","email":"33642766+gchaps@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-01-09T18:00:34Z","message":"[DOCS]
Update macOS install instructions (#148484)\n\n## Summary\r\n\r\nThis PR
addresses #148454\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"996faf435c48e79b789b1f550424b37df80cc3dc","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Docs","v8.0.0","release_note:skip","v8.1.0","v7.17.0","v8.2.0","v8.3.0","v8.4.0","v8.5.0","v8.6.0","v8.7.0"],"number":148484,"url":"https://github.com/elastic/kibana/pull/148484","mergeCommit":{"message":"[DOCS]
Update macOS install instructions (#148484)\n\n## Summary\r\n\r\nThis PR
addresses #148454\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"996faf435c48e79b789b1f550424b37df80cc3dc"}},"sourceBranch":"main","suggestedTargetBranches":["8.0","8.1","7.17","8.2","8.3","8.4","8.5","8.6"],"targetPullRequestStates":[{"branch":"8.0","label":"v8.0.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.1","label":"v8.1.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"7.17","label":"v7.17.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.2","label":"v8.2.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.3","label":"v8.3.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.4","label":"v8.4.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.5","label":"v8.5.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.6","label":"v8.6.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/148484","number":148484,"mergeCommit":{"message":"[DOCS]
Update macOS install instructions (#148484)\n\n## Summary\r\n\r\nThis PR
addresses #148454\r\n\r\nCo-authored-by: Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"996faf435c48e79b789b1f550424b37df80cc3dc"}}]}]
BACKPORT-->

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>
---
 docs/setup/install/targz.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setup/install/targz.asciidoc b/docs/setup/install/targz.asciidoc
index 3932aea3232f5..212c44daf8a99 100644
--- a/docs/setup/install/targz.asciidoc
+++ b/docs/setup/install/targz.asciidoc
@@ -50,7 +50,7 @@ endif::[]
 .macOS Gatekeeper warnings
 ====
 Apple's rollout of stricter notarization requirements affected the notarization
-of the {version} {kib} artifacts. If macOS Catalina displays a dialog when you
+of the {version} {kib} artifacts. If macOS displays a dialog when you
 first run {kib} that interrupts it, you will need to take an action to allow it
 to run.
 

From eeeef0c8d9a563938fbeb621354c51e66ff54023 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Mon, 9 Jan 2023 11:48:09 +0000
Subject: [PATCH 2/4] skip flaky suite (#148515)

---
 .../server_integration/http/ssl_with_p12_intermediate/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/server_integration/http/ssl_with_p12_intermediate/index.js b/test/server_integration/http/ssl_with_p12_intermediate/index.js
index 54ec6f53d144d..e6ea68d7f8af9 100644
--- a/test/server_integration/http/ssl_with_p12_intermediate/index.js
+++ b/test/server_integration/http/ssl_with_p12_intermediate/index.js
@@ -9,7 +9,8 @@
 export default function ({ getService }) {
   const supertest = getService('supertest');
 
-  describe('kibana server with ssl', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/148515
+  describe.skip('kibana server with ssl', () => {
     it('handles requests using ssl with a P12 keystore that uses an intermediate CA', async () => {
       await supertest.get('/').expect(302);
     });

From d9bc58d69ba13d86e3a83f33d77945b8f0cca782 Mon Sep 17 00:00:00 2001
From: Thomas Watson <watson@elastic.co>
Date: Tue, 10 Jan 2023 08:52:18 +0100
Subject: [PATCH 3/4] [7.17] Upgrade luxon 1.x/2.x to latest version (#148522)
 (#148548)

# Backport

This will backport the following commits from `main` to `7.17`:
- [Upgrade luxon 1.x/2.x to latest version
(#148522)](https://github.com/elastic/kibana/pull/148522)

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

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

<!--BACKPORT [{"author":{"name":"Thomas
Watson","email":"watson@elastic.co"},"sourceCommit":{"committedDate":"2023-01-09T13:47:50Z","message":"Upgrade
luxon 1.x/2.x to latest version
(#148522)","sha":"1a8c5a6f2c7380cd76825a886ebcead1533e64a6","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:all-open","v8.7.0"],"number":148522,"url":"https://github.com/elastic/kibana/pull/148522","mergeCommit":{"message":"Upgrade
luxon 1.x/2.x to latest version
(#148522)","sha":"1a8c5a6f2c7380cd76825a886ebcead1533e64a6"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/148522","number":148522,"mergeCommit":{"message":"Upgrade
luxon 1.x/2.x to latest version
(#148522)","sha":"1a8c5a6f2c7380cd76825a886ebcead1533e64a6"}},{"url":"https://github.com/elastic/kibana/pull/148543","number":148543,"branch":"8.5","state":"OPEN"},{"url":"https://github.com/elastic/kibana/pull/148544","number":148544,"branch":"8.6","state":"OPEN"}]}]
BACKPORT-->
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4a01a01f05249..221d4b160e1b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18718,9 +18718,9 @@ lru-queue@0.1:
     es5-ext "~0.10.2"
 
 luxon@^1.25.0:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.28.0.tgz#e7f96daad3938c06a62de0fb027115d251251fbf"
-  integrity sha512-TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ==
+  version "1.28.1"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.28.1.tgz#528cdf3624a54506d710290a2341aa8e6e6c61b0"
+  integrity sha512-gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw==
 
 lz-string@^1.4.4:
   version "1.4.4"

From 6980aad1625ae5d51bc23159b70cec47999affb7 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Tue, 10 Jan 2023 07:36:18 -0600
Subject: [PATCH 4/4] [7.17] Update dependency @types/selenium-webdriver to
 ^4.1.10 (main) (#148483) (#148585)

#148483

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1d57e351b46c7..6d8402fe081d3 100644
--- a/package.json
+++ b/package.json
@@ -611,7 +611,7 @@
     "@types/redux-actions": "^2.6.1",
     "@types/redux-logger": "^3.0.8",
     "@types/seedrandom": ">=2.0.0 <4.0.0",
-    "@types/selenium-webdriver": "^4.1.6",
+    "@types/selenium-webdriver": "^4.1.10",
     "@types/semver": "^7",
     "@types/set-value": "^2.0.0",
     "@types/sharp": "^0.30.4",
diff --git a/yarn.lock b/yarn.lock
index 221d4b160e1b7..96272c85c5b40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6090,10 +6090,10 @@
   resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.28.tgz#9ce8fa048c1e8c85cb71d7fe4d704e000226036f"
   integrity sha512-SMA+fUwULwK7sd/ZJicUztiPs8F1yCPwF3O23Z9uQ32ME5Ha0NmDK9+QTsYE4O2tHXChzXomSWWeIhCnoN1LqA==
 
-"@types/selenium-webdriver@^4.1.6":
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.8.tgz#ec20feef480574c0c343b1ae179dc4f4b002155e"
-  integrity sha512-k5F++V1mGDxRVxVsZauiBwIMDR9rt1LSOa+nN/1ZghSDED2L6c7EWtzo9jnJDet73LVsOyW6CtCAmZBgMNnnuQ==
+"@types/selenium-webdriver@^4.1.10":
+  version "4.1.10"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.10.tgz#a33299c40afa8dfbd948c8dd338608b163f7c062"
+  integrity sha512-o6ARpkBI8J0b+jhLjXF46rYc8Vsb5CLrRetyA3V3qUPVDwNjPDyHZsZOCFSXH0KPZ6lIn2BfP1xVEPnO+AQy5w==
   dependencies:
     "@types/ws" "*"