Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] 2.7 manual backports. #532

Merged
merged 5 commits into from
Apr 18, 2023

Conversation

AWSHurneyt
Copy link
Collaborator

Description

  1. Manually backported [Backport 2.x] Feature] deleting detectors should delete all related dashboards (including index patterns and visualisations) #528, [Backport 2.x] [BUG] Fixes few minor UX bugs #530, and [Backport 2.x] Minor bug fixes #512.
  2. Resolved some othercode discrepancies between 2.x and main which may have resulted from manually backporting PRs in the past.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • Commits are signed per the DCO using --signoff

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

jovancacvetkovic and others added 4 commits April 18, 2023 10:40
* [BUG] Edit details Save button should be blue opensearch-project#499

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling opensearch-project#496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling opensearch-project#496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling opensearch-project#496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
* [BUG] No space between the detector details and the rule panel opensearch-project#522
[BUG] A rule flyout without references have an empty link opensearch-project#521
[FEATURE] Update header size to use euiTitle--small opensearch-project#520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] No space between the detector details and the rule panel opensearch-project#522
[BUG] A rule flyout without references have an empty link opensearch-project#521
[FEATURE] Update header size to use euiTitle--small opensearch-project#520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
…luding index patterns and visualisations) (opensearch-project#515)

* Update detector details component opensearch-project#504

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
…discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
…discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt AWSHurneyt marked this pull request as ready for review April 18, 2023 19:40
@AWSHurneyt AWSHurneyt requested a review from a team April 18, 2023 19:40
@AWSHurneyt AWSHurneyt merged commit d0b1702 into opensearch-project:2.x Apr 18, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 18, 2023
* Minor bug fixes (#505)

* [BUG] Edit details Save button should be blue #499

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling #496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling #496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling #496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* [BUG] Fixes few minor UX bugs (#525)

* [BUG] No space between the detector details and the rule panel #522
[BUG] A rule flyout without references have an empty link #521
[FEATURE] Update header size to use euiTitle--small #520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] No space between the detector details and the rule panel #522
[BUG] A rule flyout without references have an empty link #521
[FEATURE] Update header size to use euiTitle--small #520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* Feature] deleting detectors should delete all related dashboards (including index patterns and visualisations) (#515)

* Update detector details component #504

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* Resolved merge conflicts, generated updated snapshot files, resolved discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Resolved merge conflicts, generated updated snapshot files, resolved discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
(cherry picked from commit d0b1702)
AWSHurneyt added a commit that referenced this pull request Apr 18, 2023
* Minor bug fixes (#505)

* [BUG] Edit details Save button should be blue #499

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling #496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling #496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling #496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* [BUG] Fixes few minor UX bugs (#525)

* [BUG] No space between the detector details and the rule panel #522
[BUG] A rule flyout without references have an empty link #521
[FEATURE] Update header size to use euiTitle--small #520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] No space between the detector details and the rule panel #522
[BUG] A rule flyout without references have an empty link #521
[FEATURE] Update header size to use euiTitle--small #520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* Feature] deleting detectors should delete all related dashboards (including index patterns and visualisations) (#515)

* Update detector details component #504

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) #509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* Resolved merge conflicts, generated updated snapshot files, resolved discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Resolved merge conflicts, generated updated snapshot files, resolved discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
(cherry picked from commit d0b1702)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/security-analytics-dashboards-plugin that referenced this pull request Oct 12, 2023
* Minor bug fixes (opensearch-project#505)

* [BUG] Edit details Save button should be blue opensearch-project#499

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling opensearch-project#496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling opensearch-project#496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] Detector details has some bad text handling opensearch-project#496

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* [BUG] Fixes few minor UX bugs (opensearch-project#525)

* [BUG] No space between the detector details and the rule panel opensearch-project#522
[BUG] A rule flyout without references have an empty link opensearch-project#521
[FEATURE] Update header size to use euiTitle--small opensearch-project#520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [BUG] No space between the detector details and the rule panel opensearch-project#522
[BUG] A rule flyout without references have an empty link opensearch-project#521
[FEATURE] Update header size to use euiTitle--small opensearch-project#520

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* Feature] deleting detectors should delete all related dashboards (including index patterns and visualisations) (opensearch-project#515)

* Update detector details component opensearch-project#504

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* [FEATURE] Deleting detectors should delete all related dashboards (including index-patterns and visualisations) opensearch-project#509

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>

* Resolved merge conflicts, generated updated snapshot files, resolved discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Resolved merge conflicts, generated updated snapshot files, resolved discrepancies between main and 2.x branch.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants