Merge branch 'main' into fix-5128

Signed-off-by: Josh Romero <[email protected]>

.github/workflows/cypress_workflow.yml

@@ -34,12 +34,13 @@ env:
   TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || github.base_ref }}"
   FTR_PATH: 'ftr'
   START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch'
-  OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot'
+  OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false'
   SPEC: ${{ inputs.specs != '' && inputs.specs || 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js,' }} 
   CYPRESS_BROWSER: 'chromium'
   CYPRESS_VISBUILDER_ENABLED: true
   CYPRESS_DATASOURCE_MANAGEMENT_ENABLED: false
   OSD_SNAPSHOT_SKIP_VERIFY_CHECKSUM: true
+  NODE_OPTIONS: '--max-old-space-size=6144 --dns-result-order=ipv4first'
   COMMENT_TAG: '[MANUAL CYPRESS TEST RUN RESULTS]'
   COMMENT_SUCCESS_MSG: ':white_check_mark: Cypress test run succeeded!'
   COMMENT_FAILURE_MSG: ':x: Cypress test run failed!'
@@ -179,13 +180,15 @@ jobs:
             #### ${{ needs.cypress-tests.result == 'success' && env.COMMENT_SUCCESS_MSG || env.COMMENT_FAILURE_MSG }}
 
             #### Inputs:
-            Source repo: `${{ env.SOURCE_REPO }}`
-            Source branch: ``${{ env.SOURCE_BRANCH }}``
-            Test repo: `${{ env.TEST_REPO }}`
-            Test branch: ``${{ env.TEST_BRANCH }}``
+            ```
+            Source repo: '${{ env.SOURCE_REPO }}'
+            Source branch: '${{ env.SOURCE_BRANCH }}'
+            Test repo: '${{ env.TEST_REPO }}'
+            Test branch: '${{ env.TEST_BRANCH }}'
 
             Test spec:
-            `${{ env.SPEC }}`
+            '${{ env.SPEC }}'
+            ```
 
             #### Link to results: 
             ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

CHANGELOG.md

@@ -48,19 +48,22 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Table Visualization] Fix width of multiple tables when rendered in column view ([#4638](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4638))
 - [Legacy Maps] Fix dark mode style overrides ([#4658](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4658))
 - [BUG] Fix management overview page duplicate rendering ([#4636](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4636))
+- Bump `agentkeepalive` to v4.5.0 to solve a problem preventing the use `https://ip` in `opensearch.hosts` ([#4949](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4949))
 - [Table Vis] Fix filter actions on data table vis cells ([#4837](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4837))
 - Fix broken app when management is turned off ([#4891](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4891))
 - Correct the generated path for downloading plugins by their names on Windows ([#4953](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4953))
 - [BUG] Fix buildPointSeriesData unit test fails due to local timezone ([#4992](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4992))
 - [BUG][Data Explorer][Discover] Fix total hits issue for no time based data ([#5087](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5087))
 - [BUG][Data Explorer][Discover] Automatically load solo added default index pattern ([#5171](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5171))
+- [BUG][Data Explorer][Discover] Add onQuerySubmit to top nav and allow force update to embeddable ([#5160](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5160))
 
 ### 🚞 Infrastructure
 
 - Re-enable CI workflows for feature branches ([#2908](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2908))
 - Upgrade yarn version to be compatible with @opensearch-project/opensearch ([#3443](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3443))
 - Add an achievement badger to the PR ([#3721](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3721))
 - [CI] Enable inputs for manually triggered Cypress test jobs ([#5134](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5134))
+- [CI] Add `NODE_OPTIONS` and disable disk allocation threshold ([#5172](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5172))
 
 ### 📝 Documentation
 

DEVELOPER_GUIDE.md

@@ -62,6 +62,17 @@ We recommend using [Node Version Manager (nvm)](https://github.com/nvm-sh/nvm) t
 
 If it's the only version of node installed, it will automatically be set to the `default` alias. Otherwise, use `nvm list` to see all installed `node` versions, and `nvm use` to select the node version required by OpenSearch Dashboards.
 
+### Fork and clone OpenSearch Dashboards
+
+All local development should be done in a [forked repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
+Fork OpenSearch Dashboards by clicking the "Fork" button at the top of the [GitHub repository](https://github.com/opensearch-project/OpenSearch-Dashboards).
+
+Clone your forked version of OpenSearch Dashboards to your local machine (replace `opensearch-project` in the command below with your GitHub username):
+
+```bash
+$ git clone [email protected]:opensearch-project/OpenSearch-Dashboards.git
+```
+
 #### Install `yarn`
 
 OpenSearch Dashboards is set up using yarn, which can be installed through corepack. To install yarn, run:
@@ -76,17 +87,6 @@ $ corepack install
 
 (See the [corepack documentation](https://github.com/nodejs/corepack#-corepack) for more information.)
 
-### Fork and clone OpenSearch Dashboards
-
-All local development should be done in a [forked repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
-Fork OpenSearch Dashboards by clicking the "Fork" button at the top of the [GitHub repository](https://github.com/opensearch-project/OpenSearch-Dashboards).
-
-Clone your forked version of OpenSearch Dashboards to your local machine (replace `opensearch-project` in the command below with your GitHub username):
-
-```bash
-$ git clone [email protected]:opensearch-project/OpenSearch-Dashboards.git
-```
-
 ### Bootstrap OpenSearch Dashboards
 
 If you haven't already, change directories to your cloned repository directory:

package.json

@@ -87,6 +87,7 @@
     "**/ansi-regex": "^5.0.1",
     "**/async": "^3.2.3",
     "**/d3-color": "^3.1.0",
+    "**/elasticsearch/agentkeepalive": "^4.5.0",
     "**/glob-parent": "^6.0.0",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/json-schema": "^0.4.0",
@@ -467,4 +468,4 @@
     "node": ">=14.20.1 <19",
     "yarn": "^1.22.10"
   }
-}
+}

src/core/server/legacy/integration_tests/logging.test.ts

@@ -149,10 +149,15 @@ describe('logging service', () => {
         platformLogger.warn('warn');
         platformLogger.error('error');
 
-        expect(mockConsoleLog).toHaveBeenCalledTimes(3);
+        /* ToDo: change to `toHaveBeenCalledTimes(3) and clean the snapshot when the dependency
+         *       on `elasticsearch` is removed. There should only be 3 calls but we get an extra
+         *       one from `agentkeepalive:deprecated`.
+         */
+        expect(mockConsoleLog).toHaveBeenCalledTimes(4);
 
         expect(getPlatformLogsFromMock(mockConsoleLog)).toMatchInlineSnapshot(`
           Array [
+            "[agentkeepalive:deprecated] %s",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][INFO ][test-file] info",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][WARN ][test-file] warn",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][ERROR][test-file] error",
@@ -180,10 +185,15 @@ describe('logging service', () => {
         platformLogger.warn('warn');
         platformLogger.error('error');
 
-        expect(mockConsoleLog).toHaveBeenCalledTimes(3);
+        /* ToDo: change to `toHaveBeenCalledTimes(3) and clean the snapshot when the dependency
+         *       on `elasticsearch` is removed. There should only be 3 calls but we get an extra
+         *       one from `agentkeepalive:deprecated`.
+         */
+        expect(mockConsoleLog).toHaveBeenCalledTimes(4);
 
         expect(getPlatformLogsFromMock(mockConsoleLog)).toMatchInlineSnapshot(`
           Array [
+            "[agentkeepalive:deprecated] %s",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][INFO ][test-file] info",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][WARN ][test-file] warn",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][ERROR][test-file] error",
@@ -217,10 +227,15 @@ describe('logging service', () => {
         platformLogger.warn('warn');
         platformLogger.error('error');
 
-        expect(mockConsoleLog).toHaveBeenCalledTimes(3);
+        /* ToDo: change to `toHaveBeenCalledTimes(3) and clean the snapshot when the dependency
+         *       on `elasticsearch` is removed. There should only be 3 calls but we get an extra
+         *       one from `agentkeepalive:deprecated`.
+         */
+        expect(mockConsoleLog).toHaveBeenCalledTimes(4);
 
         expect(getPlatformLogsFromMock(mockConsoleLog)).toMatchInlineSnapshot(`
           Array [
+            "[agentkeepalive:deprecated] %s",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][INFO ][test-file] info",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][WARN ][test-file] warn",
             "[xxxx-xx-xxTxx:xx:xx.xxxZ][ERROR][test-file] error",