Merge branch '1.x' into 1.x-bump-ajv

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

.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @ananzh @kavilla @seanneumann @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @kristenTian @zhongnansu @manasvinibs

CHANGELOG.md

@@ -18,7 +18,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [CVE-2021-3803] Bump nth-check from `1.0.2` to `2.0.1` ([#3729](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3729))
 - [CVE-2022-25858] Bump terser from `4.8.0` to `4.8.1` ([#3726](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3726))
 - [CVE-2020-15366] Bump ajv from `4.11.8` to `6.12.6` ([#3769](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3769))
+- [CVE-2021-35065] Bump glob-parent from `6.0.0` to `6.0.2` ([#3742](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3742))
 - [CVE-2022-25851] Bump jpeg-js from `0.4.1` to `0.4.4` ([#3741](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3741))
+- [CVE-2022-48285] Bump jszip from `3.7.1` to `3.10.1` ([#3740](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3740))
 
 ### 📈 Features/Enhancements
 
@@ -142,6 +144,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Temporary workaround for task-kill exceptions on Windows when it is passed a pid for a process that is already dead ([#2842](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2842))
 - [Build] Fixed "Last Access Time" not being set by `scanCopy` on Windows ([#2964](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2964))
 - Update `leaflet-vega` and fix its usage ([#3005](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3005))
+- Add clarifying tooltips to header navigation ([#3573](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/3573))
 
 ### 🚞 Infrastructure
 

MAINTAINERS.md

@@ -7,8 +7,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Maintainer                | GitHub ID                                           | Affiliation |
 | ------------------------- | --------------------------------------------------- | ----------- |
 | Anan Zhuang               | [ananzh](https://github.com/ananzh)                 | Amazon      |
-| Bishoy Boktor             | [boktorbb](https://github.com/boktorbb)             | Amazon      |
-| Mihir Soni                | [mihirsoni](https://github.com/mihirsoni)           | Amazon      |
 | Kawika (Rocky) Avilla     | [kavilla](https://github.com/kavilla)               | Amazon      |
 | Sean Neumann              | [seanneumann](https://github.com/seanneumann)       | Amazon      |
 | Miki Barahmand            | [AMoo-Miki](https://github.com/AMoo-Miki)           | Amazon      |
@@ -25,3 +23,5 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Maintainer    | GitHub ID                               | Affiliation |
 | ------------- | --------------------------------------- | ----------- |
 | Tommy Markley | [tmarkley](https://github.com/tmarkley) | Amazon      |
+| Mihir Soni    | [mihirsoni](https://github.com/mihirsoni) | Amazon      |
+| Bishoy Boktor | [boktorbb](https://github.com/boktorbb) | Amazon      |

package.json

@@ -95,7 +95,7 @@
     "**/flat": "^5.0.2",
     "**/follow-redirects": "^1.15.2",
     "**/front-matter": "^4.0.2",
-    "**/glob-parent": "^6.0.0",
+    "**/glob-parent": "^6.0.2",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/immer": "^8.0.1",
     "**/istanbul-instrumenter-loader/schema-utils": "^1.0.0",

packages/opensearch-eslint-config-opensearch-dashboards/README.md

@@ -4,7 +4,7 @@ The eslint config used by the opensearch dashboards team
 
 ## Usage
 
-To use this eslint config, just install the peer dependencies and reference it 
+To use this eslint config, just install the peer dependencies and reference it
 in your `.eslintrc`:
 
 ```javascript
@@ -17,8 +17,8 @@ in your `.eslintrc`:
 
 ## Optional jest config
 
-If the project uses the [jest test runner](https://facebook.github.io/jest/), 
-the `@elastic/eslint-config-kibana/jest` config can be extended as well to use 
+If the project uses the [jest test runner](https://jestjs.io),
+the `@elastic/eslint-config-kibana/jest` config can be extended as well to use
 `eslint-plugin-jest` and add settings specific to it:
 
 ```javascript

scripts/jest.js

@@ -40,7 +40,7 @@
 //
 //     node scripts/jest --coverage
 //
-// See all cli options in https://facebook.github.io/jest/docs/cli.html
+// See all cli options in https://jestjs.io/docs/cli
 
 var resolve = require('path').resolve;
 process.argv.push('--config', resolve(__dirname, '../src/dev/jest/config.js'));

scripts/jest_integration.js

@@ -40,7 +40,7 @@
 //
 //     node scripts/jest_integration --coverage
 //
-// See all cli options in https://facebook.github.io/jest/docs/cli.html
+// See all cli options in https://jestjs.io/docs/cli
 
 var resolve = require('path').resolve;
 process.argv.push('--config', resolve(__dirname, '../src/dev/jest/config.integration.js'));

src/core/public/chrome/ui/header/header.tsx

@@ -175,7 +175,13 @@ export function Header({
                   aria-controls={navId}
                   ref={toggleCollapsibleNavRef}
                 >
-                  <EuiIcon type="menu" size="m" />
+                  <EuiIcon
+                    type="menu"
+                    size="m"
+                    title={i18n.translate('core.ui.primaryNav.menu', {
+                      defaultMessage: 'Menu',
+                    })}
+                  />
                 </EuiHeaderSectionItemButton>
               </EuiHeaderSectionItem>
 

src/core/public/chrome/ui/header/header_help_menu.tsx

@@ -330,7 +330,15 @@ class HeaderHelpMenuUI extends Component<Props, State> {
         })}
         onClick={this.onMenuButtonClick}
       >
-        <EuiIcon type="help" size="m" />
+        <EuiIcon type="questionInCircle" size="m" />
+        <EuiIcon
+          type="help"
+          size="m"
+          title={intl.formatMessage({
+            id: 'core.ui.chrome.headerGlobalNav.helpMenuButtonTitle',
+            defaultMessage: 'Help',
+          })}
+        />
       </EuiHeaderSectionItemButton>
     );
 

src/dev/jest/junit_reporter.js

@@ -55,7 +55,7 @@ export default class JestJUnitReporter {
   /**
    * Called by jest when all tests complete
    * @param {Object} contexts
-   * @param {JestResults} results see https://facebook.github.io/jest/docs/en/configuration.html#testresultsprocessor-string
+   * @param {JestResults} results see https://jestjs.io/docs/configuration/#testresultsprocessor-string
    * @return {undefined}
    */
   onRunComplete(contexts, results) {

test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "@elastic/eui": "29.3.2",

test/plugin_functional/plugins/app_link_test/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_app_status/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_plugin_a/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_plugin_appleave/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_plugin_b/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_plugin_chromeless/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_plugin_route_timeouts/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_plugin_static_assets/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/core_provider_plugin/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/data_search/package.json

@@ -6,8 +6,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/doc_views_links_plugin/package.json

@@ -0,0 +1,17 @@
+{
+    "name": "docViewLinksPlugin",
+    "version": "1.0.0",
+    "main": "target/test/plugin_functional/plugins/doc_views_links_plugin",
+    "opensearchDashboards": {
+      "version": "opensearchDashboards",
+      "templateVersion": "1.0.0"
+    },
+    "license": "Apache-2.0",
+    "scripts": {
+      "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+      "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
+    },
+    "devDependencies": {
+      "typescript": "4.0.2"
+    }
+}

test/plugin_functional/plugins/doc_views_plugin/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/index_patterns/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/management_test_plugin/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/opensearch_client_plugin/package.json

@@ -6,8 +6,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/osd_sample_panel_action/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "@elastic/eui": "29.3.2",

test/plugin_functional/plugins/osd_top_nav/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"

test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "@elastic/eui": "29.3.2",

test/plugin_functional/plugins/rendering_plugin/package.json

@@ -8,8 +8,8 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "osd": "node ../../../../scripts/osd.js",
-    "build": "node ../../../../scripts/remove.js './target' && tsc"
+    "osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
+    "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
     "typescript": "4.0.2"