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

AMBA Service Health Granular Deployment Flexibility #45

Merged
merged 8 commits into from
Oct 25, 2023
Merged

AMBA Service Health Granular Deployment Flexibility #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7acb7a7
AMBA
Brunoga-MS Oct 17, 2023
e94578f
SH Granular Deployment Flexibility
Brunoga-MS Oct 17, 2023
005699a
Merge branch 'Azure:main' into main
Brunoga-MS Oct 18, 2023
10dc665
Merge branch 'Azure:main' into main
Brunoga-MS Oct 18, 2023
43ab735
Adding ReseHlth to Granular Deployment Flexibility
Brunoga-MS Oct 24, 2023
55e5ec7
re-building policies.json file
Brunoga-MS Oct 24, 2023
35fb91d
Merge branch 'Azure:main' into main
Brunoga-MS Oct 25, 2023
3627595
Formatting
arjenhuitema Oct 25, 2023
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
15 changes: 15 additions & 0 deletions patterns/alz/alzArm.param.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,32 @@
"ResHlthUnhealthyAlertState": {
"value": "true"
},
"ResHlthUnhealthyPolicyEffect": {
"value": "deployIfNotExists"
},
"SvcHlthAdvisoryAlertState": {
"value": "true"
},
"serviceHealthAdvisoryPolicyEffect": {
"value": "deployIfNotExists"
},
"SvcHlthIncidentAlertState": {
"value": "true"
},
"serviceHealthIncidentPolicyEffect": {
"value": "deployIfNotExists"
},
"SvcHlthMaintenanceAlertState": {
"value": "true"
},
"serviceHealthMaintenancePolicyEffect": {
"value": "deployIfNotExists"
},
"svcHlthSecAdvisoryAlertState": {
"value": "true"
},
"serviceHealthSecurityPolicyEffect": {
"value": "deployIfNotExists"
}
}
},
Expand Down
16 changes: 8 additions & 8 deletions patterns/alz/policyDefinitions/policies.json
View file
Open in desktop

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions patterns/alz/policySetDefinitions/Deploy-ServiceHealth-Alerts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@
"description": "State of the Resource Health Unhealthy alert"
}
},
"ResHlthUnhealthyPolicyEffect": {
"type": "string",
"defaultValue": "deployIfNotExists",
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"metadata": {
"displayName": "Resource Health Unhealthy Alert Policy Effect",
"description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist"
}
},
"SvcHlthAdvisoryAlertState": {
"type": "string",
"defaultValue": "true",
Expand All @@ -57,6 +69,18 @@
"description": "State of the Service Health Advisory alert"
}
},
"serviceHealthAdvisoryPolicyEffect": {
"type": "string",
"defaultValue": "deployIfNotExists",
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"metadata": {
"displayName": "Service Health Advisory Alert Policy Effect",
"description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist"
}
},
"SvcHlthIncidentAlertState": {
"type": "string",
"defaultValue": "true",
Expand All @@ -65,6 +89,18 @@
"description": "State of the Service Health Incident alert"
}
},
"serviceHealthIncidentPolicyEffect": {
"type": "string",
"defaultValue": "deployIfNotExists",
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"metadata": {
"displayName": "Service Health Incident Alert Policy Effect",
"description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist"
}
},
"SvcHlthMaintenanceAlertState": {
"type": "string",
"defaultValue": "true",
Expand All @@ -73,6 +109,18 @@
"description": "State of the Service Health Maintenance alert"
}
},
"serviceHealthMaintenancePolicyEffect": {
"type": "string",
"defaultValue": "deployIfNotExists",
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"metadata": {
"displayName": "Service Health Maintenance Alert Policy Effect",
"description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist"
}
},
"svcHlthSecAdvisoryAlertState": {
"type": "string",
"defaultValue": "true",
Expand All @@ -81,6 +129,18 @@
"description": "State of the Service Health Security Advisory alert"
}
},
"serviceHealthSecurityPolicyEffect": {
"type": "string",
"defaultValue": "deployIfNotExists",
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"metadata": {
"displayName": "Service Health Security Advisory Alert Policy Effect",
"description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist"
}
},
"ALZMonitorActionGroupEmail": {
"type": "string",
"defaultValue": "[email protected]",
Expand All @@ -106,6 +166,9 @@
"enabled": {
"value": "[[parameters('ResHlthUnhealthyAlertState')]"
},
"effect": {
"value": "[[parameters('ResHlthUnhealthyPolicyEffect')]"
},
"alertResourceGroupName": {
"value": "[[parameters('ALZMonitorResourceGroupName')]"
},
Expand All @@ -124,6 +187,9 @@
"enabled": {
"value": "[[parameters('SvcHlthAdvisoryAlertState')]"
},
"effect": {
"value": "[[parameters('serviceHealthAdvisoryPolicyEffect')]"
},
"alertResourceGroupName": {
"value": "[[parameters('ALZMonitorResourceGroupName')]"
},
Expand All @@ -145,6 +211,9 @@
"enabled": {
"value": "[[parameters('SvcHlthIncidentAlertState')]"
},
"effect": {
"value": "[[parameters('serviceHealthIncidentPolicyEffect')]"
},
"alertResourceGroupName": {
"value": "[[parameters('ALZMonitorResourceGroupName')]"
},
Expand All @@ -166,6 +235,9 @@
"enabled": {
"value": "[[parameters('SvcHlthMaintenanceAlertState')]"
},
"effect": {
"value": "[[parameters('serviceHealthMaintenancePolicyEffect')]"
},
"alertResourceGroupName": {
"value": "[[parameters('ALZMonitorResourceGroupName')]"
},
Expand All @@ -187,6 +259,9 @@
"enabled": {
"value": "[[parameters('svcHlthSecAdvisoryAlertState')]"
},
"effect": {
"value": "[[parameters('serviceHealthSecurityPolicyEffect')]"
},
"alertResourceGroupName": {
"value": "[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down
16 changes: 14 additions & 2 deletions services/Resources/subscriptions/Deploy-ActivityLog-ResourceHealth-UnHealthly-Alert.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,23 @@
},
"defaultValue": "centralus"
},
"effect": {
"type": "String",
"metadata": {
"displayName": "Effect",
"description": "Effect of the policy"
},
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"defaultValue": "disabled"
},
"MonitorDisable": {
"type": "String",
"metadata": {
"displayName": "Effect",
"description": "Tag name to disable monitoring on subscripton level alerts. Set to true if monitoring should be disabled"
"description": "Tag name to disable monitoring on subscription level alerts. Set to true if monitoring should be disabled"
},
"defaultValue": "MonitorDisable"
}
Expand All @@ -79,7 +91,7 @@
]
},
"then": {
"effect": "deployIfNotExists",
"effect": "[[parameters('effect')]",
"details": {
"roleDefinitionIds": [
"/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
Expand Down
16 changes: 14 additions & 2 deletions services/Resources/subscriptions/Deploy-ActivityLog-ServiceHealth-Health.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@
},
"defaultValue": "[email protected]"
},
"effect": {
"type": "String",
"metadata": {
"displayName": "Effect",
"description": "Effect of the policy"
},
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"defaultValue": "disabled"
},
"MonitorDisable": {
"type": "String",
"metadata": {
Expand All @@ -86,7 +98,7 @@
]
},
"then": {
"effect": "deployIfNotExists",
"effect": "[[parameters('effect')]",
"details": {
"roleDefinitionIds": [
"/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
Expand Down Expand Up @@ -306,4 +318,4 @@
}
}
}
}
}
16 changes: 14 additions & 2 deletions services/Resources/subscriptions/Deploy-ActivityLog-ServiceHealth-Incident.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@
},
"defaultValue": "[email protected]"
},
"effect": {
"type": "String",
"metadata": {
"displayName": "Effect",
"description": "Effect of the policy"
},
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"defaultValue": "disabled"
},
"MonitorDisable": {
"type": "String",
"metadata": {
Expand All @@ -86,7 +98,7 @@
]
},
"then": {
"effect": "deployIfNotExists",
"effect": "[[parameters('effect')]",
"details": {
"roleDefinitionIds": [
"/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
Expand Down Expand Up @@ -306,4 +318,4 @@
}
}
}
}
}
14 changes: 13 additions & 1 deletion services/Resources/subscriptions/Deploy-ActivityLog-ServiceHealth-Maintenance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@
},
"defaultValue": "[email protected]"
},
"effect": {
"type": "String",
"metadata": {
"displayName": "Effect",
"description": "Effect of the policy"
},
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"defaultValue": "disabled"
},
"MonitorDisable": {
"type": "String",
"metadata": {
Expand All @@ -86,7 +98,7 @@
]
},
"then": {
"effect": "deployIfNotExists",
"effect": "[[parameters('effect')]",
"details": {
"roleDefinitionIds": [
"/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
Expand Down
14 changes: 13 additions & 1 deletion services/Resources/subscriptions/Deploy-ActivityLog-ServiceHealth-Security.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@
},
"defaultValue": "[email protected]"
},
"effect": {
"type": "String",
"metadata": {
"displayName": "Effect",
"description": "Effect of the policy"
},
"allowedValues": [
"deployIfNotExists",
"disabled"
],
"defaultValue": "disabled"
},
"MonitorDisable": {
"type": "String",
"metadata": {
Expand All @@ -86,7 +98,7 @@
]
},
"then": {
"effect": "deployIfNotExists",
"effect": "[[parameters('effect')]",
"details": {
"roleDefinitionIds": [
"/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c"
Expand Down