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

Initial PR to enable MDS support for Monitors and Alerts Triggers within the Alerting Plugin. #949

Merged
merged 13 commits into from
May 22, 2024

Conversation

riysaxen-amzn
Copy link
Collaborator

@riysaxen-amzn riysaxen-amzn commented May 9, 2024

Description

  • MDS support for Monitors and Alert Triggers
  • Change Data Source to Select data in createMonitor page
  • Change Data Source to Index in viewMonitor page

Testing

Monitors

monitorsNeo12.mov
neoMonitors13.mov

Associate Monitors and Alert Triggers

neoAssociateAndAlerts.mov

Issue

879

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
riysaxen-amzn and others added 3 commits May 12, 2024 20:41
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
@riysaxen-amzn riysaxen-amzn changed the title Initial PR to enable MDS support for Monitors within the Alerting Plugin. Initial PR to enable MDS support for Monitors and Alerts Triggers within the Alerting Plugin. May 13, 2024
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
AWSHurneyt
AWSHurneyt previously approved these changes May 16, 2024
Copy link
Collaborator

@AWSHurneyt AWSHurneyt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving assuming CI passes.

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
server/plugin.js Outdated Show resolved Hide resolved
server/plugin.js Outdated Show resolved Hide resolved
public/pages/utils/helpers.js Outdated Show resolved Hide resolved
public/pages/Main/Main.js Outdated Show resolved Hide resolved
public/pages/Main/Main.js Show resolved Hide resolved
public/pages/MonitorDetails/containers/MonitorDetails.js Outdated Show resolved Hide resolved
public/pages/MonitorDetails/containers/MonitorDetails.js Outdated Show resolved Hide resolved
public/pages/MonitorDetails/containers/MonitorDetails.js Outdated Show resolved Hide resolved
public/pages/Main/Main.js Outdated Show resolved Hide resolved
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
@riysaxen-amzn riysaxen-amzn requested a review from amsiglan May 22, 2024 21:42
Copy link

codecov bot commented May 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.42%. Comparing base (0c13bae) to head (bba34b7).
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #949      +/-   ##
==========================================
- Coverage   48.70%   48.42%   -0.28%     
==========================================
  Files         236      237       +1     
  Lines        6852     6990     +138     
  Branches      997     1017      +20     
==========================================
+ Hits         3337     3385      +48     
- Misses       3512     3602      +90     
  Partials        3        3              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@riysaxen-amzn riysaxen-amzn merged commit da99e39 into opensearch-project:main May 22, 2024
11 of 13 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-949-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 da99e39c830e5e50b2e4ab314366d87e8f8a8cdc
# Push it to GitHub
git push --set-upstream origin backport-949-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-949-to-2.x.

riysaxen-amzn added a commit to riysaxen-amzn/alerting-dashboards-plugin that referenced this pull request Jun 6, 2024
…hin the Alerting Plugin. (opensearch-project#949)

* first setup for alerting MDS support

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixed some create-monitor issues

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixed create Monitor

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixed monitor actions for mds support

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix jest tests and added neo support for alertTriggers

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* minor bug fixes

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* minor bug fixes

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* remve dev code

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the comments by fixing minor issues

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the comments by fixing minor issues

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the comments

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the review comments

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit da99e39)
@riysaxen-amzn riysaxen-amzn mentioned this pull request Jun 6, 2024
5 tasks
riysaxen-amzn added a commit that referenced this pull request Jun 7, 2024
…hin the Alerting Plugin. (#949) (#968)

* first setup for alerting MDS support

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixed some create-monitor issues

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixed create Monitor

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixed monitor actions for mds support

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix jest tests and added neo support for alertTriggers

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* minor bug fixes

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* minor bug fixes

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* remve dev code

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the comments by fixing minor issues

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the comments by fixing minor issues

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the comments

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* address the review comments

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit da99e39)

Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.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.

4 participants