Ees 5687 add resource utilisation metric alerts

infrastructure/templates/public-api/application/public-api/publicApiApp.bicep

@@ -148,6 +148,8 @@ module apiContainerAppModule '../../components/containerApp.bicep' = {
     alerts: deployAlerts ? {
       restarts: true
       responseTime: true
+      cpuPercentage: true
+      memoryPercentage: true
       alertsGroupName: resourceNames.existingResources.alertsGroup
     } : null
     tagValues: tagValues

infrastructure/templates/public-api/application/public-api/publicApiDataProcessor.bicep

@@ -114,6 +114,8 @@ module dataProcessorFunctionAppModule '../../components/functionApp.bicep' = {
     storageFirewallRules: storageFirewallRules
     alerts: deployAlerts ? {
       functionAppHealth: true
+      cpuPercentage: true
+      memoryPercentage: true
       storageAccountAvailability: true
       storageLatency: true
       fileServiceAvailability: true

infrastructure/templates/public-api/application/shared/postgreSqlFlexibleServer.bicep

@@ -62,6 +62,11 @@ module postgreSqlServerModule '../../components/postgresqlDatabase.bicep' = {
       availability: true
       queryTime: true
       transactionTime: true
+      clientConenctionsWaiting: true
+      cpuPercentage: true
+      diskBandwidth: true
+      diskIops: true
+      memoryPercentage: true
       alertGroupName: resourceNames.existingResources.alertsGroup
     } : null
     tagValues: tagValues

infrastructure/templates/public-api/components/alerts/appGateways/responseTimeAlert.bicep

@@ -1,32 +1,19 @@
-import { Severity } from '../types.bicep'
-
 @description('Names of the resources that these alerts are being applied to.')
 param resourceNames string[]
 
-@description('The alert severity.')
-param severity Severity = 'Warning'
-
 @description('Name of the Alerts Group used to send alert messages.')
 param alertsGroupName string
 
 @description('Tags with which to tag the resource in Azure.')
 param tagValues object
 
-module alerts '../dynamicMetricAlert.bicep' = [for name in resourceNames: {
-  name: '${name}ResponseTimeAlertModule'
+module alerts '../baseResponseTimeAlert.bicep' = {
+  name: '${resourceNames[0]}ResponseTimeAlertModule'
   params: {
-    alertName: '${name}-response-time'
-    resourceIds: [resourceId('Microsoft.Network/applicationGateways', name)]
+    resourceNames: resourceNames
     resourceType: 'Microsoft.Network/applicationGateways'
-    query: {
-      metric: 'ApplicationGatewayTotalTime'
-      aggregation: 'Average'
-      operator: 'GreaterThan'
-    }
-    evaluationFrequency: 'PT1M'
-    windowSize: 'PT5M'
-    severity: severity
+    metricName: 'ApplicationGatewayTotalTime' 
     alertsGroupName: alertsGroupName
     tagValues: tagValues
   }
-}]
+}

infrastructure/templates/public-api/components/alerts/appServicePlans/cpuPercentageAlert.bicep

@@ -0,0 +1,19 @@
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts '../baseCpuPercentageAlert.bicep' = {
+  name: '${resourceNames[0]}CpuPercentageAlertModule'
+  params: {
+    resourceNames: resourceNames
+    resourceType: 'Microsoft.Web/serverfarms'
+    metricName: 'CpuPercentage' 
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}

infrastructure/templates/public-api/components/alerts/appServicePlans/memoryPercentageAlert.bicep

@@ -0,0 +1,19 @@
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts '../baseMemoryPercentageAlert.bicep' = {
+  name: '${resourceNames[0]}MemoryPercentageAlertModule'
+  params: {
+    resourceNames: resourceNames
+    resourceType: 'Microsoft.Web/serverfarms'
+    metricName: 'MemoryPercentage' 
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}

infrastructure/templates/public-api/components/alerts/baseCpuPercentageAlert.bicep

@@ -0,0 +1,38 @@
+import { Severity } from 'types.bicep'
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceType string
+
+@description('Names of the resources that these alerts are being applied to.')
+param metricName string
+
+@description('The alert severity.')
+param severity Severity = 'Warning'
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts 'dynamicMetricAlert.bicep' = [for name in resourceNames: {
+  name: '${name}CpuPercentBaseAlertModule'
+  params: {
+    alertName: '${name}-cpu-percentage'
+    resourceIds: [resourceId(resourceType, name)]
+    resourceType: resourceType
+    query: {
+      metric: metricName
+      aggregation: 'Average'
+      operator: 'GreaterThan'
+    }
+    evaluationFrequency: 'PT5M'
+    windowSize: 'PT15M'
+    severity: severity
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}]

infrastructure/templates/public-api/components/alerts/baseMemoryPercentageAlert.bicep

@@ -0,0 +1,38 @@
+import { Severity } from 'types.bicep'
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceType string
+
+@description('Names of the resources that these alerts are being applied to.')
+param metricName string
+
+@description('The alert severity.')
+param severity Severity = 'Warning'
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts 'dynamicMetricAlert.bicep' = [for name in resourceNames: {
+  name: '${name}MemoryPercentBaseAlertModule'
+  params: {
+    alertName: '${name}-memory-percentage'
+    resourceIds: [resourceId(resourceType, name)]
+    resourceType: resourceType
+    query: {
+      metric: metricName
+      aggregation: 'Average'
+      operator: 'GreaterThan'
+    }
+    evaluationFrequency: 'PT5M'
+    windowSize: 'PT15M'
+    severity: severity
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}]

infrastructure/templates/public-api/components/alerts/baseResponseTimeAlert.bicep

@@ -0,0 +1,38 @@
+import { Severity } from 'types.bicep'
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceType string
+
+@description('Names of the resources that these alerts are being applied to.')
+param metricName string
+
+@description('The alert severity.')
+param severity Severity = 'Warning'
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts 'dynamicMetricAlert.bicep' = [for name in resourceNames: {
+  name: '${name}ResponseTimeBaseAlertModule'
+  params: {
+    alertName: '${name}-response-time'
+    resourceIds: [resourceId(resourceType, name)]
+    resourceType: resourceType
+    query: {
+      metric: metricName
+      aggregation: 'Average'
+      operator: 'GreaterThan'
+    }
+    evaluationFrequency: 'PT5M'
+    windowSize: 'PT15M'
+    severity: severity
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}]

infrastructure/templates/public-api/components/alerts/containerApps/cpuPercentageAlert.bicep

@@ -0,0 +1,19 @@
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts '../baseCpuPercentageAlert.bicep' = {
+  name: '${resourceNames[0]}CpuPercentageAlertModule'
+  params: {
+    resourceNames: resourceNames
+    resourceType: 'Microsoft.App/containerApps'
+    metricName: 'CpuPercentage' 
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}

infrastructure/templates/public-api/components/alerts/containerApps/memoryPercentageAlert.bicep

@@ -0,0 +1,19 @@
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts '../baseMemoryPercentageAlert.bicep' = {
+  name: '${resourceNames[0]}MemoryPercentageAlertModule'
+  params: {
+    resourceNames: resourceNames
+    resourceType: 'Microsoft.App/containerApps'
+    metricName: 'MemoryPercentage' 
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}

infrastructure/templates/public-api/components/alerts/containerApps/responseTimeAlert.bicep

@@ -1,32 +1,19 @@
-import { Severity } from '../types.bicep'
-
 @description('Names of the resources that these alerts are being applied to.')
 param resourceNames string[]
 
-@description('The alert severity.')
-param severity Severity = 'Warning'
-
 @description('Name of the Alerts Group used to send alert messages.')
 param alertsGroupName string
 
 @description('Tags with which to tag the resource in Azure.')
 param tagValues object
 
-module alerts '../dynamicMetricAlert.bicep' = [for name in resourceNames: {
-  name: '${name}LatencyAlertModule'
+module alerts '../baseResponseTimeAlert.bicep' = {
+  name: '${resourceNames[0]}ResponseTimeAlertModule'
   params: {
-    alertName: '${name}-latency'
-    resourceIds: [resourceId('Microsoft.App/containerApps', name)]
+    resourceNames: resourceNames
     resourceType: 'Microsoft.App/containerApps'
-    query: {
-      metric: 'ResponseTime'
-      aggregation: 'Average'
-      operator: 'GreaterThan'
-    }
-    evaluationFrequency: 'PT1M'
-    windowSize: 'PT5M'
-    severity: severity
+    metricName: 'ResponseTime' 
     alertsGroupName: alertsGroupName
     tagValues: tagValues
   }
-}]
+}

infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/clientConnectionsWaitingAlert.bicep

@@ -0,0 +1,32 @@
+import { Severity } from '../types.bicep'
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('The alert severity.')
+param severity Severity = 'Warning'
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts '../dynamicMetricAlert.bicep' = [for name in resourceNames: {
+  name: '${name}ClientConnectionsWaitingAlertModule'
+  params: {
+    alertName: '${name}-query-time'
+    resourceIds: [resourceId('Microsoft.DBforPostgreSQL/flexibleServers', name)]
+    resourceType: 'Microsoft.DBforPostgreSQL/flexibleServers'
+    query: {
+      metric: 'client_connections_waiting'
+      aggregation: 'Maximum'
+      operator: 'GreaterThan'
+    }
+    evaluationFrequency: 'PT5M'
+    windowSize: 'PT15M'
+    severity: severity
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}]

infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/cpuPercentageAlert.bicep

@@ -0,0 +1,19 @@
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts '../baseCpuPercentageAlert.bicep' = {
+  name: '${resourceNames[0]}CpuPercentageAlertModule'
+  params: {
+    resourceNames: resourceNames
+    resourceType: 'Microsoft.DBforPostgreSQL/flexibleServers'
+    metricName: 'cpu_percent' 
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}

infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/diskBandwidthAlert.bicep

@@ -0,0 +1,32 @@
+import { Severity } from '../types.bicep'
+
+@description('Names of the resources that these alerts are being applied to.')
+param resourceNames string[]
+
+@description('The alert severity.')
+param severity Severity = 'Warning'
+
+@description('Name of the Alerts Group used to send alert messages.')
+param alertsGroupName string
+
+@description('Tags with which to tag the resource in Azure.')
+param tagValues object
+
+module alerts '../dynamicMetricAlert.bicep' = [for name in resourceNames: {
+  name: '${name}DiskBandwidthAlertModule'
+  params: {
+    alertName: '${name}-disk-bandwidth'
+    resourceIds: [resourceId('Microsoft.DBforPostgreSQL/flexibleServers', name)]
+    resourceType: 'Microsoft.DBforPostgreSQL/flexibleServers'
+    query: {
+      metric: 'disk_bandwidth_consumed_percentage'
+      aggregation: 'Average'
+      operator: 'GreaterThan'
+    }
+    evaluationFrequency: 'PT5M'
+    windowSize: 'PT15M'
+    severity: severity
+    alertsGroupName: alertsGroupName
+    tagValues: tagValues
+  }
+}]