Merge branch '1.x' into backport/backport-3514-to-1.x

opensearch-project · Jun 20, 2023 · af71008 · af71008
2 parents b999fb0 + b8994b9
commit af71008
Show file tree

Hide file tree

Showing 159 changed files with 665 additions and 310 deletions.
diff --git a/.github/.codecov.yml b/.github/.codecov.yml
@@ -1,7 +1,11 @@
 # https://docs.codecov.com/docs/codecov-yaml
+codecov:
+  require_ci_to_pass: yes
+
 coverage:
   status:
     project:
       default:
-        # https://docs.codecov.com/docs/commit-status#target
-        target: auto  # coverage must be equal or above the previous commit
+        target: auto
+        threshold: 2% # the leniency in hitting the target
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -94,6 +94,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [CVE-2022-46175] Bump json5 version from 1.0.1 and 2.2.1 to 1.0.2 and 2.2.3 ([#3201](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3201))
 - [CVE-2022-25912] Bump simple-git from 3.4.0 to 3.15.0 ([#3036](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3036))
 - Bump decode-uri-component from 0.2.0 to 0.2.2 ([#3009](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3009))
+- Bump highlight.js from 9.18.5 to 10.7.3 ([#4045](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4045))
 
 ### 🐛 Bug Fixes
 

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -17,6 +17,8 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Kristen Tian              | [kristenTian](https://github.com/kristenTian)       | Amazon      |
 | Zhongnan Su               | [zhongnansu](https://github.com/zhongnansu)         | Amazon      |
 | Manasvini B Suryanarayana | [manasvinibs](https://github.com/manasvinibs)       | Amazon      |
+| Tao Liu                   | [Flyingliuhub](https://github.com/Flyingliuhub)     | Amazon      |
+| Zilong Xia                | [ZilongX](https://github.com/ZilongX)               | Amazon      |
 
 ## Emeritus
 

diff --git a/package.json b/package.json
@@ -96,6 +96,7 @@
     "**/follow-redirects": "^1.15.2",
     "**/front-matter": "^4.0.2",
     "**/glob-parent": "^6.0.2",
+    "**/highlight.js": "^10.4.1",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/immer": "^8.0.1",
     "**/istanbul-instrumenter-loader/schema-utils": "^1.0.0",
@@ -116,7 +117,6 @@
     "**/prismjs": "^1.23.0",
     "**/qs": "^6.11.0",
     "**/react-syntax-highlighter": "^15.3.1",
-    "**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
     "**/request": "^2.88.2",
     "**/shelljs": "0.8.5",
     "**/scss-tokenizer": "^0.4.3",

diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json
@@ -46,7 +46,7 @@
     "grunt-babel": "^8.0.0",
     "grunt-contrib-clean": "^2.0.0",
     "grunt-contrib-copy": "^1.0.0",
-    "highlight.js": "^9.18.5",
+    "highlight.js": "^10.4.1",
     "html": "1.0.0",
     "html-loader": "^0.5.5",
     "imports-loader": "^0.8.0",

diff --git a/src/plugins/console/server/lib/spec_definitions/js/ingest.ts b/src/plugins/console/server/lib/spec_definitions/js/ingest.ts
@@ -41,7 +41,7 @@ const commonPipelineParams = {
   tag: '',
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/append-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const appendProcessorDefinition = {
   append: {
     __template: {
@@ -54,7 +54,7 @@ const appendProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/bytes-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const bytesProcessorDefinition = {
   bytes: {
     __template: {
@@ -69,7 +69,7 @@ const bytesProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/ingest-circle-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const circleProcessorDefinition = {
   circle: {
     __template: {
@@ -90,7 +90,7 @@ const circleProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/csv-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/csv/
 const csvProcessorDefinition = {
   csv: {
     __template: {
@@ -112,7 +112,7 @@ const csvProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/convert-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const convertProcessorDefinition = {
   convert: {
     __template: {
@@ -131,7 +131,7 @@ const convertProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/date-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/date/
 const dateProcessorDefinition = {
   date: {
     __template: {
@@ -147,7 +147,7 @@ const dateProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/date-index-name-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const dateIndexNameProcessorDefinition = {
   date_index_name: {
     __template: {
@@ -166,7 +166,7 @@ const dateIndexNameProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/dissect-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const dissectProcessorDefinition = {
   dissect: {
     __template: {
@@ -183,7 +183,7 @@ const dissectProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/dot-expand-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const dotExpanderProcessorDefinition = {
   dot_expander: {
     __template: {
@@ -195,15 +195,15 @@ const dotExpanderProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/drop-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const dropProcessorDefinition = {
   drop: {
     __template: {},
     ...commonPipelineParams,
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/fail-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const failProcessorDefinition = {
   fail: {
     __template: {
@@ -214,7 +214,7 @@ const failProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/foreach-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const foreachProcessorDefinition = {
   foreach: {
     __template: {
@@ -229,7 +229,7 @@ const foreachProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/geoip-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const geoipProcessorDefinition = {
   geoip: {
     __template: {
@@ -248,7 +248,7 @@ const geoipProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/grok-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/grok/
 const grokProcessorDefinition = {
   grok: {
     __template: {
@@ -268,7 +268,7 @@ const grokProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/gsub-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const gsubProcessorDefinition = {
   gsub: {
     __template: {
@@ -283,7 +283,7 @@ const gsubProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/htmlstrip-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const htmlStripProcessorDefinition = {
   html_strip: {
     __template: {
@@ -298,7 +298,7 @@ const htmlStripProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/inference-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const inferenceProcessorDefinition = {
   inference: {
     __template: {
@@ -314,7 +314,7 @@ const inferenceProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/join-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const joinProcessorDefinition = {
   join: {
     __template: {
@@ -327,7 +327,7 @@ const joinProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/json-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/parse-json/
 const jsonProcessorDefinition = {
   json: {
     __template: {
@@ -342,7 +342,7 @@ const jsonProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/kv-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const kvProcessorDefinition = {
   kv: {
     __template: {
@@ -362,7 +362,7 @@ const kvProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/lowercase-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/lowercase-string/
 const lowercaseProcessorDefinition = {
   lowercase: {
     __template: {
@@ -376,7 +376,7 @@ const lowercaseProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/pipeline-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const pipelineProcessorDefinition = {
   pipeline: {
     __template: {
@@ -387,7 +387,7 @@ const pipelineProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/remove-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const removeProcessorDefinition = {
   remove: {
     __template: {
@@ -398,7 +398,7 @@ const removeProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/rename-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const renameProcessorDefinition = {
   rename: {
     __template: {
@@ -414,7 +414,7 @@ const renameProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/script-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const scriptProcessorDefinition = {
   script: {
     __template: {},
@@ -427,7 +427,7 @@ const scriptProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/set-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const setProcessorDefinition = {
   set: {
     __template: {
@@ -443,7 +443,7 @@ const setProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/ingest-node-set-security-user-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const setSecurityUserProcessorDefinition = {
   set_security_user: {
     __template: {
@@ -455,7 +455,7 @@ const setSecurityUserProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/split-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/split-string/
 const splitProcessorDefinition = {
   split: {
     __template: {
@@ -471,7 +471,7 @@ const splitProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/sort-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const sortProcessorDefinition = {
   sort: {
     __template: {
@@ -483,7 +483,7 @@ const sortProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/trim-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/trim-string/
 const trimProcessorDefinition = {
   trim: {
     __template: {
@@ -497,7 +497,7 @@ const trimProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/uppercase-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/uppercase-string/
 const uppercaseProcessorDefinition = {
   uppercase: {
     __template: {
@@ -511,7 +511,7 @@ const uppercaseProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/urldecode-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const urlDecodeProcessorDefinition = {
   urldecode: {
     __template: {
@@ -526,7 +526,7 @@ const urlDecodeProcessorDefinition = {
   },
 };
 
-// Based on https://opensearch.org/docs/latest/guide/en/elasticsearch/reference/master/user-agent-processor.html
+// Based on https://opensearch.org/docs/latest/data-prepper/pipelines/configuration/processors/processors/
 const userAgentProcessorDefinition = {
   user_agent: {
     __template: {

diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json b/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json
@@ -24,6 +24,6 @@
       "{indices}/_bulk",
       "{indices}/{type}/_bulk"
     ],
-    "documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/document-apis/bulk/"
+    "documentation": "https://opensearch.org/docs/latest/api-reference/document-apis/bulk/"
   }
-}
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.aliases.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.aliases.json
@@ -22,6 +22,6 @@
       "_cat/aliases",
       "_cat/aliases/{name}"
     ],
-    "documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/"
+    "documentation": "https://opensearch.org/docs/latest/api-reference/cat/cat-aliases/"
   }
-}
+}
diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json
@@ -29,6 +29,6 @@
       "_cat/allocation",
       "_cat/allocation/{nodes}"
     ],
-    "documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-allocation/"
+    "documentation": "https://opensearch.org/docs/latest/api-reference/cat/cat-allocation/"
   }
-}
+}