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

add auditDelegateMonitorAlerts flag #476

Merged
merged 3 commits into from
Jul 10, 2023

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Jul 10, 2023

Description

  • auditDelegateMonitorAlerts flag gives the option to create alerts in Audit state for delegate monitors in workflows.
  • this flag is set to true by default in alerting. it will be set to false in security analytics

Issues Resolved

[List any issues this PR will resolve]

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: Surya Sashank Nistala <snistala@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
@codecov
Copy link

codecov bot commented Jul 10, 2023

Codecov Report

Merging #476 (eaa7914) into main (b555e24) will increase coverage by 0.04%.
The diff coverage is 88.88%.

❗ Current head eaa7914 differs from pull request most recent head 1ef5f15. Consider uploading reports for the commit 1ef5f15 to get more accurate results

@@             Coverage Diff              @@
##               main     #476      +/-   ##
============================================
+ Coverage     74.37%   74.41%   +0.04%     
- Complexity      859      861       +2     
============================================
  Files           129      129              
  Lines          5573     5586      +13     
  Branches        683      684       +1     
============================================
+ Hits           4145     4157      +12     
  Misses         1125     1125              
- Partials        303      304       +1     
Impacted Files Coverage Δ
...lin/org/opensearch/commons/alerting/model/Alert.kt 73.55% <66.66%> (+0.06%) ⬆️
.../org/opensearch/commons/alerting/model/Workflow.kt 82.20% <90.90%> (+0.27%) ⬆️
...ommons/alerting/action/GetWorkflowAlertsRequest.kt 95.45% <100.00%> (+0.45%) ⬆️

getsaurabh02
getsaurabh02 previously approved these changes Jul 10, 2023
@@ -20,6 +20,7 @@ class GetWorkflowResponseTests {
val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
val newRes = GetWorkflowResponse(sin)
Assertions.assertEquals("id", newRes.id)
Assertions.assertFalse(newRes.workflow!!.auditDelegateMonitorAlerts!!)
Copy link
Member

Choose a reason for hiding this comment

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

We need another test where it checks if this is true when auditDelegateMonitorAlerts is not set.

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
@eirsep eirsep merged commit b2e9ddc into opensearch-project:main Jul 10, 2023
6 checks passed
@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:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-476-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b2e9ddc9aabe433901f0893c67d24fc8e3755992
# Push it to GitHub
git push --set-upstream origin backport/backport-476-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

eirsep added a commit that referenced this pull request Jul 10, 2023
* add auditDelegateMonitorAlerts flag

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* add audit state check in error alert validation

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* add test to verify workflow with auditDelegateMonitor flag null

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
eirsep added a commit that referenced this pull request Jul 11, 2023
* add auditDelegateMonitorAlerts flag



* add audit state check in error alert validation



* add test to verify workflow with auditDelegateMonitor flag null



---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 11, 2023
* add auditDelegateMonitorAlerts flag

* add audit state check in error alert validation

* add test to verify workflow with auditDelegateMonitor flag null

---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
(cherry picked from commit 90bea0c)
AWSHurneyt pushed a commit that referenced this pull request Jul 11, 2023
* add auditDelegateMonitorAlerts flag

* add audit state check in error alert validation

* add test to verify workflow with auditDelegateMonitor flag null

---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
(cherry picked from commit 90bea0c)

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
AWSHurneyt pushed a commit to AWSHurneyt/common-utils that referenced this pull request Apr 12, 2024
…rch-project#477)

* add auditDelegateMonitorAlerts flag



* add audit state check in error alert validation



* add test to verify workflow with auditDelegateMonitor flag null



---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.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.

4 participants