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

Added new parameter to support CMK, removed Computers to Include parameter #521

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Added new parameter to support CMK, removed Computers to Include parameter #521

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
804fa38
added checkWorkspaceAlertsStorageConfigured to all scheduled query al…
tgolovina Jan 30, 2025
93e52a0
tgolovina Jan 30, 2025
4bac656
fixed end of line
tgolovina Jan 31, 2025
9729b13
Merge branch 'main' of https://github.com/azure/azure-monitor-baselin…
tgolovina Jan 31, 2025
11dcbc1
Removed ComputersToInclude parametr
tgolovina Feb 5, 2025
226f8d3
removed all compute to include parameters
tgolovina Feb 7, 2025
0e7c159
bicep build
tgolovina Feb 7, 2025
7a2a77b
Merge branch 'Azure:main' into computerstoinclude_remove
tagolovina Feb 12, 2025
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
150 changes: 75 additions & 75 deletions patterns/alz/alzArm.param.json
View file
Open in desktop

Large diffs are not rendered by default.

150 changes: 75 additions & 75 deletions patterns/alz/eslzArm.terraform-sync.param.json
View file
Open in desktop

Large diffs are not rendered by default.

272 changes: 142 additions & 130 deletions patterns/alz/policyDefinitions/policies-Compute.json
View file
Open in desktop

Large diffs are not rendered by default.

277 changes: 146 additions & 131 deletions patterns/alz/policyDefinitions/policies-Hybrid.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions patterns/alz/policyDefinitions/policies-Monitoring.json
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 18 additions & 3 deletions patterns/alz/policyDefinitions/policies-Web.json
View file
Open in desktop

Large diffs are not rendered by default.

