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

Assign VM and Hybrid VM initiatives to Platform MG #435

Merged
merged 34 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7a6e6eb
Testing assignment to Identity MG
Brunoga-MS Nov 18, 2024
aa6af8d
changing UAMI scope
Brunoga-MS Nov 18, 2024
fc8dab7
removing delayCount
Brunoga-MS Nov 18, 2024
c1a40d6
Added connectivity assignment for VM
Brunoga-MS Nov 18, 2024
16c4e0b
removing additional assignment
Brunoga-MS Nov 18, 2024
5a770bb
Added Identity and Connectivity assignments back
Brunoga-MS Nov 18, 2024
c593757
Removing ambaPolicyCompletion references and code
Brunoga-MS Nov 18, 2024
685d13a
Added ending comma removed by mistake
Brunoga-MS Nov 18, 2024
d8701ba
Removed extra comma
Brunoga-MS Nov 18, 2024
48bea8b
Assigning both VMs and Hybrid VMs alerts to Platform
Brunoga-MS Nov 20, 2024
e853cf3
Merge branch 'Azure:main' into Assign_VM_To_Identity
Brunoga-MS Nov 20, 2024
9c7879f
Fixed variable names to see different deployment names
Brunoga-MS Nov 20, 2024
a9fe284
Merge branch 'Assign_VM_To_Identity' of https://github.com/Brunoga-MS…
Brunoga-MS Nov 20, 2024
05ed49f
Added new remediation script that align with the naming convention of…
Brunoga-MS Nov 20, 2024
f2cfa8f
Aligned default value for AMBA-ALZ resource group and rebuilding poli…
Brunoga-MS Nov 20, 2024
33a8dcf
Updating policy set difinitions' version
Brunoga-MS Nov 20, 2024
9d97538
Updating versons on missing files
Brunoga-MS Nov 20, 2024
1fc4613
moved unused script to a different folder before removing definitely
Brunoga-MS Nov 21, 2024
3dc8790
Merge branch 'Azure:main' into Assign_VM_To_Identity
Brunoga-MS Nov 22, 2024
520b61f
Merge branch 'Azure:main' into Assign_VM_To_Identity
Brunoga-MS Nov 26, 2024
7779ae8
Updating policySetDefinition version on LB
Brunoga-MS Nov 26, 2024
6eba19d
Merge branch 'Assign_VM_To_Identity' of https://github.com/Brunoga-MS…
Brunoga-MS Nov 26, 2024
c3fd5bb
Update templateHash and version in Network policy definition
Brunoga-MS Nov 26, 2024
e7bc645
Updating documentation to align with new assignments
Brunoga-MS Nov 26, 2024
c4915f8
Update version numbers and templateHash in both Recovery Services and…
Brunoga-MS Nov 26, 2024
b8520ec
Reverting maintenance script file
Brunoga-MS Nov 26, 2024
dc76f24
Adding alz-portal template to show Platform MG
Brunoga-MS Nov 26, 2024
77f3180
Merge branch 'Azure:main' into Assign_VM_To_Identity
Brunoga-MS Nov 26, 2024
a0ed04e
Updating BYOnotification page to point to the correct script
Brunoga-MS Nov 26, 2024
ba198f8
added missing variable to remediate policy procedure
Brunoga-MS Nov 26, 2024
b4c6d2e
changed the platform mg param to be required
Brunoga-MS Nov 27, 2024
140986c
fixing wrong platform mg assigned value
Brunoga-MS Nov 27, 2024
951bed7
Fixed issue with the removal deployments
Brunoga-MS Nov 27, 2024
95a0384
put a dependency from policySetDefinition deployment to ensure assign…
Brunoga-MS Nov 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ Should customers decide to switch, it will be enough to:
- change the values in the parameter file to match one of the three cases previously discussed
- redeploy the ALZ pattern
- run the remediation for both [Notification Assets](https://raw.githubusercontent.com/Azure/azure-monitor-baseline-alerts/main/patterns/alz/policySetDefinitions/Deploy-Notification-Assets.json) and [Alerting-ServiceHealth](https://raw.githubusercontent.com/Azure/azure-monitor-baseline-alerts/main/patterns/alz/policySetDefinitions/Deploy-ServiceHealth-Alerts.json) policy initiatives
- remove notification assets deployed by ALZ patterns using the [**Remove-AMBANotificationAssets.ps1**](https://raw.githubusercontent.com/Azure/azure-monitor-baseline-alerts/main/patterns/alz/scripts/Remove-AMBANotificationAssets.ps1) script (_<b>***</b> only if moving from ALZ notification assets to BYON_)
- remove notification assets deployed by ALZ patterns using the [**Start-AMBA-ALZ-Maintenance.ps1**](https://raw.githubusercontent.com/Azure/azure-monitor-baseline-alerts/main/patterns/alz/scripts/Start-AMBA-ALZ-Maintenance.ps1) script (_<b>***</b> only if moving from ALZ notification assets to BYON_)

The code will reconfigure the Service Health alerts to use either the customer's action groups to the ALZ pattern notification assets according to the selected case.
The code will also reconfigure the Service Health alerts to use either the customer's action groups to the ALZ pattern notification assets according to the selected case.
5 changes: 4 additions & 1 deletion docs/content/patterns/alz/deploy/Remediate-Policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ For convenience, assuming that the management hierarchy is fully aligned to ALZ,
```powershell
#Modify the following variables to match your environment
$pseudoRootManagementGroup = "The pseudo root management group id parenting the Platform and Landing Zones management groups"
$platformManagementGroup = "The management group id for Platform"
$identityManagementGroup = "The management group id for Identity"
$managementManagementGroup = "The management group id for Management"
$connectivityManagementGroup = "The management group id for Connectivity"
Expand All @@ -53,15 +54,17 @@ $LZManagementGroup="The management group id for Landing Zones"
#Run the following commands to initiate remediation
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $pseudoRootManagementGroup -policyName Notification-Assets
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $pseudoRootManagementGroup -policyName Alerting-ServiceHealth
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $platformManagementGroup -policyName Alerting-HybridVM
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $platformManagementGroup -policyName Alerting-VM
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $connectivityManagementGroup -policyName Alerting-Connectivity
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $identityManagementGroup -policyName Alerting-Identity
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $managementManagementGroup -policyName Alerting-Management
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-KeyManagement
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-LoadBalancing
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-NetworkChanges
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-RecoveryServices
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-HybridVM
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-Storage
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-HybridVM
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-VM
.\patterns\alz\scripts\Start-AMBARemediation.ps1 -managementGroupName $LZManagementGroup -policyName Alerting-Web
```
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified docs/content/patterns/alz/media/alz-management-groups-single.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/content/patterns/alz/media/alz-management-groups.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions patterns/alz/alz-portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@
"toolTip": "Provide the name of the Management Group that will be used to host the platform resources.",
"constraints": {
"allowedValues": "[map(steps('Configuration').ManagementGroupAPI.value, (item) => parse(concat('{\"label\":\"', item.name, '\",\"value\":\"', item.name, '\"}')))]",
"required": false
"required": true
},
"visible": false
"visible": true
},
{
"name": "enableAMBAIdentity",
Expand Down Expand Up @@ -946,7 +946,7 @@
"enableAMBAIdentity": "[steps('Configuration').enableAMBAIdentity]",
"enableAMBAHybridVM": "[steps('Configuration').enableAMBAHybridVM]",
"enterpriseScaleCompanyPrefix": "[steps('Configuration').enterpriseScaleCompanyPrefix]",
"platformManagementGroup": "['contoso-platform']",
"platformManagementGroup": "[steps('Configuration').platformManagementGroup]",
"IdentityManagementGroup": "[if(equals(steps('Configuration').enableAMBAIdentity,'No'), 'contoso-identity', steps('Configuration').IdentityManagementGroup)]",
"managementManagementGroup": "[if(equals(steps('Configuration').enableAMBAManagement, 'No'), 'contoso-management', steps('Configuration').managementManagementGroup)]",
"connectivityManagementGroup": "[if(equals(steps('Configuration').enableAMBAConnectivity, 'No'), 'contoso-connectivity', steps('Configuration').connectivityManagementGroup)]",
Expand Down
Loading