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.

Sign up for GitHub

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

Jump to bottom

AMBA Decoupling Service Health, Alert Rules and Action Groups #92

Merged
merged 82 commits into from
Jan 22, 2024
Merged

AMBA Decoupling Service Health, Alert Rules and Action Groups #92

merged 82 commits into from
Jan 22, 2024

Conversation

Brunoga-MS
Copy link
Collaborator

@Brunoga-MS Brunoga-MS commented Dec 13, 2023 •
edited
Loading

Overview/Summary

Reusing, mixing and merging effort from Alex. With this PR we have a separate Action group with different actions for SH and 1 Action Group with different actions and 1 Alert Processing Rule for generic purpose. This give the ability to use:

  • More than one email address
  • More than one Arm Role
  • More than one Webhook. No support for Secure Webhook. Secure Webhook will be supported as part of the upcoming BYO Notification Assets
  • More than one EventHub (within the same tenant)
  • Only 1 Logic App
  • Only 1 Function App

The SH alert notifications are now targeted to the SH action group.

This PR fixes/adds/changes/removes

  1. AMBA Decoupling Service Health, Alert Rules and Action Groups
  2. Fix an issue with the cleanup script that was removing all AMBA implementation from all management group. See BUG 32704 - CleanUp script removes AMBA from all configured pseudo MGs
  3. Add the capability to remove Action Groups and Alert Processing Rule during the cleanup. See BUG 32705 - CleanUp script does not remove Action Group and Alert Processing Rule

Breaking Changes

  1. NONE

As part of this Pull Request I have

  • Read the Contribution Guide and ensured this PR is compliant with the guide
  • Checked for duplicate Pull Requests
  • Associated it with relevant GitHub Issues or ADO Work Items (Internal Only)
  • Ensured my code/branch is up-to-date with the latest changes in the main branch
  • Ensured PR tests are passing
  • Updated relevant and associated documentation (e.g. Contribution Guide, Docs etc.)

@Brunoga-MS
testing new approach
63200f9
@Brunoga-MS
Fixing template file
f327d06
@Brunoga-MS
Updating template file
293e842
@Brunoga-MS
fixing issue with parameters
05902f1
@Brunoga-MS
Merge branch 'Dev' of https://github.com/Brunoga-MS/azure-monitor-bas…
d50ff14 
…eline-alerts into Dev
@Brunoga-MS
Fixing parameter issue
425ed99
@Brunoga-MS
Fixing missing parameters
9b2b045
@Brunoga-MS
fixing unused params
3a90c39
@Brunoga-MS
fixing missing params
5b91a42
@Brunoga-MS
fixing names and params
968a9dd
@Brunoga-MS
Adding FunctionApp to the list of Action groups
b5e5633
@Brunoga-MS
Adding missing params in the policySetDefinition file
1d0f98b
@Brunoga-MS
Adding missing params
926eef5
@Brunoga-MS
Adding missing params
8ef641d
@Brunoga-MS
reducing notification parameters
8cffbeb
@Brunoga-MS
reducing parameters
7d6ac13
@Brunoga-MS
Adding one existence condition
a549957
@Brunoga-MS
updated existenceCondition for SH
3c33f51
@Brunoga-MS
fixing the hnadling of empty parameters for Actions
da66fe7
@Brunoga-MS
Adding notifications to ResourceHealth alert
821abd0
@Brunoga-MS
managing multiple actions with multiple entries in one AG
fdf69ab
@Brunoga-MS
managing multiple actions with multiple entries in one AG 2
1b35946
@Brunoga-MS
Adding notification assets
9d492eb
@Brunoga-MS
Fixing wrong assignment to Action Group and
3413c29
@Brunoga-MS
Removing custom parameter file not necessary for the official source …
58fa7d0 
…code
@Brunoga-MS
Adding subscription display name to the Alert Processing Rule
4051c6c
@Brunoga-MS
Fixing issues with:
8a44037 
- Logic App callback url
- Function App trigger url
@Brunoga-MS
Fixing issues for:
d8d54aa 
- LogicApp callbalck url
- Function App Trigger Url
on SH Action group
@Brunoga-MS
Fixing missing parameters in the template
c4b377d
@Brunoga-MS
Adding missing parameters to SH policyset definition
dc30cd1
@Brunoga-MS
Fixing MG iteration for the old AG and ARP cleanup script and display…
270b887 
…names
@Brunoga-MS
Removing unnecessary parameters
f6ca52a
@Brunoga-MS
removing unnecessary param left in place for SH Security
1a98a59
@Brunoga-MS
Removing unused email param from SH-Incident
94b1aca
@Brunoga-MS
Removing unnecessary params from policydefinition for SH and for SH-I…
b25a20e 
…ncident
@Brunoga-MS
Removing unnecessary param from other SH policies and policySet
e989df9
@Brunoga-MS
Putting parameters which where in the previous policy version since p…
9ac2395 
…arameters cannot be removed
@Brunoga-MS
Refining parameter description
f50301d
@Brunoga-MS
Changed policy load order
6edf309
@Brunoga-MS
Merge pull request #1 from Brunoga-MS/DEV2
0db41f7 
Moving improvement on Dev2 to Dev
@Brunoga-MS
Adding missing param after optimization
0fae3ba
@Brunoga-MS
Merge pull request #2 from Brunoga-MS/DEV2
97b49a3 
Adding missing param after optimization
@Brunoga-MS
Fixing parameter passage for MonitorDisabled and Effect
87fd9ae
@Brunoga-MS
adding missing params for SH Action Groups
653c1c2
@Brunoga-MS
Fixing param displayname on notification assets
44fe933
@Brunoga-MS
Fixing param display name for Notification assets
815c961
@Brunoga-MS
Changed policy display name for notification assets and SH
bf31155
@Brunoga-MS
changing display name and description for notification assets
1812a44
@Brunoga-MS
fixed displayname for SH action groups policy
e2b6f62
@Brunoga-MS
Merge pull request #3 from Brunoga-MS/DEV2
2cb2cab 
Dev2
@Brunoga-MS
Changed display name for MonitorDisabled param
a648d49
@Brunoga-MS
Merge pull request #4 from Brunoga-MS/DEV2
5568f90 
Changed display name for MonitorDisabled param
@Brunoga-MS
Aligning deployment prefixes
9f30af3
@Brunoga-MS
aligning pseudoRootManagementGroup parameter name with variable name …
8831483 
…to avoid confusion
@Brunoga-MS
Merge pull request #5 from Brunoga-MS/DEV2
21783f1 
Dev2
arjenhuitema
arjenhuitema approved these changes Jan 22, 2024
View reviewed changes
Copy link
Contributor

@arjenhuitema arjenhuitema left a comment

Choose a reason for hiding this comment

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

LGTM. I'll merge it to DEV and will run tests this week.

@arjenhuitema arjenhuitema merged commit 9c7df64 into Azure:Dev Jan 22, 2024
1 check passed
@arjenhuitema arjenhuitema mentioned this pull request Jan 22, 2024
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arjenhuitema arjenhuitema arjenhuitema approved these changes

@Alboroni Alboroni Awaiting requested review from Alboroni

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Brunoga-MS @arjenhuitema