110 changes: 17 additions & 93 deletions patterns/alz/policyDefinitions/policySets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "2331899988992697473"
"templateHash": "10089845342868886825"
}
},
"parameters": {
Expand Down Expand Up @@ -1237,16 +1237,6 @@
"description": "Failing Periods for the alert"
}
},
"VMNetworkInComputersToInclude": {
"type": "array",
"defaultValue": [
"*"
],
"metadata": {
"displayName": "VM Network In Computers To Include",
"description": "Computers To Include for the alert"
}
},
"VMNetworkOutAlertSeverity": {
"type": "String",
"defaultValue": "2",
Expand Down Expand Up @@ -1385,16 +1375,6 @@
"description": "Failing Periods for the alert"
}
},
"VMNetworkOutComputersToInclude": {
"type": "array",
"defaultValue": [
"*"
],
"metadata": {
"displayName": "VM Network Out Computers To Include",
"description": "Computers To Include for the alert"
}
},
"VMOSDiskReadLatencyAlertSeverity": {
"type": "String",
"defaultValue": "2",
Expand Down Expand Up @@ -1533,16 +1513,6 @@
"description": "Failing Periods for the alert"
}
},
"VMOSDiskReadLatencyComputersToInclude": {
"type": "array",
"defaultValue": [
"*"
],
"metadata": {
"displayName": "VM OS Disk Read Latency Computers To Include",
"description": "Computers To Include for the alert"
}
},
"VMOSDiskWriteLatencyAlertSeverity": {
"type": "String",
"defaultValue": "2",
Expand Down Expand Up @@ -1681,16 +1651,6 @@
"description": "Failing Periods for the alert"
}
},
"VMOSDiskWriteLatencyComputersToInclude": {
"type": "array",
"defaultValue": [
"*"
],
"metadata": {
"displayName": "VM OS Disk Write Latency Computers To Include",
"description": "Computers To Include for the alert"
}
},
"VMOSDiskSpaceAlertSeverity": {
"type": "String",
"defaultValue": "2",
Expand Down Expand Up @@ -1829,16 +1789,6 @@
"description": "Failing Periods for the alert"
}
},
"VMOSDiskSpaceComputersToInclude": {
"type": "array",
"defaultValue": [
"*"
],
"metadata": {
"displayName": "VM OS Disk Space Computers To Include",
"description": "Computers To Include for the alert"
}
},
"VMPercentCPUAlertSeverity": {
"type": "String",
"defaultValue": "2",
Expand Down Expand Up @@ -2367,16 +2317,6 @@
"description": "Failing Periods for the alert"
}
},
"VMDataDiskReadLatencyComputersToInclude": {
"type": "array",
"defaultValue": [
"*"
],
"metadata": {
"displayName": "VM Data Disk Read Latency Computers To Include",
"description": "Computers To Include for the alert"
}
},
"VMDataDiskWriteLatencyAlertSeverity": {
"type": "String",
"defaultValue": "2",
Expand Down Expand Up @@ -2515,16 +2455,6 @@
"description": "Failing Periods for the alert"
}
},
"VMDataDiskWriteLatencyComputersToInclude": {
"type": "array",
"defaultValue": [
"*"
],
"metadata": {
"displayName": "VM Data Disk Write Latency Computers To Include",
"description": "Computers To Include for the alert"
}
},
"AGWApplicationGatewayTotalTimeAlertSeverity": {
"type": "String",
"defaultValue": "2",
Expand Down Expand Up @@ -4558,9 +4488,6 @@
"evaluationPeriods": {
"value": "[[[parameters('VMNetworkInEvaluationPeriods')]"
},
"computersToInclude": {
"value": "[[[parameters('VMNetworkInComputersToInclude')]"
},
"alertResourceGroupName": {
"value": "[[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down Expand Up @@ -4615,9 +4542,6 @@
"evaluationPeriods": {
"value": "[[[parameters('VMNetworkOutEvaluationPeriods')]"
},
"computersToInclude": {
"value": "[[[parameters('VMNetworkOutComputersToInclude')]"
},
"alertResourceGroupName": {
"value": "[[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down Expand Up @@ -4672,9 +4596,6 @@
"evaluationPeriods": {
"value": "[[[parameters('VMOSDiskReadLatencyEvaluationPeriods')]"
},
"computersToInclude": {
"value": "[[[parameters('VMOSDiskReadLatencyComputersToInclude')]"
},
"alertResourceGroupName": {
"value": "[[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down Expand Up @@ -4729,9 +4650,6 @@
"evaluationPeriods": {
"value": "[[[parameters('VMOSDiskWriteLatencyEvaluationPeriods')]"
},
"computersToInclude": {
"value": "[[[parameters('VMOSDiskWriteLatencyComputersToInclude')]"
},
"alertResourceGroupName": {
"value": "[[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down Expand Up @@ -4786,9 +4704,6 @@
"evaluationPeriods": {
"value": "[[[parameters('VMOSDiskSpaceEvaluationPeriods')]"
},
"computersToInclude": {
"value": "[[[parameters('VMOSDiskSpaceComputersToInclude')]"
},
"alertResourceGroupName": {
"value": "[[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down Expand Up @@ -4996,9 +4911,6 @@
"evaluationPeriods": {
"value": "[[[parameters('VMDataDiskReadLatencyEvaluationPeriods')]"
},
"computersToInclude": {
"value": "[[[parameters('VMDataDiskReadLatencyComputersToInclude')]"
},
"alertResourceGroupName": {
"value": "[[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down Expand Up @@ -5053,9 +4965,6 @@
"evaluationPeriods": {
"value": "[[[parameters('VMDataDiskWriteLatencyEvaluationPeriods')]"
},
"computersToInclude": {
"value": "[[[parameters('VMDataDiskWriteLatencyComputersToInclude')]"
},
"alertResourceGroupName": {
"value": "[[[parameters('ALZMonitorResourceGroupName')]"
},
Expand Down Expand Up @@ -5575,7 +5484,7 @@
"displayName": "Deploy Azure Monitor Baseline Alerts for Management",
"description": "Initiative to deploy AMBA alerts relevant to the ALZ Management management group",
"metadata": {
"version": "1.3.1",
"version": "1.4.0",
"category": "Monitoring",
"source": "https://github.com/Azure/azure-monitor-baseline-alerts/",
"alzCloudEnvironments": [
Expand Down Expand Up @@ -5985,6 +5894,18 @@
],
"defaultValue": "true"
},
"LAWDailyCapLimitcheckWorkspaceAlertsStorageConfigured": {
"type": "String",
"metadata": {
"displayName": "Log Analytics Workspace Daily Cap Limit Reached Alert Require a workspace linked storage",
"description": "Don't create the alert rule if the Log Analytics workspace doesn't have a configured linked storage account (relevant if you're using Customer Managed Keys)."
},
"allowedValues": [
"true",
"false"
],
"defaultValue": "false"
},
"LAWDailyCapLimitThreshold": {
"type": "String",
"metadata": {
Expand Down Expand Up @@ -6110,6 +6031,9 @@
"autoMitigate": {
"value": "[[[parameters('LAWDailyCapLimitAutoMitigate')]"
},
"checkWorkspaceAlertsStorageConfigured": {
"value": "[[[parameters('LAWDailyCapLimitcheckWorkspaceAlertsStorageConfigured')]"
},
"threshold": {
"value": "[[[parameters('LAWDailyCapLimitThreshold')]"
},
Expand Down
Loading