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

Refactored code to account for notifications server features API change #916

Merged

Conversation

amsiglan
Copy link
Collaborator

@amsiglan amsiglan commented Apr 4, 2024

Description

Notifications dashboards server route for fetching features (/api/notifications/features) was updated in PR opensearch-project/dashboards-notifications#181 so that we can fetch the channel types for which the channels should be shown in options menu. This PR makes the required code changes in alerting to consume these updates in notification.

NOTE: The changes in the dashboards-notifications PR 181 are required for the changes in this PR, else it will break alerting.

Issues Resolved

#795

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: Amardeepsingh Siglani <amardeep7194@gmail.com>
Copy link

codecov bot commented Apr 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.67%. Comparing base (413f1de) to head (7e13d2d).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #916      +/-   ##
==========================================
- Coverage   48.69%   48.67%   -0.02%     
==========================================
  Files         236      236              
  Lines        6845     6847       +2     
  Branches      996      996              
==========================================
  Hits         3333     3333              
- Misses       3509     3511       +2     
  Partials        3        3              

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

@amsiglan amsiglan merged commit c239ded into opensearch-project:main May 9, 2024
9 of 10 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 23, 2024
…ge (#916)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit c239ded)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 23, 2024
…ge (#916)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit c239ded)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-916-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c239ded7f5fe94984fedae7fae63157503bb8099
# Push it to GitHub
git push --set-upstream origin backport-916-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-916-to-2.x.

riysaxen-amzn pushed a commit to riysaxen-amzn/alerting-dashboards-plugin that referenced this pull request Jun 6, 2024
…ge (opensearch-project#916)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit c239ded)
riysaxen-amzn added a commit that referenced this pull request Jun 6, 2024
…ge (#916) (#966)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit c239ded)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.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.

3 participants