Skip to content

Resolve merge conflicts for backport 2.5#3725

Closed
cwillum wants to merge 142 commits intomainfrom
backport/backport-3184-to-2.5
Closed

Resolve merge conflicts for backport 2.5#3725
cwillum wants to merge 142 commits intomainfrom
backport/backport-3184-to-2.5

Conversation

@cwillum
Copy link
Contributor

@cwillum cwillum commented Apr 8, 2023

Description

Resolves merge conflicts for backport 2.5, a security analytics PR.

Issues Resolved

This is to fix merge conflicts in #3184

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

opensearch-trigger-bot bot and others added 30 commits January 24, 2023 14:24
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit 71c846a)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
* Adds version history 2.5

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Added more highlights to 2.5

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit 65600a5)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
* Adds cluster manager task throttling documentation

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Update cluster-manager-task-throttling.md

* Rewording

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* More rewording

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Reworded for clarity

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Incorporated doc review comments

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* More doc review comments

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Update _opensearch/cluster-manager-task-throttling.md

Co-authored-by: Nate Bower <nbower@amazon.com>

* Update _opensearch/cluster-manager-task-throttling.md

Co-authored-by: Nate Bower <nbower@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
Co-authored-by: Nate Bower <nbower@amazon.com>
(cherry picked from commit 99bc98a)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit fd90031)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit cba74b6)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
(cherry picked from commit 9343387)

Co-authored-by: Hyobin (Justin) You <hy002014@mymail.pomona.edu>
* Add additional ML cluster settings

Signed-off-by: Naarcha-AWS <naarcha@amazon.com>

* Update cluster-settings.md

* Fix other inaccuracies

Signed-off-by: Naarcha-AWS <naarcha@amazon.com>

* Update cluster-settings.md

* Update cluster-settings.md

* Update cluster-settings.md

Signed-off-by: Naarcha-AWS <naarcha@amazon.com>
(cherry picked from commit 985d31b)

Co-authored-by: Naarcha-AWS <97990722+Naarcha-AWS@users.noreply.github.com>
* Scroll to top when last visit was more than 24 hours ago

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Changed localStorage to sessionStorage

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit 8565bb2)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
* Makes version selector sticky

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Adds min width to site nav to accommodate version selector

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Makes site nav 100% vh

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit 84da2cf)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit b593ca8)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2155-sec-toc-config-reorg

Signed-off-by: cwillum <cwmmoore@amazon.com>

* Rename security section. Fix links. Add redirects

Signed-off-by: Naarcha-AWS <naarcha@amazon.com>

---------

Signed-off-by: cwillum <cwmmoore@amazon.com>
Signed-off-by: Naarcha-AWS <naarcha@amazon.com>
Co-authored-by: Naarcha-AWS <naarcha@amazon.com>
(cherry picked from commit d04e88b)

Co-authored-by: Chris Moore <107723039+cwillum@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit 7992ec0)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
* Add warning about regex experession in ML

* Update cluster-settings.md

* Update cluster-settings.md

* Update _ml-commons-plugin/cluster-settings.md

Co-authored-by: Yaliang Wu <ylwu@amazon.com>

* Update cluster-settings.md

---------

Co-authored-by: Yaliang Wu <ylwu@amazon.com>
(cherry picked from commit af824b3)

Co-authored-by: Naarcha-AWS <97990722+Naarcha-AWS@users.noreply.github.com>
…2546)

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

* Update _security-analytics/sec-analytics-config/detectors-config.md

Co-authored-by: Naarcha-AWS <97990722+Naarcha-AWS@users.noreply.github.com>

* Update _security-analytics/sec-analytics-config/detectors-config.md

Co-authored-by: Naarcha-AWS <97990722+Naarcha-AWS@users.noreply.github.com>

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

* fix#2400-updates-revisit

Signed-off-by: cwillum <cwmmoore@amazon.com>

---------

Signed-off-by: cwillum <cwmmoore@amazon.com>
Co-authored-by: Naarcha-AWS <97990722+Naarcha-AWS@users.noreply.github.com>
(cherry picked from commit 8b8d968)

Co-authored-by: Chris Moore <107723039+cwillum@users.noreply.github.com>
Creates new documentation website page and Discover content.
---------

Signed-off-by: vagimeli <vagimeli@amazon.com>
(cherry picked from commit d67fa6b)

Co-authored-by: Melissa Vagi <105296784+vagimeli@users.noreply.github.com>
Create new documentation site pages and content for foundational user documentation
---------

