Skip to content
This repository has been archived by the owner on Oct 5, 2023. It is now read-only.

Commit

Permalink
Merge pull request #243 from Brunoga-MS/main
Browse files Browse the repository at this point in the history 
Fixing typos and remediation issues with data disk latency and network alerts
  • Loading branch information
@Alboroni
Alboroni authored Sep 6, 2023
2 parents ab16092 + 6f37944 commit 2f1e78d
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-HeartBeat_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ module HeartBeatAlert '../../arm/Microsoft.Authorization/policyDefinitions/manag
failingPeriods: {
type: 'String'
metadata:{
disaplayname: 'Failing Periods'
displayName: 'Failing Periods'
description: 'Number of failing periods before alert is fired'
}
defaultValue: parFailingPeriods
Expand Down
2 changes: 1 addition & 1 deletion src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-HeartBeat_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
"failingPeriods": {
"type": "String",
"metadata": {
"disaplayname": "Failing Periods",
"displayName": "Failing Periods",
"description": "Number of failing periods before alert is fired"
},
"defaultValue": "[parameters('parFailingPeriods')]"
Expand Down
10 changes: 5 additions & 5 deletions src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-NetworkIn_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ param parComputersToInclude array = [

]

param parNetworkInterfacetToInclude array = [
param parNetworkInterfacesToInclude array = [
'*'
]

Expand Down Expand Up @@ -292,7 +292,7 @@ module VMNetwrokInAlert '../../arm/Microsoft.Authorization/policyDefinitions/man
description: 'Array of Network Interface to be monitored'
}

defaultValue: parNetworkInterfacetToInclude
defaultValue: parNetworkInterfacesToInclude

}
computersToInclude:{
Expand Down Expand Up @@ -345,7 +345,7 @@ module VMNetwrokInAlert '../../arm/Microsoft.Authorization/policyDefinitions/man

{
field: 'Microsoft.Insights/scheduledQueryRules/displayName'
equals: '[concat(subscription().displayName, \'-VMHighNetwrokInAlert\')]'
equals: '[concat(subscription().displayName, \'-VMHighNetworkInAlert\')]'
}
{
field: 'Microsoft.Insights/scheduledqueryrules/scopes[*]'
Expand Down Expand Up @@ -425,7 +425,7 @@ module VMNetwrokInAlert '../../arm/Microsoft.Authorization/policyDefinitions/man
type:'array'

}
networkInterfaceToInclude: {
networkInterfacesToInclude: {
type:'array'

}
Expand Down Expand Up @@ -487,7 +487,7 @@ module VMNetwrokInAlert '../../arm/Microsoft.Authorization/policyDefinitions/man
criteria: {
allOf: [
{
query: 'InsightsMetrics| where Origin == "vm.azm.ms"| where Namespace == "Network" and Name == "ReadBytesPerSecond"| | extend NetworkInterface=tostring(todynamic(Tags)["vm.azm.ms/networkDeviceId"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface'
query: 'InsightsMetrics| where Origin == "vm.azm.ms"| where Namespace == "Network" and Name == "ReadBytesPerSecond"| extend NetworkInterface=tostring(todynamic(Tags)["vm.azm.ms/networkDeviceId"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface'
metricMeasureColumn: 'AggregatedValue'
threshold: '[parameters(\'threshold\')]'
operator: '[parameters(\'operator\')]'
Expand Down
10 changes: 5 additions & 5 deletions src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-NetworkIn_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"*"
]
},
"parNetworkInterfacetToInclude": {
"parNetworkInterfacesToInclude": {
"type": "array",
"defaultValue": [
"*"
Expand Down Expand Up @@ -348,7 +348,7 @@
"displayname": "Network Interface to be included to be monitored",
"description": "Array of Network Interface to be monitored"
},
"defaultValue": "[parameters('parNetworkInterfacetToInclude')]"
"defaultValue": "[parameters('parNetworkInterfacesToInclude')]"
},
"computersToInclude": {
"type": "array",
Expand Down Expand Up @@ -394,7 +394,7 @@
"allOf": [
{
"field": "Microsoft.Insights/scheduledQueryRules/displayName",
"equals": "[[concat(subscription().displayName, '-VMHighNetwrokInAlert')]"
"equals": "[[concat(subscription().displayName, '-VMHighNetworkInAlert')]"
},
{
"field": "Microsoft.Insights/scheduledqueryrules/scopes[*]",
Expand Down Expand Up @@ -466,7 +466,7 @@
"computersToInclude": {
"type": "array"
},
"networkInterfaceToInclude": {
"networkInterfacesToInclude": {
"type": "array"
}
},
Expand Down Expand Up @@ -526,7 +526,7 @@
"criteria": {
"allOf": [
{
"query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Network\" and Name == \"ReadBytesPerSecond\"| | extend NetworkInterface=tostring(todynamic(Tags)[\"vm.azm.ms/networkDeviceId\"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface",
"query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Network\" and Name == \"ReadBytesPerSecond\"| extend NetworkInterface=tostring(todynamic(Tags)[\"vm.azm.ms/networkDeviceId\"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface",
"metricMeasureColumn": "AggregatedValue",
"threshold": "[[parameters('threshold')]",
"operator": "[[parameters('operator')]",
Expand Down
12 changes: 6 additions & 6 deletions src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-NetworkOut_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ param parComputersToInclude array = [

]

param parNetworkInterfacetToInclude array = [
param parNetworkInterfacesToInclude array = [
'*'
]

Expand Down Expand Up @@ -287,7 +287,7 @@ module VMNetworkOutAlert '../../arm/Microsoft.Authorization/policyDefinitions/ma
computersToInclude:{
type: 'array'
metadata:{
displayname:'Disks to be included to be monitored'
displayname:'Computers to be included to be monitored'
description: 'Array of Computer to be monitored'
}

Expand All @@ -301,7 +301,7 @@ module VMNetworkOutAlert '../../arm/Microsoft.Authorization/policyDefinitions/ma
description: 'Array of Network Interface to be monitored'
}

defaultValue: parNetworkInterfacetToInclude
defaultValue: parNetworkInterfacesToInclude

}

Expand Down Expand Up @@ -342,7 +342,7 @@ module VMNetworkOutAlert '../../arm/Microsoft.Authorization/policyDefinitions/ma

{
field: 'Microsoft.Insights/scheduledQueryRules/displayName'
equals: '[concat(subscription().displayName, \'-VMHighNetwrokInAlert\')]'
equals: '[concat(subscription().displayName, \'-VMHighNetworkOutAlert\')]'
}
{
field: 'Microsoft.Insights/scheduledqueryrules/scopes[*]'
Expand Down Expand Up @@ -422,7 +422,7 @@ module VMNetworkOutAlert '../../arm/Microsoft.Authorization/policyDefinitions/ma
type:'array'

}
networkInterfaceToInclude: {
networkInterfacesToInclude: {
type:'array'

}
Expand Down Expand Up @@ -469,7 +469,7 @@ module VMNetworkOutAlert '../../arm/Microsoft.Authorization/policyDefinitions/ma
name: '[concat(subscription().displayName, \'-VMHighNetworkOutAlert\')]'
location: '[parameters(\'alertResourceGroupLocation\')]'
properties: {
displayName: '[concat(subscription().displayName, \'-VMHighNetworOutAlert\')]'
displayName: '[concat(subscription().displayName, \'-VMHighNetworkOutAlert\')]'
description: 'Log Alert for Virtual Machine NetworkOut'
severity: '[parameters(\'severity\')]'
enabled: '[parameters(\'enabled\')]'
Expand Down
10 changes: 5 additions & 5 deletions src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-NetworkOut_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"*"
]
},
"parNetworkInterfacetToInclude": {
"parNetworkInterfacesToInclude": {
"type": "array",
"defaultValue": [
"*"
Expand Down Expand Up @@ -345,7 +345,7 @@
"computersToInclude": {
"type": "array",
"metadata": {
"displayname": "Disks to be included to be monitored",
"displayname": "Computers to be included to be monitored",
"description": "Array of Computer to be monitored"
},
"defaultValue": "[parameters('parComputersToInclude')]"
Expand All @@ -356,7 +356,7 @@
"displayname": "Network Interface to be included to be monitored",
"description": "Array of Network Interface to be monitored"
},
"defaultValue": "[parameters('parNetworkInterfacetToInclude')]"
"defaultValue": "[parameters('parNetworkInterfacesToInclude')]"
},
"effect": {
"type": "String",
Expand Down Expand Up @@ -394,7 +394,7 @@
"allOf": [
{
"field": "Microsoft.Insights/scheduledQueryRules/displayName",
"equals": "[[concat(subscription().displayName, '-VMHighNetwrokInAlert')]"
"equals": "[[concat(subscription().displayName, '-VMHighNetworkOutAlert')]"
},
{
"field": "Microsoft.Insights/scheduledqueryrules/scopes[*]",
Expand Down Expand Up @@ -466,7 +466,7 @@
"computersToInclude": {
"type": "array"
},
"networkInterfaceToInclude": {
"networkInterfacesToInclude": {
"type": "array"
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-OSDiskSpace_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ module VMOSDiskSpaceAlert '../../arm/Microsoft.Authorization/policyDefinitions/m
failingPeriods: {
type: 'String'
metadata:{
disaplayname: 'Failing Periods'
displayName: 'Failing Periods'
description: 'Number of failing periods before alert is fired'
}
defaultValue: parFailingPeriods
Expand Down
2 changes: 1 addition & 1 deletion src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-OSDiskSpace_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
"failingPeriods": {
"type": "String",
"metadata": {
"disaplayname": "Failing Periods",
"displayName": "Failing Periods",
"description": "Number of failing periods before alert is fired"
},
"defaultValue": "[parameters('parFailingPeriods')]"
Expand Down
2 changes: 1 addition & 1 deletion ...sources/Microsoft.Authorization/policyDefinitions/deploy-vm-OSDiskreadLatency_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ module VMOSDiskreadLatencyAlert '../../arm/Microsoft.Authorization/policyDefinit
failingPeriods: {
type: 'String'
metadata:{
disaplayname: 'Failing Periods'
displayName: 'Failing Periods'
description: 'Number of failing periods before alert is fired'
}
defaultValue: parFailingPeriods
Expand Down
2 changes: 1 addition & 1 deletion ...esources/Microsoft.Authorization/policyDefinitions/deploy-vm-OSDiskreadLatency_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
"failingPeriods": {
"type": "String",
"metadata": {
"disaplayname": "Failing Periods",
"displayName": "Failing Periods",
"description": "Number of failing periods before alert is fired"
},
"defaultValue": "[parameters('parFailingPeriods')]"
Expand Down
2 changes: 1 addition & 1 deletion ...ources/Microsoft.Authorization/policyDefinitions/deploy-vm-OSDiskwriteLatency_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ module VMOSDiskwriteLatencyAlert '../../arm/Microsoft.Authorization/policyDefini
failingPeriods: {
type: 'String'
metadata:{
disaplayname: 'Failing Periods'
displayName: 'Failing Periods'
description: 'Number of failing periods before alert is fired'
}
defaultValue: parFailingPeriods
Expand Down
2 changes: 1 addition & 1 deletion ...sources/Microsoft.Authorization/policyDefinitions/deploy-vm-OSDiskwriteLatency_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
"failingPeriods": {
"type": "String",
"metadata": {
"disaplayname": "Failing Periods",
"displayName": "Failing Periods",
"description": "Number of failing periods before alert is fired"
},
"defaultValue": "[parameters('parFailingPeriods')]"
Expand Down
4 changes: 2 additions & 2 deletions src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-dataDiskSpace_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,15 @@ module VMdataDiskSpaceAlert '../../arm/Microsoft.Authorization/policyDefinitions
failingPeriods: {
type: 'String'
metadata:{
disaplayname: 'Failing Periods'
displayName: 'Failing Periods'
description: 'Number of failing periods before alert is fired'
}
defaultValue: parFailingPeriods
}
evaluationPeriods: {
type: 'String'
metadata:{
disaplayname: 'Evaluation Periods'
displayName: 'Evaluation Periods'
description: 'The number of aggregated lookback points.'
}
defaultValue: parEvaluationPeriods
Expand Down
4 changes: 2 additions & 2 deletions src/resources/Microsoft.Authorization/policyDefinitions/deploy-vm-dataDiskSpace_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,15 +323,15 @@
"failingPeriods": {
"type": "String",
"metadata": {
"disaplayname": "Failing Periods",
"displayName": "Failing Periods",
"description": "Number of failing periods before alert is fired"
},
"defaultValue": "[parameters('parFailingPeriods')]"
},
"evaluationPeriods": {
"type": "String",
"metadata": {
"disaplayname": "Evaluation Periods",
"displayName": "Evaluation Periods",
"description": "The number of aggregated lookback points."
},
"defaultValue": "[parameters('parEvaluationPeriods')]"
Expand Down
6 changes: 3 additions & 3 deletions ...urces/Microsoft.Authorization/policyDefinitions/deploy-vm-dataDiskreadLatency_alert.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ module VMdataDiskReadLatencyAlert '../../arm/Microsoft.Authorization/policyDefin
failingPeriods: {
type: 'String'
metadata:{
disaplayname: 'Failing Periods'
displayName: 'Failing Periods'
description: 'Number of failing periods before alert is fired'
}
defaultValue: parFailingPeriods
Expand Down Expand Up @@ -471,10 +471,10 @@ module VMdataDiskReadLatencyAlert '../../arm/Microsoft.Authorization/policyDefin
{
type: 'Microsoft.Insights/scheduledQueryRules'
apiVersion: '2022-08-01-preview'
name: '[concat(subscription().displayName, \'-VMHighdataDiskReadLatencyAlert\')]'
name: '[concat(subscription().displayName, \'-VMLowdataDiskReadLatencyAlert\')]'
location: '[parameters(\'alertResourceGroupLocation\')]'
properties: {
displayName: '[concat(subscription().displayName, \'-VMHighdataDiskReadLatencyAlert\')]'
displayName: '[concat(subscription().displayName, \'-VMLowdataDiskReadLatencyAlert\')]'
description: 'Log Alert for Virtual Machine dataDiskReadLatency'
severity: '[parameters(\'severity\')]'
enabled: '[parameters(\'enabled\')]'
Expand Down
6 changes: 3 additions & 3 deletions ...ources/Microsoft.Authorization/policyDefinitions/deploy-vm-dataDiskreadLatency_alert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
"failingPeriods": {
"type": "String",
"metadata": {
"disaplayname": "Failing Periods",
"displayName": "Failing Periods",
"description": "Number of failing periods before alert is fired"
},
"defaultValue": "[parameters('parFailingPeriods')]"
Expand Down Expand Up @@ -508,10 +508,10 @@
{
"type": "Microsoft.Insights/scheduledQueryRules",
"apiVersion": "2022-08-01-preview",
"name": "[[concat(subscription().displayName, '-VMHighdataDiskReadLatencyAlert')]",
"name": "[[concat(subscription().displayName, '-VMLowdataDiskReadLatencyAlert')]",
"location": "[[parameters('alertResourceGroupLocation')]",
"properties": {
"displayName": "[[concat(subscription().displayName, '-VMHighdataDiskReadLatencyAlert')]",
"displayName": "[[concat(subscription().displayName, '-VMLowdataDiskReadLatencyAlert')]",
"description": "Log Alert for Virtual Machine dataDiskReadLatency",
"severity": "[[parameters('severity')]",
"enabled": "[[parameters('enabled')]",
Expand Down
Loading

0 comments on commit 2f1e78d

Please sign in to comment.