Skip to content

Commit be7398b

Browse files
Sohamdg081992Sohamdg081992
authored
Add cluster scope to alert rule groups for linking them with UX (#600)
* Removing duplicate alerts from ci recommended alerts * Remove test branch * Remove preview keyword from policy readme * Add cluster id scope to rule groups for alerts to be linked to UX * adding terraform update
1 parent 1641939 commit be7398b

File tree

9 files changed

+61
-36
lines changed

9 files changed

+61
-36
lines changed

‎AddonArmTemplate/FullAzureMonitorMetricsProfile.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@
221221
"properties": {
222222
"description": "[concat(variables('nodeRecordingRuleGroupDescription'), variables('version'))]",
223223
"scopes": [
224-
"[parameters('azureMonitorWorkspaceResourceId')]"
224+
"[parameters('azureMonitorWorkspaceResourceId')]",
225+
"[parameters('clusterResourceId')]"
225226
],
226227
"clusterName": "[variables('clusterName')]",
227228
"interval": "PT1M",
@@ -281,7 +282,8 @@
281282
"properties": {
282283
"description": "[concat(variables('kubernetesRecordingRuleGroupDescription'), variables('version'))]",
283284
"scopes": [
284-
"[parameters('azureMonitorWorkspaceResourceId')]"
285+
"[parameters('azureMonitorWorkspaceResourceId')]",
286+
"[parameters('clusterResourceId')]"
285287
],
286288
"clusterName": "[variables('clusterName')]",
287289
"interval": "PT1M",
@@ -385,7 +387,8 @@
385387
"properties": {
386388
"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
387389
"scopes": [
388-
"[parameters('azureMonitorWorkspaceResourceId')]"
390+
"[parameters('azureMonitorWorkspaceResourceId')]",
391+
"[parameters('clusterResourceId')]"
389392
],
390393
"enabled": "[parameters('enableWindowsRecordingRules')]",
391394
"clusterName": "[variables('clusterName')]",
@@ -462,7 +465,8 @@
462465
"properties": {
463466
"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
464467
"scopes": [
465-
"[parameters('azureMonitorWorkspaceResourceId')]"
468+
"[parameters('azureMonitorWorkspaceResourceId')]",
469+
"[parameters('clusterResourceId')]"
466470
],
467471
"enabled": "[parameters('enableWindowsRecordingRules')]",
468472
"clusterName": "[variables('clusterName')]",

‎AddonArmTemplate/WindowsRecordingRuleGroupTemplate/WindowsRecordingRules.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
"properties": {
5757
"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
5858
"scopes": [
59-
"[parameters('azureMonitorWorkspaceResourceId')]"
59+
"[parameters('azureMonitorWorkspaceResourceId')]",
60+
"[parameters('clusterResourceId')]"
6061
],
6162
"enabled": true,
6263
"clusterName": "[variables('clusterName')]",
@@ -133,7 +134,8 @@
133134
"properties": {
134135
"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
135136
"scopes": [
136-
"[parameters('azureMonitorWorkspaceResourceId')]"
137+
"[parameters('azureMonitorWorkspaceResourceId')]",
138+
"[parameters('clusterResourceId')]"
137139
],
138140
"enabled": true,
139141
"clusterName": "[variables('clusterName')]",
@@ -211,4 +213,4 @@
211213
}
212214
}
213215
]
214-
}
216+
}

‎AddonBicepTemplate/AzureMonitorAlertsProfile.bicep

+2-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ resource recommendedAlerts 'Microsoft.AlertsManagement/prometheusRuleGroups@2023
1616
location: location
1717
properties: {
1818
description: 'Kubernetes Alert RuleGroup-RecommendedCIAlerts - 0.1'
19-
scopes: [
20-
monitorWorkspace.id
21-
]
19+
scopes: [monitorWorkspace.id,aksResourceId]
2220
clusterName: split(aksResourceId, '/')[8]
2321
enabled: true
2422
interval: 'PT5M'
@@ -241,9 +239,7 @@ resource communityALerts 'Microsoft.AlertsManagement/prometheusRuleGroups@2023-0
241239
location: location
242240
properties: {
243241
description: 'Kubernetes Alert RuleGroup-communityCIAlerts - 0.1'
244-
scopes: [
245-
monitorWorkspace.id
246-
]
242+
scopes: [monitorWorkspace.id,aksResourceId]
247243
clusterName: split(aksResourceId, '/')[8]
248244
enabled: true
249245
interval: 'PT1M'

‎AddonBicepTemplate/FullAzureMonitorMetricsProfile.bicep

+4-12
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@ resource nodeRecordingRuleGroup 'Microsoft.AlertsManagement/prometheusRuleGroups
141141
location: azureMonitorWorkspaceLocation
142142
properties: {
143143
description: '${nodeRecordingRuleGroupDescription}${version}'
144-
scopes: [
145-
azureMonitorWorkspaceResourceId
146-
]
144+
scopes: [azureMonitorWorkspaceResourceId,clusterResourceId]
147145
enabled: true
148146
clusterName: clusterName
149147
interval: 'PT1M'
@@ -201,9 +199,7 @@ resource kubernetesRecordingRuleGroup 'Microsoft.AlertsManagement/prometheusRule
201199
location: azureMonitorWorkspaceLocation
202200
properties: {
203201
description: '${kubernetesRecordingRuleGroupDescription}${version}'
204-
scopes: [
205-
azureMonitorWorkspaceResourceId
206-
]
202+
scopes: [azureMonitorWorkspaceResourceId,clusterResourceId]
207203
enabled: true
208204
clusterName: clusterName
209205
interval: 'PT1M'
@@ -305,9 +301,7 @@ resource nodeRecordingRuleGroupNameWin 'Microsoft.AlertsManagement/prometheusRul
305301
location: azureMonitorWorkspaceLocation
306302
properties: {
307303
description: '${RecordingRuleGroupDescriptionWin}${version}'
308-
scopes: [
309-
azureMonitorWorkspaceResourceId
310-
]
304+
scopes: [azureMonitorWorkspaceResourceId,clusterResourceId]
311305
enabled: enableWindowsRecordingRules
312306
clusterName: clusterName
313307
interval: 'PT1M'
@@ -381,9 +375,7 @@ resource nodeAndKubernetesRecordingRuleGroupNameWin 'Microsoft.AlertsManagement/
381375
location: azureMonitorWorkspaceLocation
382376
properties: {
383377
description: '${RecordingRuleGroupDescriptionWin}${version}'
384-
scopes: [
385-
azureMonitorWorkspaceResourceId
386-
]
378+
scopes: [azureMonitorWorkspaceResourceId,clusterResourceId]
387379
enabled: enableWindowsRecordingRules
388380
clusterName: clusterName
389381
interval: 'PT1M'

‎AddonPolicyTemplate/AddonPolicyMetricsProfile.rules.json

+12-4
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,10 @@
225225
"location": "[parameters('azureMonitorWorkspaceLocation')]",
226226
"properties": {
227227
"description": "[concat(variables('nodeRecordingRuleGroupDescription'), variables('version'))]",
228-
"scopes": ["[parameters('azureMonitorWorkspaceResourceId')]"],
228+
"scopes": [
229+
"[parameters('azureMonitorWorkspaceResourceId')]",
230+
"[parameters('clusterResourceId')]"
231+
],
229232
"clusterName": "[variables('clusterName')]",
230233
"interval": "PT1M",
231234
"rules": [
@@ -283,7 +286,10 @@
283286
"location": "[parameters('azureMonitorWorkspaceLocation')]",
284287
"properties": {
285288
"description": "[concat(variables('kubernetesRecordingRuleGroupDescription'), variables('version'))]",
286-
"scopes": ["[parameters('azureMonitorWorkspaceResourceId')]"],
289+
"scopes": [
290+
"[parameters('azureMonitorWorkspaceResourceId')]",
291+
"[parameters('clusterResourceId')]"
292+
],
287293
"clusterName": "[variables('clusterName')]",
288294
"interval": "PT1M",
289295
"rules": [
@@ -386,7 +392,8 @@
386392
"properties": {
387393
"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
388394
"scopes": [
389-
"[parameters('azureMonitorWorkspaceResourceId')]"
395+
"[parameters('azureMonitorWorkspaceResourceId')]",
396+
"[parameters('clusterResourceId')]"
390397
],
391398
"enabled": "[parameters('enableWindowsRecordingRules')]",
392399
"clusterName": "[variables('clusterName')]",
@@ -463,7 +470,8 @@
463470
"properties": {
464471
"description": "[concat(variables('RecordingRuleGroupDescriptionWin'), variables('version'))]",
465472
"scopes": [
466-
"[parameters('azureMonitorWorkspaceResourceId')]"
473+
"[parameters('azureMonitorWorkspaceResourceId')]",
474+
"[parameters('clusterResourceId')]"
467475
],
468476
"enabled": "[parameters('enableWindowsRecordingRules')]",
469477
"clusterName": "[variables('clusterName')]",

‎AddonTerraformTemplate/main.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "node_recording_rules_rul
119119
description = "Node Recording Rules Rule Group"
120120
rule_group_enabled = true
121121
interval = "PT1M"
122-
scopes = [azurerm_monitor_workspace.amw.id]
122+
scopes = [azurerm_monitor_workspace.amw.id,azurerm_kubernetes_cluster.k8s.id]
123123

124124
rule {
125125
enabled = true
@@ -209,7 +209,7 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "kubernetes_recording_rul
209209
description = "Kubernetes Recording Rules Rule Group"
210210
rule_group_enabled = true
211211
interval = "PT1M"
212-
scopes = [azurerm_monitor_workspace.amw.id]
212+
scopes = [azurerm_monitor_workspace.amw.id,azurerm_kubernetes_cluster.k8s.id]
213213

214214
rule {
215215
enabled = true
@@ -366,7 +366,7 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "node_and_kubernetes_reco
366366
description = "Node and Kubernetes Recording Rules Rule Group for Windows Nodes"
367367
rule_group_enabled = true
368368
interval = "PT1M"
369-
scopes = [azurerm_monitor_workspace.amw.id]
369+
scopes = [azurerm_monitor_workspace.amw.id,azurerm_kubernetes_cluster.k8s.id]
370370

371371
rule {
372372
enabled = true
@@ -497,7 +497,7 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "node_recording_rules_rul
497497
description = "Node and Kubernetes Recording Rules Rule Group for Windows Nodes"
498498
rule_group_enabled = true
499499
interval = "PT1M"
500-
scopes = [azurerm_monitor_workspace.amw.id]
500+
scopes = [azurerm_monitor_workspace.amw.id,azurerm_kubernetes_cluster.k8s.id]
501501

502502
rule {
503503
enabled = true

‎GeneratedMonitoringArtifacts/Default/DefaultAlerts.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"description": "Cluster name"
99
}
1010
},
11+
"clusterResourceId": {
12+
"type": "string",
13+
"metadata": {
14+
"description": "Cluster Resource Id"
15+
}
16+
},
1117
"actionGroupResourceId": {
1218
"type": "string",
1319
"metadata": {
@@ -40,7 +46,8 @@
4046
"properties": {
4147
"description": "[concat(variables('kubernetesAlertRuleGroupDescription'), variables('version'))]",
4248
"scopes": [
43-
"[parameters('azureMonitorWorkspaceResourceId')]"
49+
"[parameters('azureMonitorWorkspaceResourceId')]",
50+
"[parameters('clusterResourceId')]"
4451
],
4552
"clusterName": "[parameters('clusterName')]",
4653
"interval": "PT1M",

‎GeneratedMonitoringArtifacts/Default/DefaultRecordingRules.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"description": "Cluster name"
99
}
1010
},
11+
"clusterResourceId": {
12+
"type": "string",
13+
"metadata": {
14+
"description": "Cluster Resource Id"
15+
}
16+
},
1117
"azureMonitorWorkspaceResourceId": {
1218
"type": "string",
1319
"metadata": {
@@ -41,7 +47,10 @@
4147
"location": "[parameters('location')]",
4248
"properties": {
4349
"description": "[concat(variables('nodeRecordingRuleGroupDescription'), variables('version'))]",
44-
"scopes": [ "[parameters('azureMonitorWorkspaceResourceId')]" ],
50+
"scopes": [
51+
"[parameters('azureMonitorWorkspaceResourceId')]",
52+
"[parameters('clusterResourceId')]"
53+
],
4554
"enabled": true,
4655
"clusterName": "[parameters('clusterName')]",
4756
"interval": "PT1M",

‎mixins/kubernetes/rules/recording_and_alerting_rules/templates/ci_recommended_alerts.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"description": "Cluster name"
99
}
1010
},
11+
"clusterResourceId": {
12+
"type": "string",
13+
"metadata": {
14+
"description": "Cluster Resource Id"
15+
}
16+
},
1117
"actionGroupResourceId": {
1218
"type": "string",
1319
"metadata": {
@@ -40,7 +46,8 @@
4046
"properties": {
4147
"description": "[concat(variables('kubernetesAlertRuleGroupDescription'), variables('version'))]",
4248
"scopes": [
43-
"[parameters('azureMonitorWorkspaceResourceId')]"
49+
"[parameters('azureMonitorWorkspaceResourceId')]",
50+
"[parameters('clusterResourceId')]"
4451
],
4552
"clusterName": "[parameters('clusterName')]",
4653
"enabled": true,

0 commit comments

Comments
 (0)