Signed-off-by: vagimeli <vagimeli@amazon.com>
(cherry picked from commit 80aba53)

Co-authored-by: Melissa Vagi <105296784+vagimeli@users.noreply.github.com>
Signed-off-by: ariamarble <armarble@amazon.com>
(cherry picked from commit 0b9f2c8)

Co-authored-by: Aria Marble <111301581+ariamarble@users.noreply.github.com>
* Adds max_shard_size parameter to shrink API

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Implemented tech review comment

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* One more rewording

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Implemented doc review comments

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

* Update _api-reference/index-apis/shrink-index.md

Co-authored-by: Nathan Bower <nbower@amazon.com>

* Update _api-reference/index-apis/shrink-index.md

Co-authored-by: Nathan Bower <nbower@amazon.com>

* Update _api-reference/index-apis/shrink-index.md

Co-authored-by: Nathan Bower <nbower@amazon.com>

* Implemented editorial comments

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>

---------

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
Co-authored-by: Nathan Bower <nbower@amazon.com>
(cherry picked from commit 6e120ec)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Signed-off-by: cwillum <cwmmoore@amazon.com>
(cherry picked from commit 24cf6fd)

Co-authored-by: Chris Moore <107723039+cwillum@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit ebdce35)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Signed-off-by: cwillum <cwmmoore@amazon.com>
(cherry picked from commit a6503a5)

Co-authored-by: Chris Moore <107723039+cwillum@users.noreply.github.com>
Signed-off-by: Naarcha-AWS <naarcha@amazon.com>
(cherry picked from commit 6ebd6cf)

Co-authored-by: Naarcha-AWS <97990722+Naarcha-AWS@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit 7aa5f40)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit d7e8cde)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Signed-off-by: Naarcha-AWS <naarcha@amazon.com>
(cherry picked from commit 45834d6)
* Organize Dashboards TOC in logical order; copy edits for spelling and style guide compliance

Signed-off-by: vagimeli <vagimeli@amazon.com>
(cherry picked from commit 6511176)

Co-authored-by: Melissa Vagi <105296784+vagimeli@users.noreply.github.com>
Signed-off-by: vagimeli <vagimeli@amazon.com>
(cherry picked from commit 79e489e)

Co-authored-by: Melissa Vagi <105296784+vagimeli@users.noreply.github.com>
* Added cluster permissions to cluster permissions list.

Signed-off-by: carolxob <carolxob@amazon.com>

* Revert "Added cluster permissions to cluster permissions list."

This reverts commit 48a9fb5.

* Adding new Trace Analytics page.

Signed-off-by: carolxob <carolxob@amazon.com>

* Add new trace analytics page.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated technical review feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Added Trace tuning content before 'Pipeline configuration' section.

Signed-off-by: carolxob <carolxob@amazon.com>

* Adjusted heading levels to Trace tuning content.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor changes to URL format.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits, fixed image links.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor updates to phrasing.

Signed-off-by: carolxob <carolxob@amazon.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Minor edits based on tech review feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor updates to links.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor link updates.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits to URLs.

Signed-off-by: carolxob <carolxob@amazon.com>

* Updated links.

Signed-off-by: carolxob <carolxob@amazon.com>

* Commit test.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated some feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits to get started.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor updates.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated technical review feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor changes to phrasing.

Signed-off-by: carolxob <carolxob@amazon.com>

* Made some edits from editorial feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated editorial feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: Nathan Bower <nbower@amazon.com>

* Update _data-prepper/trace-analytics.md

Co-authored-by: Nathan Bower <nbower@amazon.com>

* Minor changes.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated more editorial feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated more editorial feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated more editorial feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Additional feedback incorporated from editorial.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits from editorial review feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Fixed merge conflict...again.

Signed-off-by: carolxob <carolxob@amazon.com>

* Incorporated editorial feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

---------

Signed-off-by: carolxob <carolxob@amazon.com>
Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Co-authored-by: Nathan Bower <nbower@amazon.com>
(cherry picked from commit 7f5cded)

Co-authored-by: Caroline <113052567+carolxob@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
(cherry picked from commit fff6502)

Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
* Creating PR with first file.

Signed-off-by: carolxob <carolxob@amazon.com>

* Adding newly created files to PR.

Signed-off-by: carolxob <carolxob@amazon.com>

* Reorganized files and added appropriate metadata to map ToC correctly.

Signed-off-by: carolxob <carolxob@amazon.com>

* Moved Authoring pipelines page.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor ToC updates.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor ToC updates to Sources section for Data Prepper.

Signed-off-by: carolxob <carolxob@amazon.com>

* Updated Buffers section under Data Prepper.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor update to otelmetricssource.

Signed-off-by: carolxob <carolxob@amazon.com>

* Restructured ToC in Processors section for Data Prepper.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor filename change.

Signed-off-by: carolxob <carolxob@amazon.com>

* Adjustments to metadata in ToC.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edit.

Signed-off-by: carolxob <carolxob@amazon.com>

* Fixed nav order in metadata.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edit.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor update top metadata for ToC.

Signed-off-by: carolxob <carolxob@amazon.com>

* Adjustmenets to Toc order.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor adjustments to ToC metadata.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor adjustments to Sinks section.

Signed-off-by: carolxob <carolxob@amazon.com>

* Adjustements to high level ToC.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor adjustement to Pipelines.md

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor update.

Signed-off-by: carolxob <carolxob@amazon.com>

* Slight reorganization. Removed two placeholder pages for now.

Signed-off-by: carolxob <carolxob@amazon.com>

* Removed a page and replaced with pipelines content.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor changes/additions to content for placeholder pages.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor update to page link.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor adjustments to ToC metadata.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Removed /clients from redirects to correct nav order.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor edits.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor adjustments to ToC metadata.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor adjustments.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor adjustment ot metadata.

Signed-off-by: carolxob <carolxob@amazon.com>

* TOC link fixes

Signed-off-by: Naarcha-AWS <naarcha@amazon.com>

* Changed page name.

Signed-off-by: carolxob <carolxob@amazon.com>

* Corrected references to Peer Forwarder.

Signed-off-by: carolxob <carolxob@amazon.com>

* Renamed Data Prepper folder.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor updates to phrasing and capitalization.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor phrasing update.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor phrasing update.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor change.

Signed-off-by: carolxob <carolxob@amazon.com>

* Minor change to change S3 Source to S3Source.

Signed-off-by: carolxob <carolxob@amazon.com>

* Updated references to peer forwarder and changed capitalization.

Signed-off-by: carolxob <carolxob@amazon.com>

* Updated capitalization for peer forwarder.

Signed-off-by: carolxob <carolxob@amazon.com>

* Made edits based on doc review feedback.

Signed-off-by: carolxob <carolxob@amazon.com>

* Update to one word.

Signed-off-by: carolxob <carolxob@amazon.com>

---------

Signed-off-by: carolxob <carolxob@amazon.com>
Signed-off-by: Naarcha-AWS <naarcha@amazon.com>
Co-authored-by: Naarcha-AWS <naarcha@amazon.com>
(cherry picked from commit 0249991)
opensearch-trigger-bot bot and others added 27 commits March 16, 2023 09:43
* Update put-mapping.md: add an example for "dynamic": "strict" in index mapping JSON

* Apply suggestions from code review

---------


(cherry picked from commit eead5ec)

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Aria Marble <111301581+ariamarble@users.noreply.github.com>
(cherry picked from commit f5cb14a)

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 98ed839)

Signed-off-by: ariamarble <armarble@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: JeffH-AWS <jeffhuss@amazon.com>
(cherry picked from commit 0c2c72f)

Signed-off-by: carolxob <carolxob@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Remove typo from ML cluster settings

* Update cluster-settings.md

Change default value

(cherry picked from commit 32bc0d2)
* Updated vector size.



* Incorporated feedback.



* Minor edits.



* Minor update.



* Minor edits for accuracy and clarity.



* Update _search-plugins/knn/approximate-knn.md



---------



(cherry picked from commit 5d2deed)

Signed-off-by: carolxob <carolxob@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
…heHttpClient5Transport, fix code samples (#3510) (#3536)

* Update OpenSearch Java Client documentation: update version, add ApacheHttpClient5Transport, fix code samples



* Address review comments



---------


(cherry picked from commit 4e58f94)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…#2944) (#3539)

(cherry picked from commit 713eac8)

Signed-off-by: Luca Nardi <luca.nardi@live.it>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
(cherry picked from commit a89eeb0)

Co-authored-by: Rupal Mahajan <maharup@amazon.com>
Link to permissions at https://opensearch.org/docs/latest/tuning-your-cluster/replication-plugin/permissions/ under Basic permissions is not pointing directly to the anchor on the same page. This causes unneccesary page reload and page redirect.
The invalid link provides no benefit as the same page ends up reloading and does not even start from anchor.


(cherry picked from commit 31ba0fb)

Signed-off-by: Monu Singh <msnghgw@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
… kibana (#3426) (#3564)

* fix#2723-OSD-kibana-roles



* fix#2723-OSD-kibana-roles



* fix#2723-OSD-kibana-roles



---------


(cherry picked from commit 85c3f91)

Signed-off-by: cwillum <cwmmoore@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Heather Halter <hdhalter@amazon.com>
Need to talk about Metrics analytics on this page. We will highlight Prometheus separately.

(cherry picked from commit 576628c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 9354423)

Signed-off-by: Heather Halter <hdhalter@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…esolves authentication errors (#3251) (#3606)

* fix#3220 auth fail from clock skew



* fix#3220 auth fail from clock skew



* fix#3220 auth fail from clock skew



* fix#3220 auth fail from clock skew



* fix#3220 auth fail from clock skew



* fix#3220 auth fail from clock skew



---------


(cherry picked from commit 15d324d)

Signed-off-by: cwillum <cwmmoore@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit c4c89e7)

Signed-off-by: Naarcha-AWS <naarcha@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 4a46a24)

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 273cdcd)

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Opening new PR for file.



* Minor adjustements.



* Adjustements to tables.



* Removed some markdown comments.



* Minor updates.



* Minor edit.



* Adjustements to tables.



* Updates based on doc review feedback.



* MAde changes based on tech review feedback.



* Updated text for YAML file path locations.



* Edits made based on technical review feedback.



* Minor edits from tech review feedback.



* Minor edits.



* Updates based on tech review feedback and formatting.



* Minor upate from doc review feedback.



* Edits from doc review feedback.



* Updates based on doc review feedback.



* Minor updates.



* Minor edits.



* Minor edits.



* Added copy button to relevant code blocks.



* Minor edits.



* Added links.



* Minor edits.



* Minor edits.



* Minor updates.



* Minor edits.



* Minor updates.



* Minor edits based on doc review.



* Minor edits based on doc review feedback.



* Edits made based on doc review feedback.



* Minor update to include key examples.



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Fixing commit.



* Minor edits.



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Update _data-prepper/pipelines/configuration/processors/mutate-event.md



* Incorporating editorial review changes.



* Incorporated the rest of editorial feedback received.



* Minor updates based on feedback comments.



---------



(cherry picked from commit 04f12af)

Signed-off-by: carolxob <carolxob@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Nathan Bower <nbower@amazon.com>
…ec set to `0mb` or less (#3649) (#3669)

* After a lovely surprise when trying to limit the recovery completely and discovering the opposite was happening I see we need the documentation to include this nice extra info.
Resolves #3648



* Modifying the proposal based on maintainers input.



---------


(cherry picked from commit b6763b1)

Signed-off-by: AmiStrn <123amitai@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
* Refactor k-NN filter search



* Implemented tech review comments



* Implemented doc review feedback



* Apply suggestions from code review



* One more editorial review comment



---------



(cherry picked from commit ade705e)

Signed-off-by: Fanit Kolchina <kolchfa@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Nathan Bower <nbower@amazon.com>
…#3645) (#3688)

* fix missing securityadmin path



* fix missing securityadmin path



* fix missing securityadmin path



* fix missing securityadmin path



* fix missing securityadmin path



---------


(cherry picked from commit 89b16a9)

Signed-off-by: cwillum <cwmmoore@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Add Parse JSON processor doc.



* Minor edit.



* Formatted some information as a table instead of a list.



* Minor edits.



* Removed smaller Parse JSON file.



* Minor updates.



* Minor edits to table.



* Minor updates.



* Minor update based on tech feedback.



* Minor updates.



* Modified 'indices' to 'indexes'



* Minor edits.



* Minor edits.



* Minor edits.



* Minor edits.



* Minor edits.



* Modified title.



* Content edits from doc and editorial reviews.



* Minor edit.



* Updates.



* Final review comments incorporated.



---------


(cherry picked from commit a246c60)

Signed-off-by: carolxob <carolxob@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit ce231ea)

Signed-off-by: David Tippett <dtip@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: cwillum <cwmmoore@amazon.com>
@cwillum cwillum self-assigned this Apr 8, 2023
@github-actions github-actions bot closed this Apr 8, 2023
@github-actions github-actions bot deleted the backport/backport-3184-to-2.5 branch April 8, 2023 01:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants