From 99b53e0e04a76417574eaeaeb2abdb15385398d8 Mon Sep 17 00:00:00 2001 From: Anthony Watherston Date: Fri, 7 Jun 2024 10:05:28 +1000 Subject: [PATCH] Manual run (#26) Co-authored-by: Anthony Watherston --- .../alerting-connectivity-policySet.jsonc | 477 ++- .../alerting-hybridvm-policySet.jsonc | 233 ++ .../alerting-identity-policySet.jsonc | 47 +- .../alerting-landingzone-policySet.jsonc | 592 ++-- .../alerting-management-policySet.jsonc | 31 +- .../alerting-servicehealth-policySet.jsonc | 33 +- .../notification-assets-policySet.jsonc | 19 +- .../Automation/deploy_aa_totaljob_alert.jsonc | 104 +- .../deploy_vm_availablememory_alert.jsonc | 102 +- .../Compute/deploy_vm_cpu_alert.jsonc | 196 +- .../deploy_vm_datadiskreadlatency_alert.jsonc | 268 +- .../deploy_vm_datadiskspace_alert.jsonc | 206 +- ...deploy_vm_datadiskwritelatency_alert.jsonc | 232 +- .../Compute/deploy_vm_heartbeat_alert.jsonc | 198 +- .../deploy_vm_heartbeat_alert_rg.jsonc | 142 +- .../Compute/deploy_vm_memory_alert.jsonc | 222 +- .../Compute/deploy_vm_networkin_alert.jsonc | 270 +- .../Compute/deploy_vm_networkout_alert.jsonc | 268 +- .../deploy_vm_osdiskreadlatency_alert.jsonc | 234 +- .../Compute/deploy_vm_osdiskspace_alert.jsonc | 332 +-- .../deploy_vm_osdiskwritelatency_alert.jsonc | 266 +- ...ploy_hybrid_vm_availablememory_alert.jsonc | 317 ++ .../deploy_hybrid_vm_cpu_alert.jsonc | 507 ++++ ..._hybrid_vm_datadiskreadlatency_alert.jsonc | 565 ++++ ...deploy_hybrid_vm_datadiskspace_alert.jsonc | 548 ++++ ...hybrid_vm_datadiskwritelatency_alert.jsonc | 566 ++++ .../deploy_hybrid_vm_disconnected_alert.jsonc | 542 ++++ .../deploy_hybrid_vm_heartbeat_alert.jsonc | 524 ++++ .../deploy_hybrid_vm_heartbeat_alert_rg.jsonc | 400 +++ .../deploy_hybrid_vm_memory_alert.jsonc | 524 ++++ .../deploy_hybrid_vm_networkin_alert.jsonc | 565 ++++ .../deploy_hybrid_vm_networkout_alert.jsonc | 565 ++++ ...oy_hybrid_vm_osdiskreadlatency_alert.jsonc | 566 ++++ .../deploy_hybrid_vm_osdiskspace_alert.jsonc | 566 ++++ ...y_hybrid_vm_osdiskwritelatency_alert.jsonc | 566 ++++ .../deploy_activitylog_keyvault_delete.jsonc | 58 +- .../deploy_keyvault_availability_alert.jsonc | 62 +- .../deploy_keyvault_capacity_alert.jsonc | 102 +- .../deploy_keyvault_latency_alert.jsonc | 62 +- .../deploy_keyvault_requests_alert.jsonc | 70 +- ...eploy_activitylog_laworkspace_delete.jsonc | 56 +- ...loy_activitylog_laworkspace_keyregen.jsonc | 58 +- ...tylog_resourcehealth_unhealthy_alert.jsonc | 90 +- ...vitylog_servicehealth_healthadvisory.jsonc | 74 +- ...y_activitylog_servicehealth_incident.jsonc | 104 +- ...ctivitylog_servicehealth_maintenance.jsonc | 104 +- ...tylog_servicehealth_securityadvisory.jsonc | 74 +- ...oy_activitylog_storageaccount_delete.jsonc | 64 +- .../deploy_alertprocessing_rule.jsonc | 156 +- .../deploy_servicehealth_actiongroups.jsonc | 148 +- ...loy_suppression_alertprocessing_rule.jsonc | 38 +- .../deploy_activitylog_firewall_delete.jsonc | 58 +- .../deploy_activitylog_nsg_delete.jsonc | 60 +- ...deploy_activitylog_routetable_update.jsonc | 58 +- ...deploy_activitylog_vpngateway_delete.jsonc | 58 +- .../deploy_afw_firewallhealth_alert.jsonc | 102 +- ...deploy_afw_snatportutilization_alert.jsonc | 102 +- ..._dnsz_registrationcapacityutil_alert.jsonc | 62 +- .../deploy_ercir_arpavailability_alert.jsonc | 102 +- .../deploy_ercir_bgpavailability_alert.jsonc | 62 +- ...y_ercir_qosdropbitsinpersecond_alert.jsonc | 102 +- ..._ercir_qosdropbitsoutpersecond_alert.jsonc | 102 +- ...deploy_ergw_expressroutebitsin_alert.jsonc | 62 +- ...eploy_ergw_expressroutebitsout_alert.jsonc | 102 +- ...eploy_ergw_expressroutecpuutil_alert.jsonc | 62 +- .../deploy_pdnsz_capacityutil_alert.jsonc | 102 +- .../deploy_pdnsz_queryvolume_alert.jsonc | 62 +- ...deploy_pdnsz_recordsetcapacity_alert.jsonc | 98 +- ...loy_publicip_bytesinddosattack_alert.jsonc | 62 +- .../deploy_publicip_ddosattack_alert.jsonc | 102 +- ...y_publicip_packetsinddosattack_alert.jsonc | 98 +- ...eploy_publicip_vipavailability_alert.jsonc | 102 +- .../deploy_vnet_ddosattack_alert.jsonc | 102 +- ...etgw_expressroutebitspersecond_alert.jsonc | 62 +- ...loy_vnetgw_expressroutecpuutil_alert.jsonc | 98 +- .../deploy_vnetgw_tunnelbandwidth_alert.jsonc | 102 +- .../deploy_vnetgw_tunnelegress_alert.jsonc | 62 +- ...gw_tunnelegresspacketdropcount_alert.jsonc | 110 +- ...tunnelegresspacketdropmismatch_alert.jsonc | 70 +- .../deploy_vnetgw_tunnelingress_alert.jsonc | 62 +- ...w_tunnelingresspacketdropcount_alert.jsonc | 110 +- ...unnelingresspacketdropmismatch_alert.jsonc | 70 +- .../deploy_vpngw_bandwidthutil_alert.jsonc | 98 +- .../deploy_vpngw_bgppeerstatus_alert.jsonc | 98 +- .../Network/deploy_vpngw_egress_alert.jsonc | 102 +- .../Network/deploy_vpngw_ingress_alert.jsonc | 62 +- ...gw_tunnelegresspacketdropcount_alert.jsonc | 102 +- ...tunnelegresspacketdropmismatch_alert.jsonc | 60 +- ...w_tunnelingresspacketdropcount_alert.jsonc | 102 +- ...unnelingresspacketdropmismatch_alert.jsonc | 60 +- ...eploy_fd_backendrequestlatency_alert.jsonc | 102 +- ...loy_frontdoorcdn_originlatency_alert.jsonc | 104 +- ...loy_frontdoorcdn_percentage4xx_alert.jsonc | 102 +- ...loy_frontdoorcdn_percentage5xx_alert.jsonc | 102 +- ...overyvault_backuphealthmonitor_alert.jsonc | 12 +- ...oy_storageaccount_availability_alert.jsonc | 102 +- ...ag_applicationgatewaytotaltime_alert.jsonc | 74 +- ...ag_backendlastbyteresponsetime_alert.jsonc | 114 +- .../deploy_ag_capacityunits_alert.jsonc | 96 +- .../deploy_ag_computeunits_alert.jsonc | 62 +- .../deploy_ag_cpuutilization_alert.jsonc | 96 +- .../deploy_ag_failedrequests_alert.jsonc | 100 +- .../deploy_ag_responsestatus_alert.jsonc | 70 +- .../deploy_ag_unhealthyhostcount_alert.jsonc | 96 +- ...eploy_alb_datapathavailability_alert.jsonc | 96 +- ..._alb_globalbackendavailability_alert.jsonc | 100 +- .../deploy_alb_healthprobestatus_alert.jsonc | 62 +- .../deploy_alb_usedsnatports_alert.jsonc | 96 +- .../deploy_erp_expressroutebitsin_alert.jsonc | 62 +- ...deploy_erp_expressroutebitsout_alert.jsonc | 62 +- ...oy_erp_expressroutlineprotocol_alert.jsonc | 100 +- ...y_erp_expressroutrxlightlevell_alert.jsonc | 100 +- ...erp_expressroutrxlightlevellow_alert.jsonc | 100 +- ...y_erp_expressrouttxlightlevell_alert.jsonc | 96 +- ...erp_expressrouttxlightlevellow_alert.jsonc | 100 +- .../deploy_fd_backendhealth_alert.jsonc | 62 +- ...doorcdn_originhealthpercentage_alert.jsonc | 64 +- .../deploy_tm_endpointhealth_alert.jsonc | 102 +- .../deploy_wsf_cpupercentage_alert.jsonc | 96 +- .../deploy_wsf_memorypercentage_alert.jsonc | 100 +- .../deploy_wsf_diskqueuelength_alert.jsonc | 102 +- .../deploy_wsf_httpqueuelength_alert.jsonc | 60 +- .../Monitoring/alerting-connectivity.jsonc | 1688 +++++------ .../Monitoring/alerting-hybridvm.jsonc | 2577 +++++++++++++++++ .../Monitoring/alerting-identity.jsonc | 82 +- .../Monitoring/alerting-landingzone.jsonc | 1452 +++++----- .../Monitoring/alerting-management.jsonc | 48 +- .../Monitoring/alerting-servicehealth.jsonc | 184 +- .../Monitoring/notification-assets.jsonc | 52 +- assets/alzArm.param.json | 789 ++++- 130 files changed, 18492 insertions(+), 7537 deletions(-) create mode 100644 Definitions/policyAssignments/alerting-hybridvm-policySet.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_availablememory_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_cpu_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskreadlatency_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskspace_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskwritelatency_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_disconnected_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert_rg.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_memory_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkin_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkout_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskreadlatency_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskspace_alert.jsonc create mode 100644 Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskwritelatency_alert.jsonc create mode 100644 Definitions/policySetDefinitions/Monitoring/alerting-hybridvm.jsonc diff --git a/Definitions/policyAssignments/alerting-connectivity-policySet.jsonc b/Definitions/policyAssignments/alerting-connectivity-policySet.jsonc index b1c8333..d1a29c9 100644 --- a/Definitions/policyAssignments/alerting-connectivity-policySet.jsonc +++ b/Definitions/policyAssignments/alerting-connectivity-policySet.jsonc @@ -20,278 +20,275 @@ "_deployed_by_amba": true }, "parameters": { - "lbUsedSNATPortsPolicyEffect": "deployIfNotExists", - "vpngwTunnelEgressPacketDropMismatchAlertSeverity": "3", - "vnetGwTunnelBWPolicyEffect": "deployIfNotExists", - "vnetGwTunnelBWThreshold": "1", - "vpngwTunnelIngressPacketDropMismatchFrequency": "PT5M", - "vnetGwTunnelBWAlertState": "true", - "vpngwEgressWindowSize": "PT5M", - "vpngwTunnelIngressPacketDropCountAlertState": "true", - "erGwExpressRouteBitsOutThreshold": "1", - "lbDatapathAvailabilityAlertState": "true", - "lbDatapathAvailabilityEvaluationFrequency": "PT1M", - "vnetGwTunnelIngressPacketDropMismatchWindowSize": "PT5M", - "vpngwIngressWindowSize": "PT5M", - "vnetGwTunnelEgressPacketDropCountAlertSeverity": "1", - "vnetGwTunnelEgressPacketDropMismatchEvaluationFrequency": "PT5M", - "vnetGwTunnelIngressPolicyEffect": "disabled", - "erpLineProtocolEvaluationFrequency": "PT1M", - "vpngwTunnelEgressPacketDropCountWindowSize": "PT5M", - "pipvipAvailabilityPolicyEffect": "deployIfNotExists", - "vnetddosAttackAlertState": "true", - "vpnGwBGPPeerStatusPolicyEffect": "deployIfNotExists", "pdnszQueryVolumeWindowSize": "PT1H", - "vnetGwTunnelBWAlertSeverity": "0", - "vpngwEgressEvaluationFrequency": "PT5M", - "vpngwIngressEvaluationFrequency": "PT5M", - "vnetddosAttackEvaluationFrequency": "PT1M", - "erGwExpressRouteCpuUtilAlertState": "true", - "erpTxLightLevelHighWindowSize": "PT5M", - "erpBitsInPerSecondAlertSeverity": "0", - "vnetGwTunnelEgressPacketDropCountEvaluationFrequency": "PT5M", - "afwsnatPortUtilizationWindowSize": "PT5M", - "lbGlobalBackendAvailabilityPolicyEffect": "deployIfNotExists", - "vpngwTunnelEgressPacketDropCountAlertState": "true", - "erpTxLightLevelLowWindowSize": "PT5M", - "vpngwEgressThreshold": "1", - "lbUsedSNATPortsWindowSize": "PT5M", - "vpngwTunnelIngressPacketDropCountWindowSize": "PT5M", + "vnetGwTunnelIngressPacketDropCountWindowSize": "PT5M", + "pdnszRecordSetCapacityWindowSize": "PT1H", + "pdnszRecordSetCapacityEvaluationFrequency": "PT1H", "ercirQoSDropBitsinPerSecWindowSize": "PT5M", - "pdnszCapacityUtilAlertSeverity": "2", - "vnetGwERCpuUtilPolicyEffect": "deployIfNotExists", - "pdnszRecordSetCapacityThreshold": "80", - "pdnszQueryVolumeAlertSeverity": "4", - "vpngwTunnelEgressPacketDropMismatchWindowSize": "PT5M", - "erGwExpressRouteBitsOutAlertState": "true", - "ercirQoSDropBitsinPerSecEvaluationFrequency": "PT5M", - "erpRxLightLevelHighEvaluationFrequency": "PT1M", - "pdnszCapacityUtilEvaluationFrequency": "PT1H", - "pipBytesInDDoSEvaluationFrequency": "PT5M", - "pdnszRecordSetCapacityAlertSeverity": "2", - "vnetGwTunnelIngressPacketDropMismatchAlertState": "true", - "lbUsedSNATPortsAlertSeverity": "1", - "pdnszRegistrationCapacityUtilAlertSeverity": "2", - "alzMonitorResourceGroupName": "rg-amba-monitor", - "erpBitsInPerSecondAlertState": "true", - "firewallHealthPolicyEffect": "deployIfNotExists", - "erGwExpressRouteBitsInAlertState": "true", - "lbGlobalBackendAvailabilityAlertSeverity": "0", - "ercirArpAvailabilityAlertSeverity": "0", - "erGwExpressRouteCpuUtilThreshold": "80", - "erGwExpressRouteBitsInWindowSize": "PT5M", - "vpngwTunnelEgressPacketDropMismatchPolicyEffect": "deployIfNotExists", - "lbHealthProbeStatusPolicyEffect": "deployIfNotExists", - "erpRxLightLevelLowWindowSize": "PT5M", - "erpRxLightLevelHighWindowSize": "PT5M", - "vpngwEgressAlertState": "true", - "ercirQoSDropBitsoutPerSecAlertSeverity": "2", - "vnetGwTunnelIngressPacketDropMismatchAlertSeverity": "3", - "erGwExpressRouteCpuUtilAlertSeverity": "1", - "erpTxLightLevelHighAlertSeverity": "1", - "pdnszRegistrationCapacityUtilWindowSize": "PT1H", - "vnetGwTunnelIngressAlertState": "true", - "pipdDoSAttackEvaluationFrequency": "PT5M", - "erpBitsOutPerSecondWindowSize": "PT5M", - "ercirQoSDropBitsinPerSecAlertState": "true", + "erGwExpressRouteBitsInEvaluationFrequency": "PT5M", "pipvipAvailabilityEvaluationFrequency": "PT1M", - "ercirBgpAvailabilityAlertSeverity": "0", - "pdnszRecordSetCapacityAlertState": "true", - "erpBitsInPerSecondWindowSize": "PT5M", - "vpngwTunnelEgressPacketDropMismatchFrequency": "PT5M", - "vnetGwTunnelIngressPacketDropCountAlertSeverity": "3", - "vnetGwTunnelEgressEvaluationFrequency": "PT5M", - "lbDatapathAvailabilityAlertSeverity": "0", + "erpBitsInPerSecondPolicyEffect": "deployIfNotExists", + "pdnszCapacityUtilPolicyEffect": "deployIfNotExists", + "erpRxLightLevelHighAlertState": "true", + "erGwExpressRouteCpuUtilAlertState": "true", + "pipvipAvailabilityAlertState": "true", + "vpngwBandWidthUtilAlertState": "true", + "vpngwTunnelIngressPacketDropMismatchWindowSize": "PT5M", + "vnetGwExpressRouteBitsPerSecondWindowSize": "PT5M", + "firewallHealthEvaluationFrequency": "PT1M", + "pipPacketsInDDoSAlertSeverity": "4", + "vnetGwExpressRouteBitsPerSecondThreshold": "1", + "vpngwTunnelEgressPacketDropMismatchAlertSeverity": "3", + "vnetGwTunnelEgressPacketDropMismatchAlertSeverity": "3", + "vnetGwTunnelIngressPacketDropMismatchPolicyEffect": "deployIfNotExists", + "vnetddosAttackPolicyEffect": "deployIfNotExists", + "vnetGwTunnelEgressWindowSize": "PT5M", + "vnetddosAttackAlertSeverity": "1", + "vnetGwERCpuUtilEvaluationFrequency": "PT1M", + "erpRxLightLevelHighWindowSize": "PT5M", + "pdnszRegistrationCapacityUtilPolicyEffect": "deployIfNotExists", "pipvipAvailabilityWindowSize": "PT5M", + "ercirQoSDropBitsoutPerSecEvaluationFrequency": "PT5M", + "vnetGwTunnelIngressPacketDropMismatchAlertState": "true", + "lbGlobalBackendAvailabilityPolicyEffect": "deployIfNotExists", "firewallHealthAlertSeverity": "0", + "vnetGwTunnelIngressPacketDropMismatchWindowSize": "PT5M", "ercirArpAvailabilityPolicyEffect": "deployIfNotExists", - "erpBitsInPerSecondPolicyEffect": "deployIfNotExists", - "vnetGwTunnelIngressPacketDropMismatchPolicyEffect": "deployIfNotExists", - "pipPacketsInDDoSThreshold": "40000", - "vpngwTunnelEgressPacketDropCountPolicyEffect": "deployIfNotExists", - "vpnGwBGPPeerStatusWindowSize": "PT5M", - "activityNSGDeleteAlertState": "true", + "lbGlobalBackendAvailabilityAlertSeverity": "0", + "vpngwTunnelIngressPacketDropCountFrequency": "PT5M", + "vnetGwTunnelIngressPacketDropMismatchAlertSeverity": "3", + "lbHealthProbeStatusAlertSeverity": "2", + "lbGlobalBackendAvailabilityWindowSize": "PT5M", + "pdnszRecordSetCapacityThreshold": "80", + "vnetGwTunnelIngressPacketDropCountAlertSeverity": "3", + "lbUsedSNATPortsEvaluationFrequency": "PT1M", + "vpngwTunnelEgressPacketDropCountAlertSeverity": "3", + "lbDatapathAvailabilityWindowSize": "PT5M", "vnetGwERCpuUtilAlertSeverity": "3", - "pdnszRecordSetCapacityEvaluationFrequency": "PT1H", - "pipBytesInDDoSThreshold": "8000000", - "erGwExpressRouteCpuUtilEvaluationFrequency": "PT1M", + "vpngwTunnelEgressPacketDropCountAlertState": "true", + "pdnszRecordSetCapacityAlertSeverity": "2", + "pdnszRegistrationCapacityUtilThreshold": "80", + "erpBitsOutPerSecondEvaluationFrequency": "PT1M", + "vpngwTunnelEgressPacketDropCountFrequency": "PT5M", + "pipdDoSAttackAlertState": "true", + "erpBitsOutPerSecondWindowSize": "PT5M", + "firewallHealthThreshold": "90", + "erpBitsInPerSecondEvaluationFrequency": "PT1M", + "vpngwIngressEvaluationFrequency": "PT5M", + "vnetGwERCpuUtilThreshold": "80", + "vnetddosAttackWindowSize": "PT5M", + "lbHealthProbeStatusWindowSize": "PT5M", "vnetGwTunnelIngressPacketDropCountPolicyEffect": "deployIfNotExists", - "erpTxLightLevelLowAlertState": "true", - "erGwExpressRouteCpuUtilWindowSize": "PT5M", - "pipdDoSAttackAlertSeverity": "1", - "vpngwIngressAlertState": "true", - "vnetGwTunnelIngressWindowSize": "PT5M", - "vnetGwTunnelIngressPacketDropCountAlertState": "true", + "vpngwEgressWindowSize": "PT5M", + "ercirQoSDropBitsinPerSecEvaluationFrequency": "PT5M", + "vpngwBandWidthUtilEvaluationFrequency": "PT5M", + "erpTxLightLevelHighWindowSize": "PT5M", + "ercirQoSDropBitsoutPerSecPolicyEffect": "deployIfNotExists", + "pipvipAvailabilityThreshold": "1", "pdnszQueryVolumeThreshold": "500", - "vnetGwExpressRouteBitsPerSecondThreshold": "1", - "firewallHealthWindowSize": "PT5M", + "vnetGwERCpuUtilWindowSize": "PT5M", + "lbDatapathAvailabilityEvaluationFrequency": "PT1M", + "vpngwTunnelIngressPacketDropCountAlertState": "true", + "vnetGwExpressRouteBitsPerSecondAlertState": "true", + "vnetGwTunnelIngressEvaluationFrequency": "PT5M", + "vnetGwTunnelEgressPacketDropCountPolicyEffect": "deployIfNotExists", + "ercirBgpAvailabilityPolicyEffect": "deployIfNotExists", + "erpBitsInPerSecondWindowSize": "PT5M", + "vnetGwTunnelBWPolicyEffect": "deployIfNotExists", + "vpngwTunnelEgressPacketDropCountPolicyEffect": "deployIfNotExists", + "erGwExpressRouteBitsInAlertSeverity": "0", + "vnetGwTunnelIngressPacketDropCountAlertState": "true", + "vpnGwBGPPeerStatusWindowSize": "PT5M", + "erpRxLightLevelHighAlertSeverity": "1", + "ercirBgpAvailabilityAlertSeverity": "0", + "activityVPNGWDeleteAlertState": "true", + "ercirBgpAvailabilityAlertState": "true", + "ercirBgpAvailabilityEvaluationFrequency": "PT1M", + "vnetGwTunnelBWAlertState": "true", + "pipPacketsInDDoSAlertState": "true", + "vnetGwTunnelIngressAlertState": "true", + "ercirArpAvailabilityThreshold": "90", + "lbDatapathAvailabilityPolicyEffect": "deployIfNotExists", "lbGlobalBackendAvailabilityEvaluationFrequency": "PT1M", - "vpnGwBGPPeerStatusAlertState": "true", - "vnetGwTunnelIngressThreshold": "1", - "erpRxLightLevelLowPolicyEffect": "deployIfNotExists", - "ercirArpAvailabilityWindowSize": "PT5M", - "vnetGwERCpuUtilEvaluationFrequency": "PT1M", - "ercirArpAvailabilityFrequency": "PT1M", - "vpngwTunnelEgressPacketDropCountFrequency": "PT5M", - "pipPacketsInDDoSPolicyEffect": "disabled", + "erpRxLightLevelHighPolicyEffect": "deployIfNotExists", + "firewallHealthPolicyEffect": "deployIfNotExists", "erGwExpressRouteBitsOutAlertSeverity": "0", - "vpngwTunnelIngressPacketDropMismatchAlertState": "true", - "pipvipAvailabilityThreshold": "1", - "vnetGwTunnelEgressPacketDropMismatchAlertSeverity": "3", - "erpRxLightLevelLowAlertSeverity": "1", + "vnetGwExpressRouteBitsPerSecondAlertSeverity": "0", + "vpngwEgressPolicyEffect": "disabled", + "pdnszQueryVolumeAlertSeverity": "4", + "pipvipAvailabilityPolicyEffect": "deployIfNotExists", + "erpBitsOutPerSecondPolicyEffect": "deployIfNotExists", + "vnetGwTunnelEgressEvaluationFrequency": "PT5M", + "afwsnatPortUtilizationPolicyEffect": "deployIfNotExists", + "erGwExpressRouteCpuUtilThreshold": "80", + "erGwExpressRouteCpuUtilAlertSeverity": "1", + "vnetGwTunnelIngressWindowSize": "PT5M", + "pdnszRegistrationCapacityUtilWindowSize": "PT1H", + "vnetGwERCpuUtilPolicyEffect": "deployIfNotExists", + "vpnGwBGPPeerStatusAlertSeverity": "3", + "pipBytesInDDoSThreshold": "8000000", + "erpTxLightLevelLowAlertState": "true", "ercirBgpAvailabilityThreshold": "90", + "erpBitsOutPerSecondAlertSeverity": "0", + "ercirBgpAvailabilityWindowSize": "PT5M", + "vnetGwTunnelEgressPolicyEffect": "disabled", "vpngwIngressThreshold": "1", + "firewallHealthWindowSize": "PT5M", + "erGwExpressRouteBitsOutThreshold": "1", + "vpngwTunnelEgressPacketDropMismatchFrequency": "PT5M", + "pdnszCapacityUtilAlertState": "true", + "erpRxLightLevelLowEvaluationFrequency": "PT1M", + "erGwExpressRouteBitsInAlertState": "true", + "vnetddosAttackEvaluationFrequency": "PT1M", + "alzMonitorResourceGroupTags": { + "Project": "amba-monitoring" + }, + "lbUsedSNATPortsWindowSize": "PT5M", + "erpRxLightLevelHighEvaluationFrequency": "PT1M", + "vpngwTunnelIngressPacketDropMismatchAlertState": "true", + "erGwExpressRouteBitsInPolicyEffect": "disabled", + "erpBitsInPerSecondAlertSeverity": "0", + "vnetGwTunnelIngressPacketDropMismatchEvaluationFrequency": "PT5M", + "ercirArpAvailabilityAlertState": "true", "activityUDRUpdateAlertState": "true", + "vnetddosAttackAlertState": "true", + "afwsnatPortUtilizationWindowSize": "PT5M", + "erGwExpressRouteBitsOutEvaluationFrequency": "PT5M", + "erGwExpressRouteBitsInThreshold": "1", + "pipBytesInDDoSPolicyEffect": "disabled", + "erpTxLightLevelHighPolicyEffect": "deployIfNotExists", + "vnetGwTunnelIngressPolicyEffect": "disabled", + "pipBytesInDDoSAlertState": "true", + "ercirArpAvailabilityAlertSeverity": "0", + "vpngwBandWidthUtilAlertSeverity": "0", + "pdnszCapacityUtilEvaluationFrequency": "PT1H", + "vnetddosAttackThreshold": "1", + "lbDatapathAvailabilityAlertSeverity": "0", + "vpngwTunnelIngressPacketDropCountWindowSize": "PT5M", + "erpLineProtocolAlertSeverity": "0", + "lbDatapathAvailabilityAlertState": "true", + "vnetGwTunnelEgressPacketDropMismatchWindowSize": "PT5M", + "vpngwIngressPolicyEffect": "disabled", + "afwsnatPortUtilizationFrequency": "PT1M", + "pipBytesInDDoSWindowSize": "PT5M", + "ercirQoSDropBitsinPerSecAlertState": "true", + "vpngwTunnelEgressPacketDropCountWindowSize": "PT5M", + "afwsnatPortUtilizationThreshold": "80", + "afwsnatPortUtilizationAlertSeverity": "1", + "pipdDoSAttackEvaluationFrequency": "PT5M", + "vpngwTunnelIngressPacketDropCountAlertSeverity": "3", + "vpngwEgressEvaluationFrequency": "PT5M", + "vnetGwTunnelEgressPacketDropCountWindowSize": "PT5M", + "erpLineProtocolAlertState": "true", + "ercirQoSDropBitsinPerSecAlertSeverity": "2", + "vnetGwTunnelEgressPacketDropMismatchPolicyEffect": "deployIfNotExists", + "vnetGwTunnelBWThreshold": "1", + "erpTxLightLevelHighAlertState": "true", + "vpngwEgressAlertSeverity": "0", + "vnetGwERCpuUtilAlertState": "true", "pdnszRecordSetCapacityPolicyEffect": "deployIfNotExists", + "lbHealthProbeStatusEvaluationFrequency": "PT1M", + "vpngwTunnelIngressPacketDropMismatchAlertSeverity": "3", + "pipPacketsInDDoSEvaluationFrequency": "PT5M", + "pipdDoSAttackWindowSize": "PT5M", + "pdnszRecordSetCapacityAlertState": "true", + "erpTxLightLevelLowWindowSize": "PT5M", "pipvipAvailabilityAlertSeverity": "1", - "ercirBgpAvailabilityPolicyEffect": "deployIfNotExists", "vnetGwTunnelEgressPacketDropCountAlertState": "true", - "vnetGwExpressRouteBitsPerSecondAlertState": "true", - "vpngwBandWidthUtilAlertState": "true", - "pipdDoSAttackAlertState": "true", - "vpngwIngressAutoMitigate": "true", - "vpngwTunnelIngressPacketDropMismatchWindowSize": "PT5M", - "vpnGwBGPPeerStatusAlertSeverity": "3", - "activityVPNGWDeleteAlertState": "true", - "erpBitsOutPerSecondPolicyEffect": "deployIfNotExists", - "afwsnatPortUtilizationPolicyEffect": "deployIfNotExists", - "pipPacketsInDDoSWindowSize": "PT5M", - "ercirQoSDropBitsinPerSecAlertSeverity": "2", - "vpngwTunnelIngressPacketDropCountFrequency": "PT5M", - "vnetGwExpressRouteBitsPerSecondWindowSize": "PT5M", - "vnetGwTunnelEgressThreshold": "1", - "vnetGwERCpuUtilWindowSize": "PT5M", - "erpTxLightLevelLowEvaluationFrequency": "PT1M", - "pipPacketsInDDoSAlertState": "true", - "vnetGwTunnelEgressPacketDropMismatchWindowSize": "PT5M", - "erGwExpressRouteBitsOutEvaluationFrequency": "PT5M", - "pipdDoSAttackWindowSize": "PT5M", - "pdnszRegistrationCapacityUtilThreshold": "80", - "pipdDoSAttackPolicyEffect": "deployIfNotExists", - "pipPacketsInDDoSEvaluationFrequency": "PT5M", + "activityFWDeleteAlertState": "true", "erpBitsOutPerSecondAlertState": "true", - "erpBitsOutPerSecondAlertSeverity": "0", - "vpngwBandWidthUtilThreshold": "1", - "vnetGwERCpuUtilThreshold": "80", - "erGwExpressRouteBitsInThreshold": "1", + "pdnszRegistrationCapacityUtilAlertSeverity": "2", + "vpnGwBGPPeerStatusThreshold": "1", + "vpnGwBGPPeerStatusPolicyEffect": "deployIfNotExists", + "erpLineProtocolWindowSize": "PT5M", + "alzMonitorResourceGroupName": "rg-amba-monitoring-001", + "pipPacketsInDDoSWindowSize": "PT5M", + "vpngwTunnelIngressPacketDropMismatchPolicyEffect": "deployIfNotExists", + "vnetGwTunnelIngressThreshold": "1", + "vnetGwTunnelEgressPacketDropCountEvaluationFrequency": "PT5M", + "vnetGwTunnelBWAlertSeverity": "0", "pipBytesInDDoSAlertSeverity": "4", - "vpngwTunnelIngressPacketDropCountAlertSeverity": "3", - "vnetGwTunnelEgressPacketDropMismatchAlertState": "true", - "afwsnatPortUtilizationAlertSeverity": "1", - "ercirBgpAvailabilityEvaluationFrequency": "PT1M", - "pdnszQueryVolumeEvaluationFrequency": "PT1H", - "vnetGwTunnelEgressPacketDropCountPolicyEffect": "deployIfNotExists", - "vnetddosAttackWindowSize": "PT5M", + "vpngwIngressAlertSeverity": "0", + "pdnszRegistrationCapacityUtilEvaluationFrequency": "PT1H", + "erpBitsInPerSecondAlertState": "true", + "vpngwTunnelIngressPacketDropCountPolicyEffect": "deployIfNotExists", "pdnszQueryVolumePolicyEffect": "disabled", - "pipvipAvailabilityAlertState": "true", - "lbUsedSNATPortsAlertState": "true", - "vnetddosAttackAlertSeverity": "1", - "erpTxLightLevelHighEvaluationFrequency": "PT1M", - "pdnszQueryVolumeAlertState": "true", - "erpRxLightLevelLowEvaluationFrequency": "PT1M", - "vnetddosAttackPolicyEffect": "deployIfNotExists", - "erGwExpressRouteCpuUtilPolicyEffect": "deployIfNotExists", - "afwsnatPortUtilizationFrequency": "PT1M", - "erGwExpressRouteBitsInEvaluationFrequency": "PT5M", - "vpnGwBGPPeerStatusEvaluationFrequency": "PT5M", - "pipBytesInDDoSPolicyEffect": "disabled", - "vpngwTunnelIngressPacketDropMismatchPolicyEffect": "deployIfNotExists", - "pipBytesInDDoSAlertState": "true", + "erpLineProtocolPolicyEffect": "deployIfNotExists", + "ercirArpAvailabilityFrequency": "PT1M", + "vpnGwBGPPeerStatusAlertState": "true", + "lbGlobalBackendAvailabilityAlertState": "true", + "erpRxLightLevelLowAlertState": "true", + "erpTxLightLevelHighAlertSeverity": "1", + "erGwExpressRouteBitsOutAlertState": "true", + "erpTxLightLevelLowPolicyEffect": "deployIfNotExists", + "ercirQoSDropBitsoutPerSecWindowSize": "PT5M", + "vpngwTunnelEgressPacketDropMismatchPolicyEffect": "deployIfNotExists", + "firewallHealthAlertState": "true", + "vpngwIngressAlertState": "true", "vnetGwTunnelBWWindowSize": "PT5M", - "vnetGwExpressRouteBitsPerSecondPolicyEffect": "deployIfNotExists", "vpngwTunnelEgressPacketDropMismatchAlertState": "true", - "lbGlobalBackendAvailabilityAlertState": "true", - "lbHealthProbeStatusWindowSize": "PT5M", - "vnetGwTunnelEgressAlertState": "true", - "lbDatapathAvailabilityPolicyEffect": "deployIfNotExists", - "pdnszRegistrationCapacityUtilPolicyEffect": "deployIfNotExists", - "vnetGwTunnelIngressPacketDropMismatchEvaluationFrequency": "PT5M", - "ercirBgpAvailabilityAlertState": "true", - "vnetGwTunnelIngressPacketDropCountEvaluationFrequency": "PT5M", - "vnetGwTunnelIngressEvaluationFrequency": "PT5M", - "erpLineProtocolWindowSize": "PT5M", "ercirQoSDropBitsoutPerSecAlertState": "true", - "pdnszCapacityUtilAlertState": "true", - "erGwExpressRouteBitsInPolicyEffect": "disabled", - "vnetGwExpressRouteBitsPerSecondEvaluationFrequency": "PT1M", - "erGwExpressRouteBitsOutWindowSize": "PT5M", - "ercirBgpAvailabilityWindowSize": "PT5M", - "vpngwTunnelIngressPacketDropCountPolicyEffect": "deployIfNotExists", - "erpTxLightLevelLowAlertSeverity": "1", - "firewallHealthThreshold": "90", - "vpngwIngressAlertSeverity": "0", + "erpRxLightLevelLowWindowSize": "PT5M", "pdnszRegistrationCapacityUtilAlertState": "true", - "lbUsedSNATPortsEvaluationFrequency": "PT1M", - "erpTxLightLevelHighPolicyEffect": "deployIfNotExists", - "erpRxLightLevelHighAlertSeverity": "1", - "pdnszRegistrationCapacityUtilEvaluationFrequency": "PT1H", - "pdnszCapacityUtilWindowSize": "PT1H", - "vnetGwTunnelEgressPacketDropCountWindowSize": "PT5M", - "pdnszRecordSetCapacityWindowSize": "PT1H", - "ercirArpAvailabilityAlertState": "true", - "ercirQoSDropBitsoutPerSecEvaluationFrequency": "PT5M", - "vnetGwExpressRouteBitsPerSecondAlertSeverity": "0", - "erpTxLightLevelHighAlertState": "true", - "vpngwBandWidthUtilAlertSeverity": "0", - "vnetGwTunnelIngressAlertSeverity": "0", - "ercirQoSDropBitsoutPerSecWindowSize": "PT5M", - "pdnszCapacityUtilThreshold": "80", - "lbGlobalBackendAvailabilityWindowSize": "PT5M", - "vnetGwTunnelBWEvaluationFrequency": "PT1M", - "afwsnatPortUtilizationThreshold": "80", - "vnetGwTunnelIngressPacketDropCountWindowSize": "PT5M", - "activityFWDeleteAlertState": "true", + "alzMonitorResourceGroupLocation": "australiaeast", + "vpngwIngressAutoMitigate": "true", + "vnetGwTunnelIngressPacketDropCountEvaluationFrequency": "PT5M", + "lbHealthProbeStatusAlertState": "true", + "erGwExpressRouteCpuUtilPolicyEffect": "deployIfNotExists", + "vnetGwTunnelEgressPacketDropCountAlertSeverity": "1", + "vnetGwTunnelEgressPacketDropMismatchAlertState": "true", + "vpngwTunnelIngressPacketDropMismatchFrequency": "PT5M", + "vpngwTunnelEgressPacketDropMismatchWindowSize": "PT5M", + "vnetGwTunnelEgressThreshold": "1", + "erGwExpressRouteBitsOutWindowSize": "PT5M", + "lbUsedSNATPortsAlertState": "true", "erGwExpressRouteBitsOutPolicyEffect": "disabled", - "erpBitsInPerSecondEvaluationFrequency": "PT1M", - "erpLineProtocolAlertSeverity": "0", "vpngwBandWidthUtilWindowSize": "PT5M", - "vnetGwTunnelEgressWindowSize": "PT5M", - "ercirQoSDropBitsoutPerSecPolicyEffect": "deployIfNotExists", - "firewallHealthEvaluationFrequency": "PT1M", - "vnetGwTunnelEgressPacketDropMismatchPolicyEffect": "deployIfNotExists", - "pipBytesInDDoSWindowSize": "PT5M", - "afwsnatPortUtilizationAlertState": "true", - "pdnszCapacityUtilPolicyEffect": "deployIfNotExists", - "vpngwBandWidthUtilEvaluationFrequency": "PT5M", - "vpngwTunnelIngressPacketDropMismatchAlertSeverity": "3", - "alzMonitorResourceGroupLocation": "eastus", - "pipdDoSAttackThreshold": "0", - "lbDatapathAvailabilityWindowSize": "PT5M", - "vnetddosAttackThreshold": "1", - "vpnGwBGPPeerStatusThreshold": "1", - "lbHealthProbeStatusAlertSeverity": "2", - "firewallHealthAlertState": "true", - "vpngwEgressPolicyEffect": "disabled", - "alzMonitorResourceGroupTags": { - "Project": "alz-monitor" - }, - "erpRxLightLevelHighAlertState": "true", - "ercirQoSDropBitsinPerSecPolicyEffect": "deployIfNotExists", - "erpBitsOutPerSecondEvaluationFrequency": "PT1M", + "ercirArpAvailabilityWindowSize": "PT5M", + "lbHealthProbeStatusPolicyEffect": "deployIfNotExists", + "lbUsedSNATPortsPolicyEffect": "deployIfNotExists", + "erpRxLightLevelLowPolicyEffect": "deployIfNotExists", + "pdnszCapacityUtilAlertSeverity": "2", + "vpngwEgressThreshold": "1", + "pipdDoSAttackAlertSeverity": "1", + "pipdDoSAttackPolicyEffect": "deployIfNotExists", "vpngwBandWidthUtilPolicyEffect": "deployIfNotExists", - "erpTxLightLevelLowPolicyEffect": "deployIfNotExists", - "vpngwTunnelEgressPacketDropCountAlertSeverity": "3", - "pipPacketsInDDoSAlertSeverity": "4", - "erpRxLightLevelHighPolicyEffect": "deployIfNotExists", - "ercirArpAvailabilityThreshold": "90", - "erpLineProtocolAlertState": "true", - "erpRxLightLevelLowAlertState": "true", - "vnetGwERCpuUtilAlertState": "true", - "erGwExpressRouteBitsInAlertSeverity": "0", - "erpLineProtocolPolicyEffect": "deployIfNotExists", - "vpngwIngressPolicyEffect": "disabled", - "lbHealthProbeStatusAlertState": "true", + "erGwExpressRouteCpuUtilEvaluationFrequency": "PT1M", + "vnetGwExpressRouteBitsPerSecondPolicyEffect": "deployIfNotExists", + "vnetGwTunnelEgressAlertState": "true", + "pdnszQueryVolumeEvaluationFrequency": "PT1H", + "pipPacketsInDDoSThreshold": "40000", + "erpLineProtocolEvaluationFrequency": "PT1M", + "pdnszCapacityUtilThreshold": "80", + "erpTxLightLevelLowEvaluationFrequency": "PT1M", + "erpRxLightLevelLowAlertSeverity": "1", + "pipPacketsInDDoSPolicyEffect": "disabled", + "vnetGwTunnelIngressAlertSeverity": "0", "vnetGwTunnelEgressAlertSeverity": "0", - "vnetGwTunnelEgressPolicyEffect": "disabled", - "lbHealthProbeStatusEvaluationFrequency": "PT1M", - "vpngwEgressAlertSeverity": "0" + "pdnszQueryVolumeAlertState": "true", + "lbUsedSNATPortsAlertSeverity": "1", + "pipdDoSAttackThreshold": "0", + "ercirQoSDropBitsoutPerSecAlertSeverity": "2", + "afwsnatPortUtilizationAlertState": "true", + "pipBytesInDDoSEvaluationFrequency": "PT5M", + "ercirQoSDropBitsinPerSecPolicyEffect": "deployIfNotExists", + "erGwExpressRouteBitsInWindowSize": "PT5M", + "vpngwBandWidthUtilThreshold": "1", + "erGwExpressRouteCpuUtilWindowSize": "PT5M", + "vnetGwTunnelEgressPacketDropMismatchEvaluationFrequency": "PT5M", + "erpTxLightLevelLowAlertSeverity": "1", + "vnetGwTunnelBWEvaluationFrequency": "PT1M", + "vnetGwExpressRouteBitsPerSecondEvaluationFrequency": "PT1M", + "vpnGwBGPPeerStatusEvaluationFrequency": "PT5M", + "vpngwIngressWindowSize": "PT5M", + "erpTxLightLevelHighEvaluationFrequency": "PT1M", + "vpngwEgressAlertState": "true", + "activityNSGDeleteAlertState": "true", + "pdnszCapacityUtilWindowSize": "PT1H" }, "scope": { "amba": [ "/providers/Microsoft.Management/managementGroups/amba-connectivity" ] - }, - "managedIdentityLocations": { - "amba": "australiaeast" } } \ No newline at end of file diff --git a/Definitions/policyAssignments/alerting-hybridvm-policySet.jsonc b/Definitions/policyAssignments/alerting-hybridvm-policySet.jsonc new file mode 100644 index 0000000..7075bbe --- /dev/null +++ b/Definitions/policyAssignments/alerting-hybridvm-policySet.jsonc @@ -0,0 +1,233 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-assignment-schema.json", + "nodeName": "/root", + "definitionEntry": { + "policySetName": "Alerting-HybridVM", + "displayName": "Deploy Azure Monitor Baseline Alerts for Hybrid VMs", + "nonComplianceMessages": [ + { + "policyDefinitionReferenceId": null, + "message": "Alerting must be deployed to Azure services." + } + ] + }, + "assignment": { + "name": "Deploy-AMBA-HybridVM", + "displayName": "Deploy Azure Monitor Baseline Alerts for Hybrid VMs", + "description": "Initiative to deploy AMBA Hybrid VM alerts" + }, + "metadata": { + "_deployed_by_amba": true + }, + "parameters": { + "hybridVMDataDiskSpaceEvaluationFrequency": "PT5M", + "hybridVMOSDiskWriteLatencyEvaluationFrequency": "PT5M", + "hybridVMDataDiskSpaceWindowSize": "PT15M", + "hybridVMDataDiskWriteLatencyOperator": "LessThan", + "hybridVMDataDiskReadLatencyEvaluationPeriods": "1", + "hybridVMOSDiskSpacePolicyEffect": "deployIfNotExists", + "hybridVMDisconnectedAlertAutoMitigate": "false", + "hybridVMOSDiskReadLatencyAlertSeverity": "2", + "hybridVMDisconnectedAlertPolicyEffect": "deployIfNotExists", + "hybridVMNetworkOutThreshold": "10000000", + "hybridVMDataDiskWriteLatencyEvaluationPeriods": "1", + "hybridVMDataDiskWriteLatencyAutoResolveTime": "00:10:00", + "byoUserAssignedManagedIdentityResourceId": "", + "hybridVMDisconnectedAlertEvaluationPeriods": "1", + "hybridVMDataDiskWriteLatencyPolicyEffect": "deployIfNotExists", + "hybridVMOSDiskReadLatencyAutoMitigate": "true", + "hybridVMPercentMemoryEvaluationFrequency": "PT5M", + "hybridVMHeartBeatRGPolicyEffect": "deployIfNotExists", + "hybridVMHeartBeatRGAutoResolveTime": "00:10:00", + "hybridVMPercentMemoryAutoMitigate": "true", + "hybridVMDataDiskWriteLatencyTimeAggregation": "Average", + "hybridVMOSDiskWriteLatencyThreshold": "50", + "hybridVMOSDiskSpaceAutoResolveTime": "00:10:00", + "hybridVMDataDiskWriteLatencyDisksToInclude": [ + "*" + ], + "hybridVMDisconnectedAlertOperator": "GreaterThan", + "hybridVMDataDiskReadLatencyDisksToInclude": [ + "*" + ], + "hybridVMOSDiskReadLatencyFailingPeriods": "1", + "hybridVMPercentCPUAutoResolveTime": "00:10:00", + "hybridVMDataDiskReadLatencyWindowSize": "PT15M", + "hybridVMDataDiskWriteLatencyAlertSeverity": "2", + "hybridVMNetworkInAlertSeverity": "2", + "hybridVMOSDiskReadLatencyDisksToInclude": [ + "C:", + "/" + ], + "hybridVMOSDiskSpaceDisksToInclude": [ + "C:", + "/" + ], + "hybridVMOSDiskSpaceEvaluationPeriods": "1", + "hybridVMOSDiskWriteLatencyDisksToInclude": [ + "C:", + "/" + ], + "hybridVMOSDiskSpaceOperator": "LessThan", + "hybridVMHeartBeatRGWindowSize": "PT15M", + "hybridVMDataDiskSpaceEvaluationPeriods": "1", + "hybridVMOSDiskSpaceAutoResolve": "true", + "hybridVMOSDiskWriteLatencyFailingPeriods": "1", + "hybridVMDataDiskSpaceThreshold": "10", + "hybridVMOSDiskWriteLatencyComputersToInclude": [ + "*" + ], + "hybridVMNetworkOutComputersToInclude": [ + "*" + ], + "hybridVMPercentMemoryPolicyEffect": "deployIfNotExists", + "hybridVMNetworkOutTimeAggregation": "Average", + "hybridVMDataDiskReadLatencyTimeAggregation": "Average", + "alzMonitorResourceGroupTags": { + "Project": "amba-monitoring" + }, + "hybridVMNetworkInOperator": "GreaterThan", + "hybridVMPercentMemoryAutoResolve": "true", + "hybridVMNetworkInComputersToInclude": [ + "*" + ], + "hybridVMDataDiskSpaceAlertSeverity": "2", + "hybridVMOSDiskReadLatencyEvaluationPeriods": "1", + "hybridVMOSDiskSpaceAlertState": "true", + "hybridVMNetworkOutAlertSeverity": "2", + "hybridVMOSDiskWriteLatencyAlertState": "true", + "hybridVMOSDiskReadLatencyTimeAggregation": "Average", + "hybridVMOSDiskReadLatencyAutoResolve": "true", + "hybridVMNetworkInAutoResolve": "true", + "hybridVMOSDiskWriteLatencyAutoResolve": "true", + "hybridVMPercentCPUWindowSize": "PT15M", + "hybridVMDisconnectedAlertSeverity": "1", + "hybridVMHeartBeatRGAlertState": "true", + "hybridVMOSDiskSpaceWindowSize": "PT15M", + "hybridVMNetworkOutAutoResolveTime": "00:10:00", + "hybridVMPercentMemoryAutoResolveTime": "00:10:00", + "hybridVMDataDiskReadLatencyThreshold": "30", + "hybridVMNetworkInPolicyEffect": "deployIfNotExists", + "hybridVMNetworkInAutoMitigate": "true", + "hybridVMDataDiskSpaceAlertState": "true", + "hybridVMNetworkOutAutoResolve": "true", + "hybridVMOSDiskReadLatencyAlertState": "true", + "hybridVMDataDiskSpaceOperator": "LessThan", + "hybridVMNetworkInWindowSize": "PT15M", + "alzUserAssignedManagedIdentityName": "id-amba-prod-001", + "hybridVMOSDiskSpaceTimeAggregation": "Average", + "hybridVMNetworkInTimeAggregation": "Average", + "hybridVMOSDiskWriteLatencyEvaluationPeriods": "1", + "hybridVMPercentCPUEvaluationFrequency": "PT5M", + "hybridVMPercentCPUOperator": "GreaterThan", + "hybridVMNetworkOutOperator": "GreaterThan", + "hybridVMDisconnectedAlertFailingPeriods": "1", + "hybridVMOSDiskReadLatencyComputersToInclude": [ + "*" + ], + "hybridVMNetworkOutNetworkInterfaceToInclude": [ + "*" + ], + "hybridVMPercentCPUAlertSeverity": "2", + "hybridVMDataDiskReadLatencyOperator": "LessThan", + "hybridVMDataDiskSpacePolicyEffect": "deployIfNotExists", + "hybridVMPercentCPUPolicyEffect": "deployIfNotExists", + "hybridVMNetworkInNetworkInterfaceToInclude": [ + "*" + ], + "hybridVMOSDiskWriteLatencyWindowSize": "PT15M", + "hybridVMDisconnectedAlertState": "true", + "hybridVMOSDiskSpaceComputersToInclude": [ + "*" + ], + "hybridVMOSDiskWriteLatencyPolicyEffect": "deployIfNotExists", + "hybridVMHeartBeatRGOperator": "GreaterThan", + "hybridVMDataDiskReadLatencyAlertSeverity": "2", + "hybridVMOSDiskWriteLatencyTimeAggregation": "Average", + "hybridVMDataDiskWriteLatencyEvaluationFrequency": "PT5M", + "hybridVMNetworkInEvaluationFrequency": "PT5M", + "hybridVMPercentMemoryTimeAggregation": "Average", + "hybridVMDataDiskSpaceTimeAggregation": "Average", + "hybridVMPercentMemoryThreshold": "10", + "hybridVMHeartBeatRGAlertSeverity": "1", + "hybridVMDisconnectedAlertEvaluationFrequency": "P1D", + "hybridVMNetworkInFailingPeriods": "1", + "hybridVMNetworkOutAlertState": "true", + "hybridVMOSDiskReadLatencyPolicyEffect": "deployIfNotExists", + "hybridVMHeartBeatRGTimeAggregation": "Average", + "hybridVMPercentMemoryOperator": "LessThan", + "hybridVMOSDiskSpaceThreshold": "10", + "hybridVMDataDiskWriteLatencyAlertState": "true", + "hybridVMHeartBeatRGAutoMitigate": "true", + "hybridVMOSDiskWriteLatencyAutoResolveTime": "00:10:00", + "hybridVMDataDiskWriteLatencyFailingPeriods": "1", + "hybridVMDataDiskReadLatencyEvaluationFrequency": "PT5M", + "hybridVMOSDiskWriteLatencyAutoMitigate": "true", + "hybridVMNetworkInAlertState": "true", + "hybridVMPercentMemoryAlertSeverity": "2", + "hybridVMNetworkOutEvaluationPeriods": "1", + "hybridVMOSDiskSpaceAutoMitigate": "true", + "hybridVMPercentMemoryWindowSize": "PT15M", + "hybridVMDataDiskWriteLatencyThreshold": "30", + "hybridVMHeartBeatRGAutoResolve": "true", + "hybridVMDataDiskSpaceAutoResolve": "true", + "hybridVMDisconnectedAlertTimeAggregation": "Count", + "hybridVMOSDiskReadLatencyWindowSize": "PT15M", + "hybridVMNetworkInAutoResolveTime": "00:10:00", + "hybridVMNetworkOutFailingPeriods": "1", + "alzMonitorResourceGroupName": "rg-amba-monitoring-001", + "hybridVMPercentCPUThreshold": "85", + "hybridVMDisconnectedAlertWindowSize": "P1D", + "hybridVMDataDiskReadLatencyAutoMitigate": "true", + "hybridVMOSDiskReadLatencyEvaluationFrequency": "PT5M", + "hybridVMPercentCPUAutoMitigate": "true", + "hybridVMDataDiskReadLatencyAutoResolve": "true", + "hybridVMOSDiskWriteLatencyOperator": "LessThan", + "hybridVMOSDiskSpaceEvaluationFrequency": "PT5M", + "hybridVMDataDiskReadLatencyAutoResolveTime": "00:10:00", + "hybridVMNetworkOutPolicyEffect": "deployIfNotExists", + "hybridVMDataDiskSpaceAutoResolveTime": "00:10:00", + "hybridVMOSDiskReadLatencyAutoResolveTime": "00:10:00", + "hybridVMHeartBeatRGEvaluationFrequency": "PT5M", + "hybridVMNetworkInEvaluationPeriods": "1", + "hybridVMOSDiskSpaceFailingPeriods": "1", + "hybridVMNetworkOutEvaluationFrequency": "PT5M", + "hybridVMOSDiskWriteLatencyAlertSeverity": "2", + "alzMonitorResourceGroupLocation": "australiaeast", + "hybridVMOSDiskReadLatencyOperator": "LessThan", + "hybridVMDataDiskReadLatencyPolicyEffect": "deployIfNotExists", + "hybridVMPercentCPUAutoResolve": "true", + "hybridVMPercentMemoryAlertState": "true", + "hybridVMNetworkOutAutoMitigate": "true", + "hybridVMDataDiskReadLatencyAlertState": "true", + "hybridVMNetworkOutWindowSize": "PT15M", + "hybridVMOSDiskSpaceAlertSeverity": "2", + "hybridVMDataDiskWriteLatencyAutoMitigate": "true", + "hybridVMDataDiskSpaceAutoMitigate": "true", + "hybridVMDataDiskSpaceDisksToInclude": [ + "*" + ], + "hybridVMNetworkInThreshold": "10000000", + "hybridVMDataDiskWriteLatencyComputersToInclude": [ + "*" + ], + "hybridVMDataDiskWriteLatencyWindowSize": "PT15M", + "hybridVMDataDiskWriteLatencyAutoResolve": "true", + "hybridVMDataDiskSpaceFailingPeriods": "1", + "hybridVMOSDiskReadLatencyThreshold": "30", + "hybridVMDataDiskReadLatencyFailingPeriods": "1", + "hybridVMDataDiskReadLatencyComputersToInclude": [ + "*" + ], + "hybridVMPercentCPUTimeAggregation": "Average", + "hybridVMHeartBeatRGThreshold": "10", + "hybridVMDisconnectedAlertDaysThreshold": "45", + "hybridVMPercentCPUAlertState": "true", + "alzManagementSubscriptionId": "8cfb2a5f-85a5-48ae-88fe-e11d149f9874" + }, + "scope": { + "amba": [ + "/providers/Microsoft.Management/managementGroups/amba-landingzones" + ] + } +} \ No newline at end of file diff --git a/Definitions/policyAssignments/alerting-identity-policySet.jsonc b/Definitions/policyAssignments/alerting-identity-policySet.jsonc index 116ad2e..20f7c20 100644 --- a/Definitions/policyAssignments/alerting-identity-policySet.jsonc +++ b/Definitions/policyAssignments/alerting-identity-policySet.jsonc @@ -20,42 +20,39 @@ "_deployed_by_amba": true }, "parameters": { - "kvCapacityAlertState": "true", - "kvLatencyAvailabilityThreshold": "1000", "kvLatencyAvailabilityAlertState": "true", - "kvAvailabilityThreshold": "20", - "kvLatencyAvailabilityAlertSeverity": "3", - "alzMonitorResourceGroupName": "rg-amba-monitor", - "alzMonitorResourceGroupLocation": "eastus", - "kvRequestWindowSize": "PT5M", - "kvAvailabilityEvaluationFrequency": "PT1M", - "kvCapacityPolicyEffect": "disabled", - "activityKVDeleteAlertState": "true", - "kvRequestAlertState": "true", - "kvCapacityEvaluationFrequency": "PT1M", - "kvAvailabilityWindowSize": "PT1M", "kvCapacityAlertSeverity": "1", + "kvAvailabilityWindowSize": "PT1M", + "kvLatencyAvailabilityWindowSize": "PT5M", + "activityKVDeleteAlertState": "true", "kvAvailabilityAlertState": "true", - "alzMonitorResourceGroupTags": { - "Project": "alz-monitor" - }, + "kvRequestPolicyEffect": "disabled", + "kvLatencyAvailabilityEvaluationFrequency": "PT5M", + "kvAvailabilityEvaluationFrequency": "PT1M", + "kvRequestWindowSize": "PT5M", "kvAvailabilityAlertSeverity": "1", - "kvCapacityWindowSize": "PT5M", + "kvRequestAlertState": "true", + "kvCapacityAlertState": "true", "kvLatencyAvailabilityPolicyEffect": "disabled", - "kvRequestEvaluationFrequency": "PT5M", - "kvAvailabilityPolicyEffect": "disabled", + "kvCapacityWindowSize": "PT5M", + "kvLatencyAvailabilityThreshold": "1000", "kvRequestAlertSeverity": "2", - "kvRequestPolicyEffect": "disabled", - "kvLatencyAvailabilityEvaluationFrequency": "PT5M", "kvCapacityThreshold": "75", - "kvLatencyAvailabilityWindowSize": "PT5M" + "kvAvailabilityThreshold": "20", + "alzMonitorResourceGroupName": "rg-amba-monitoring-001", + "kvLatencyAvailabilityAlertSeverity": "3", + "kvRequestEvaluationFrequency": "PT5M", + "alzMonitorResourceGroupTags": { + "Project": "amba-monitoring" + }, + "kvCapacityEvaluationFrequency": "PT1M", + "kvAvailabilityPolicyEffect": "disabled", + "alzMonitorResourceGroupLocation": "australiaeast", + "kvCapacityPolicyEffect": "disabled" }, "scope": { "amba": [ "/providers/Microsoft.Management/managementGroups/amba-identity" ] - }, - "managedIdentityLocations": { - "amba": "australiaeast" } } \ No newline at end of file diff --git a/Definitions/policyAssignments/alerting-landingzone-policySet.jsonc b/Definitions/policyAssignments/alerting-landingzone-policySet.jsonc index 71f178c..a398e23 100644 --- a/Definitions/policyAssignments/alerting-landingzone-policySet.jsonc +++ b/Definitions/policyAssignments/alerting-landingzone-policySet.jsonc @@ -20,326 +20,380 @@ "_deployed_by_amba": true }, "parameters": { - "lbUsedSNATPortsPolicyEffect": "deployIfNotExists", - "vmDataDiskWriteLatencyAutoMitigate": "true", - "vmNetworkOutOperator": "GreaterThan", - "pipPacketsInDDoSAlertSeverity": "4", - "vmNetworkInThreshold": "10000000", - "vmosDiskWriteLatencyEvaluationPeriods": "1", - "vmosDiskWriteLatencyComputersToInclude": [ - "*" - ], - "vmDataDiskSpaceWindowSize": "PT15M", - "vmNetworkInComputersToInclude": [ + "vmosDiskReadLatencyOperator": "LessThan", + "vmDataDiskReadLatencyComputersToInclude": [ "*" ], - "pipvipAvailabilityEvaluationFrequency": "PT1M", - "storageAccountAvailabilityFrequency": "PT5M", - "vmosDiskReadLatencyThreshold": "30", - "kvAvailabilityAlertSeverity": "1", - "vmNetworkInOperator": "GreaterThan", - "vmHeartBeatRGThreshold": "10", - "kvAvailabilityThreshold": "20", - "vmHeartBeatRGAutoResolveTime": "00:10:00", - "vmPercentCPUAlertSeverity": "2", - "kvRequestAlertSeverity": "2", - "vmosDiskSpaceWindowSize": "PT15M", - "vmosDiskSpaceOperator": "LessThan", - "pipvipAvailabilityPolicyEffect": "deployIfNotExists", - "vmosDiskSpaceAlertSeverity": "2", - "vmNetworkOutAlertSeverity": "2", - "vnetddosAttackAlertState": "true", - "kvLatencyAvailabilityEvaluationFrequency": "PT5M", - "storageAccountAvailabilityAlertSeverity": "1", - "vmosDiskSpaceAutoResolve": "true", - "agwResponseStatusWindowSize": "PT5M", - "vmHeartBeatRGTimeAggregation": "Average", - "agwcpuUtilWindowSize": "PT5M", - "vnetddosAttackEvaluationFrequency": "PT1M", - "agwComputeUnitsAlertState": "true", - "vmDataDiskWriteLatencyEvaluationFrequency": "PT5M", - "storageAccountAvailabilityThreshold": "90", - "agwFailedRequestsWindowSize": "PT5M", - "lbUsedSNATPortsAlertSeverity": "1", - "vmosDiskSpaceAutoResolveTime": "00:10:00", - "vmDataDiskReadLatencyFailingPeriods": "1", - "alzMonitorResourceGroupTags": { - "Project": "alz-monitor" - }, - "vmosDiskWriteLatencyPolicyEffect": "deployIfNotExists", - "pipPacketsInDDoSPolicyEffect": "disabled", - "vmosDiskWriteLatencyThreshold": "50", - "vmDataDiskSpaceTimeAggregation": "Average", - "vmDataDiskSpaceAlertState": "true", - "kvAvailabilityWindowSize": "PT1M", - "vmDataDiskReadLatencyTimeAggregation": "Average", - "agwCapacityUnitsEvaluationFrequency": "PT1M", - "vmPercentCPUOperator": "GreaterThan", - "vmDataDiskWriteLatencyWindowSize": "PT15M", - "vmPercentCPUAutoResolveTime": "00:10:00", - "vmNetworkInAutoMitigate": "true", - "vmDataDiskSpaceFailingPeriods": "1", - "vmDataDiskWriteLatencyAlertState": "true", - "vmDataDiskReadLatencyPolicyEffect": "deployIfNotExists", - "vmosDiskReadLatencyFailingPeriods": "1", - "vmNetworkInEvaluationFrequency": "PT5M", - "agwBackendLastByteResponseTimeWindowSize": "PT5M", - "vmDataDiskReadLatencyAutoResolveTime": "00:10:00", - "vmNetworkOutAlertState": "true", - "agwcpuUtilAlertSeverity": "2", + "agwApplicationGatewayTotalTimeEvaluationFrequency": "PT1M", + "vnetddosAttackPolicyEffect": "deployIfNotExists", + "vmNetworkInAlertSeverity": "2", + "fdBackendHealthWindowSize": "PT5M", "vmosDiskSpaceComputersToInclude": [ "*" ], - "vmDataDiskWriteLatencyTimeAggregation": "Average", - "pipBytesInDDoSEvaluationFrequency": "PT5M", - "vmDataDiskReadLatencyComputersToInclude": [ + "vmNetworkInNetworkInterfaceToInclude": [ "*" ], - "vmosDiskSpacePolicyEffect": "deployIfNotExists", - "vmNetworkOutAutoResolve": "true", - "agwResponseStatusPolicyEffect": "deployIfNotExists", - "vmNetworkOutTimeAggregation": "Average", - "vmosDiskSpaceAutoMitigate": "true", - "agwcpuUtilPolicyEffect": "deployIfNotExists", - "vmNetworkInPolicyEffect": "deployIfNotExists", - "vmDataDiskReadLatencyOperator": "LessThan", - "lbDatapathAvailabilityEvaluationFrequency": "PT1M", - "vmDataDiskSpaceOperator": "LessThan", - "vmosDiskSpaceEvaluationPeriods": "1", - "kvAvailabilityAlertState": "true", - "vmPercentMemoryOperator": "LessThan", - "vmosDiskWriteLatencyEvaluationFrequency": "PT5M", - "vmDataDiskReadLatencyWindowSize": "PT15M", - "storageAccountAvailabilityWindowSize": "PT5M", - "pipdDoSAttackEvaluationFrequency": "PT5M", - "vnetddosAttackPolicyEffect": "deployIfNotExists", - "vmHeartBeatRGAutoResolve": "true", - "vmNetworkInEvaluationPeriods": "1", - "vmNetworkInAlertState": "true", - "agwcpuUtilAlertState": "true", - "vmPercentMemoryWindowSize": "PT15M", "vmosDiskReadLatencyAutoResolve": "true", - "vmPercentMemoryThreshold": "10", + "pipvipAvailabilityPolicyEffect": "deployIfNotExists", + "agwApplicationGatewayTotalTimeAlertSeverity": "2", + "vmDataDiskSpaceAutoResolveTime": "00:10:00", + "vmosDiskWriteLatencyAlertState": "true", + "cdnpOriginLatencyPolicyEffect": "disabled", + "vmPercentCPUThreshold": "85", + "vmHeartBeatRGAutoMitigate": "true", + "lbDatapathAvailabilityAlertState": "true", + "agwComputeUnitsAlertSeverity": "2", + "kvAvailabilityAlertSeverity": "1", + "alzMonitorResourceGroupName": "rg-amba-monitoring-001", "vmDataDiskReadLatencyEvaluationFrequency": "PT5M", + "wsfDiskQueueLengthAlertSeverity": "2", + "vmHeartBeatRGWindowSize": "PT15M", + "vmDataDiskWriteLatencyPolicyEffect": "deployIfNotExists", + "cdnpOriginHealthPercentageEvaluationFrequency": "PT1M", + "vmNetworkOutPolicyEffect": "deployIfNotExists", "agwResponseStatusEvaluationFrequency": "PT1M", - "pipPacketsInDDoSWindowSize": "PT5M", - "vmDataDiskReadLatencyEvaluationPeriods": "1", + "wsfHttpQueueLengthEvaluationFrequency": "PT1M", + "tmEndpointHealthPolicyEffect": "deployIfNotExists", + "vmPercentMemoryThreshold": "10", + "wsfMemoryPercentageEvaluationFrequency": "PT1M", + "vmosDiskSpaceAutoResolve": "true", + "vnetddosAttackAlertSeverity": "1", + "vmPercentCPUAutoMitigate": "true", + "wsfDiskQueueLengthWindowSize": "PT5M", + "vmDataDiskReadLatencyPolicyEffect": "deployIfNotExists", "pipvipAvailabilityWindowSize": "PT5M", - "agwComputeUnitsEvaluationFrequency": "PT1M", - "vmNetworkInAutoResolveTime": "00:10:00", - "vmDataDiskWriteLatencyThreshold": "30", - "pipPacketsInDDoSThreshold": "40000", - "agwFailedRequestsEvaluationFrequency": "PT1M", - "kvLatencyAvailabilityWindowSize": "PT5M", - "activityNSGDeleteAlertState": "true", - "lbDatapathAvailabilityAlertSeverity": "0", - "pipBytesInDDoSThreshold": "8000000", - "vmDataDiskReadLatencyAlertSeverity": "2", - "lbGlobalBackendAvailabilityWindowSize": "PT5M", - "vmHeartBeatRGAlertState": "true", - "vmDataDiskWriteLatencyAutoResolveTime": "00:10:00", - "kvRequestAlertState": "true", - "agwApplicationGatewayTotalTimeEvaluationFrequency": "PT1M", + "vmPercentCPUAutoResolveTime": "00:10:00", + "agwUnhealthyHostCountAlertState": "true", + "kvCapacityAlertState": "true", "kvRequestPolicyEffect": "disabled", - "agwBackendLastByteResponseTimePolicyEffect": "deployIfNotExists", - "vmPercentMemoryPolicyEffect": "deployIfNotExists", - "kvLatencyAvailabilityAlertState": "true", - "vmPercentCPUTimeAggregation": "Average", - "vmPercentCPUAutoMitigate": "true", - "vmHeartBeatRGEvaluationFrequency": "PT5M", - "pipvipAvailabilityThreshold": "1", - "lbUsedSNATPortsWindowSize": "PT5M", - "vmPercentMemoryAutoMitigate": "true", - "vmHeartBeatRGAutoMitigate": "true", - "vmosDiskWriteLatencyOperator": "LessThan", - "vmPercentCPUThreshold": "85", - "agwApplicationGatewayTotalTimePolicyEffect": "deployIfNotExists", - "vmHeartBeatRGAlertSeverity": "1", - "activityUDRUpdateAlertState": "true", - "vmosDiskReadLatencyAutoMitigate": "true", - "vmNetworkOutNetworkInterfaceToInclude": [ - "*" - ], - "vmDataDiskWriteLatencyComputersToInclude": [ + "agwComputeUnitsAlertState": "true", + "wsfcpuPercentageAlertState": "true", + "vmNetworkOutComputersToInclude": [ "*" ], - "kvCapacityAlertState": "true", - "agwBackendLastByteResponseTimeAlertState": "true", - "vmosDiskReadLatencyWindowSize": "PT15M", - "kvRequestEvaluationFrequency": "PT5M", - "pipdDoSAttackAlertState": "true", - "agwComputeUnitsAlertSeverity": "2", + "vmosDiskSpaceAlertSeverity": "2", + "vmPercentMemoryAutoMitigate": "true", + "activityNSGDeleteAlertState": "true", + "pipPacketsInDDoSEvaluationFrequency": "PT5M", + "agwCapacityUnitsPolicyEffect": "deployIfNotExists", + "vmHeartBeatRGAutoResolveTime": "00:10:00", + "vmDataDiskSpaceEvaluationFrequency": "PT5M", + "cdnpPercentage4XXWindowSize": "PT5M", + "lbGlobalBackendAvailabilityEvaluationFrequency": "PT1M", + "vmosDiskReadLatencyAutoMitigate": "true", + "storageAccountDeletePolicyEffect": "deployIfNotExists", + "vmPercentMemoryEvaluationFrequency": "PT5M", + "vmDataDiskWriteLatencyAutoMitigate": "true", + "vmPercentMemoryAlertState": "true", + "vmDataDiskSpaceThreshold": "10", + "vmNetworkOutThreshold": "10000000", + "lbHealthProbeStatusAlertSeverity": "2", + "vmDataDiskReadLatencyThreshold": "30", + "vmNetworkOutTimeAggregation": "Average", + "vmNetworkInAutoMitigate": "true", + "vmosDiskReadLatencyAutoResolveTime": "00:10:00", + "vmosDiskReadLatencyPolicyEffect": "deployIfNotExists", + "lbHealthProbeStatusEvaluationFrequency": "PT1M", + "pipBytesInDDoSThreshold": "8000000", + "wsfHttpQueueLengthAlertSeverity": "2", + "vmDataDiskSpaceFailingPeriods": "1", + "kvCapacityEvaluationFrequency": "PT1M", + "vmNetworkOutAlertState": "true", "lbHealthProbeStatusWindowSize": "PT5M", - "vmDataDiskSpaceEvaluationPeriods": "1", - "vmDataDiskSpaceAutoResolveTime": "00:10:00", + "kvAvailabilityAlertState": "true", + "vmosDiskWriteLatencyEvaluationPeriods": "1", + "vmNetworkOutAlertSeverity": "2", + "agwApplicationGatewayTotalTimePolicyEffect": "deployIfNotExists", + "wsfcpuPercentageWindowSize": "PT5M", + "agwResponseStatusPolicyEffect": "deployIfNotExists", + "vnetddosAttackEvaluationFrequency": "PT1M", + "vmPercentCPUPolicyEffect": "deployIfNotExists", + "rvBackupHealthMonitorPolicyEffect": "modify", + "agwUnhealthyHostCountEvaluationFrequency": "PT1M", + "vmDataDiskReadLatencyTimeAggregation": "Average", + "vmosDiskReadLatencyDisksToInclude": [ + "C:", + "/" + ], "vmNetworkOutEvaluationPeriods": "1", - "vmNetworkOutFailingPeriods": "1", - "kvLatencyAvailabilityAlertSeverity": "3", - "vmNetworkOutPolicyEffect": "deployIfNotExists", - "vmosDiskWriteLatencyAlertSeverity": "2", - "vmDataDiskWriteLatencyFailingPeriods": "1", - "kvAvailabilityEvaluationFrequency": "PT1M", - "activityKVDeleteAlertState": "true", - "vmosDiskSpaceThreshold": "10", - "kvCapacityThreshold": "75", - "vmPercentMemoryAlertState": "true", + "tmEndpointHealthWindowSize": "PT5M", + "wsfHttpQueueLengthPolicyEffect": "deployIfNotExists", "storageAccountAvailabilityPolicyEffect": "deployIfNotExists", - "vmDataDiskWriteLatencyDisksToInclude": [ + "vmDataDiskSpaceDisksToInclude": [ "*" ], + "wsfHttpQueueLengthWindowSize": "PT5M", + "cdnpOriginHealthPercentagePolicyEffect": "deployIfNotExists", + "agwFailedRequestsAlertSeverity": "2", + "vmosDiskWriteLatencyAutoResolve": "true", + "agwBackendLastByteResponseTimeEvaluationFrequency": "PT1M", + "lbGlobalBackendAvailabilityAlertSeverity": "0", + "agwcpuUtilAlertSeverity": "2", + "kvLatencyAvailabilityPolicyEffect": "disabled", + "vmDataDiskWriteLatencyOperator": "LessThan", + "vmosDiskSpaceThreshold": "10", + "lbDatapathAvailabilityAlertSeverity": "0", "vmosDiskWriteLatencyTimeAggregation": "Average", - "pipPacketsInDDoSAlertState": "true", - "pipdDoSAttackAlertSeverity": "1", - "vmDataDiskReadLatencyAlertState": "true", - "pipdDoSAttackWindowSize": "PT5M", - "vmosDiskWriteLatencyAlertState": "true", - "pipdDoSAttackPolicyEffect": "deployIfNotExists", - "pipPacketsInDDoSEvaluationFrequency": "PT5M", - "alzMonitorResourceGroupName": "rg-amba-monitor", - "vmosDiskReadLatencyOperator": "LessThan", + "vmNetworkOutEvaluationFrequency": "PT5M", + "cdnpOriginHealthPercentageWindowSize": "PT5M", + "vmosDiskSpacePolicyEffect": "deployIfNotExists", + "vmNetworkOutFailingPeriods": "1", + "agwComputeUnitsEvaluationFrequency": "PT1M", + "kvCapacityAlertSeverity": "1", + "lbUsedSNATPortsPolicyEffect": "deployIfNotExists", + "vmPercentMemoryTimeAggregation": "Average", + "pipdDoSAttackAlertState": "true", "vmosDiskReadLatencyAlertSeverity": "2", - "agwApplicationGatewayTotalTimeAlertSeverity": "2", - "agwBackendLastByteResponseTimeEvaluationFrequency": "PT1M", - "agwUnhealthyHostCountPolicyEffect": "deployIfNotExists", - "pipBytesInDDoSAlertSeverity": "4", - "lbDatapathAvailabilityWindowSize": "PT5M", - "vmosDiskReadLatencyAutoResolveTime": "00:10:00", - "agwResponseStatusAlertSeverity": "2", - "vmPercentCPUWindowSize": "PT15M", - "vmDataDiskWriteLatencyPolicyEffect": "deployIfNotExists", - "kvRequestWindowSize": "PT5M", - "vmNetworkOutAutoResolveTime": "00:10:00", - "vnetddosAttackWindowSize": "PT5M", - "agwcpuUtilEvaluationFrequency": "PT1M", - "pipvipAvailabilityAlertState": "true", - "vmosDiskReadLatencyEvaluationFrequency": "PT5M", - "vnetddosAttackAlertSeverity": "1", - "vmosDiskSpaceEvaluationFrequency": "PT5M", - "agwApplicationGatewayTotalTimeAlertState": "true", - "vmosDiskWriteLatencyFailingPeriods": "1", - "vmDataDiskSpaceEvaluationFrequency": "PT5M", - "vmPercentMemoryEvaluationFrequency": "PT5M", - "lbHealthProbeStatusPolicyEffect": "deployIfNotExists", + "vmDataDiskSpaceOperator": "LessThan", + "pipvipAvailabilityEvaluationFrequency": "PT1M", + "vmPercentMemoryAutoResolve": "true", "vmDataDiskWriteLatencyAlertSeverity": "2", - "pipBytesInDDoSPolicyEffect": "disabled", - "vmDataDiskSpaceAutoResolve": "true", - "lbDatapathAvailabilityAlertState": "true", - "pipBytesInDDoSAlertState": "true", + "vmDataDiskWriteLatencyEvaluationPeriods": "1", + "agwComputeUnitsPolicyEffect": "deployIfNotExists", + "fdBackendRequestLatencyWindowSize": "PT5M", + "tmEndpointHealthAlertSeverity": "2", + "vmosDiskWriteLatencyWindowSize": "PT15M", + "kvRequestAlertSeverity": "2", + "tmEndpointHealthAlertState": "true", + "kvRequestAlertState": "true", + "vmosDiskReadLatencyAlertState": "true", + "vmHeartBeatRGPolicyEffect": "deployIfNotExists", + "pipdDoSAttackThreshold": "0", + "vmDataDiskWriteLatencyAlertState": "true", + "vmDataDiskSpaceWindowSize": "PT15M", "vmNetworkOutAutoMitigate": "true", - "vmPercentMemoryAutoResolve": "true", - "vmosDiskReadLatencyComputersToInclude": [ - "*" - ], - "lbGlobalBackendAvailabilityAlertState": "true", - "agwCapacityUnitsPolicyEffect": "deployIfNotExists", - "vmosDiskReadLatencyDisksToInclude": [ + "vmDataDiskSpaceEvaluationPeriods": "1", + "vmPercentCPUAlertState": "true", + "wsfDiskQueueLengthAlertState": "true", + "vmosDiskSpaceWindowSize": "PT15M", + "fdBackendRequestLatencyAlertState": "true", + "vmDataDiskReadLatencyWindowSize": "PT15M", + "vmDataDiskWriteLatencyAutoResolve": "true", + "agwCapacityUnitsWindowSize": "PT5M", + "vmNetworkInAutoResolveTime": "00:10:00", + "agwcpuUtilPolicyEffect": "deployIfNotExists", + "vmDataDiskWriteLatencyWindowSize": "PT15M", + "pipdDoSAttackAlertSeverity": "1", + "vmDataDiskReadLatencyAutoResolveTime": "00:10:00", + "vmosDiskReadLatencyThreshold": "30", + "storageAccountAvailabilityFrequency": "PT5M", + "agwCapacityUnitsAlertSeverity": "2", + "vmNetworkInPolicyEffect": "deployIfNotExists", + "vmosDiskSpaceDisksToInclude": [ "C:", "/" ], - "vmNetworkOutWindowSize": "PT15M", - "vmDataDiskReadLatencyAutoMitigate": "true", - "kvCapacityEvaluationFrequency": "PT1M", - "vmPercentCPUPolicyEffect": "deployIfNotExists", - "vmPercentMemoryTimeAggregation": "Average", - "alzMonitorResourceGroupLocation": "eastus", - "storageAccountAvailabilityAlertState": "true", - "lbGlobalBackendAvailabilityPolicyEffect": "deployIfNotExists", - "vmDataDiskReadLatencyDisksToInclude": [ + "vmDataDiskWriteLatencyDisksToInclude": [ "*" ], - "agwApplicationGatewayTotalTimeWindowSize": "PT5M", - "agwFailedRequestsAlertState": "true", - "vmosDiskReadLatencyEvaluationPeriods": "1", - "vmHeartBeatRGOperator": "GreaterThan", - "vmNetworkOutComputersToInclude": [ + "vmNetworkInComputersToInclude": [ "*" ], - "kvCapacityAlertSeverity": "1", - "vmDataDiskSpaceAutoMitigate": "true", - "vmPercentCPUEvaluationFrequency": "PT5M", - "vmHeartBeatRGWindowSize": "PT15M", + "cdnpPercentage5XXWindowSize": "PT5M", + "fdBackendHealthPolicyEffect": "deployIfNotExists", + "storageAccountAvailabilityWindowSize": "PT5M", + "vmPercentCPUOperator": "GreaterThan", + "pipPacketsInDDoSPolicyEffect": "disabled", + "pipvipAvailabilityAlertState": "true", + "wsfcpuPercentageAlertSeverity": "2", + "cdnpPercentage4XXAlertSeverity": "2", "kvLatencyAvailabilityThreshold": "1000", - "vmHeartBeatRGPolicyEffect": "deployIfNotExists", - "vmNetworkInNetworkInterfaceToInclude": [ - "*" - ], - "vmosDiskWriteLatencyAutoResolve": "true", - "kvLatencyAvailabilityPolicyEffect": "disabled", - "kvCapacityWindowSize": "PT5M", - "vmosDiskReadLatencyTimeAggregation": "Average", + "vmNetworkInAlertState": "true", + "activityKVDeleteAlertState": "true", + "vmNetworkInEvaluationPeriods": "1", "agwResponseStatusAlertState": "true", - "agwComputeUnitsWindowSize": "PT5M", - "agwBackendLastByteResponseTimeAlertSeverity": "2", - "vmNetworkInFailingPeriods": "1", - "agwUnhealthyHostCountEvaluationFrequency": "PT1M", - "vmDataDiskWriteLatencyAutoResolve": "true", - "lbUsedSNATPortsEvaluationFrequency": "PT1M", - "agwUnhealthyHostCountWindowSize": "PT5M", - "vmPercentCPUAutoResolve": "true", + "vmosDiskWriteLatencyAutoMitigate": "true", + "vmDataDiskReadLatencyEvaluationPeriods": "1", + "agwApplicationGatewayTotalTimeAlertState": "true", + "vmPercentMemoryPolicyEffect": "deployIfNotExists", + "vmPercentMemoryAutoResolveTime": "00:10:00", + "vmHeartBeatRGAlertState": "true", "vmosDiskSpaceFailingPeriods": "1", - "vmPercentMemoryAlertSeverity": "2", - "lbHealthProbeStatusEvaluationFrequency": "PT1M", - "vmNetworkInTimeAggregation": "Average", "kvCapacityPolicyEffect": "disabled", - "lbGlobalBackendAvailabilityEvaluationFrequency": "PT1M", - "lbUsedSNATPortsAlertState": "true", - "vmosDiskReadLatencyAlertState": "true", - "lbGlobalBackendAvailabilityAlertSeverity": "0", - "vmosDiskWriteLatencyAutoMitigate": "true", - "pipBytesInDDoSWindowSize": "PT5M", - "vmPercentCPUAlertState": "true", - "vmDataDiskReadLatencyThreshold": "30", + "lbDatapathAvailabilityWindowSize": "PT5M", + "lbDatapathAvailabilityPolicyEffect": "deployIfNotExists", + "tmEndpointHealthEvaluationFrequency": "PT1M", + "vmNetworkOutAutoResolveTime": "00:10:00", + "pipBytesInDDoSEvaluationFrequency": "PT5M", + "fdBackendRequestLatencyEvaluationFrequency": "PT1M", "pipvipAvailabilityAlertSeverity": "1", - "vmosDiskReadLatencyPolicyEffect": "deployIfNotExists", - "agwCapacityUnitsWindowSize": "PT5M", - "pipdDoSAttackThreshold": "0", - "vnetddosAttackThreshold": "1", - "vmDataDiskSpaceAlertSeverity": "2", + "cdnpOriginHealthPercentageAlertSeverity": "2", + "agwUnhealthyHostCountPolicyEffect": "deployIfNotExists", + "wsfMemoryPercentageAlertState": "true", + "vmDataDiskReadLatencyFailingPeriods": "1", + "agwFailedRequestsAlertState": "true", + "kvRequestEvaluationFrequency": "PT5M", + "pipBytesInDDoSAlertSeverity": "4", + "pipPacketsInDDoSAlertState": "true", + "storageAccountDeleteAlertState": "true", + "vmDataDiskSpaceAutoMitigate": "true", + "vmDataDiskSpacePolicyEffect": "deployIfNotExists", + "vmNetworkInThreshold": "10000000", + "kvLatencyAvailabilityWindowSize": "PT5M", + "vmosDiskWriteLatencyComputersToInclude": [ + "*" + ], + "vmosDiskWriteLatencyAlertSeverity": "2", + "vmosDiskSpaceAutoResolveTime": "00:10:00", + "vmPercentMemoryAlertSeverity": "2", + "agwFailedRequestsEvaluationFrequency": "PT1M", + "kvLatencyAvailabilityAlertSeverity": "3", + "vmosDiskSpaceEvaluationFrequency": "PT5M", + "vmDataDiskSpaceAutoResolve": "true", + "vmDataDiskReadLatencyAlertState": "true", + "cdnpPercentage4XXAlertState": "true", + "agwcpuUtilWindowSize": "PT5M", + "vmDataDiskWriteLatencyTimeAggregation": "Average", + "vmosDiskWriteLatencyOperator": "LessThan", + "agwResponseStatusWindowSize": "PT5M", + "cdnpOriginLatencyAlertState": "true", + "vmPercentMemoryWindowSize": "PT15M", + "agwcpuUtilAlertState": "true", + "agwBackendLastByteResponseTimePolicyEffect": "deployIfNotExists", + "agwApplicationGatewayTotalTimeWindowSize": "PT5M", + "agwUnhealthyHostCountAlertSeverity": "2", + "pipdDoSAttackWindowSize": "PT5M", + "lbUsedSNATPortsAlertState": "true", + "vmosDiskSpaceOperator": "LessThan", + "agwFailedRequestsWindowSize": "PT5M", + "vmDataDiskWriteLatencyEvaluationFrequency": "PT5M", + "kvAvailabilityEvaluationFrequency": "PT1M", + "vmosDiskReadLatencyFailingPeriods": "1", + "cdnpOriginLatencyWindowSize": "PT5M", + "vnetddosAttackAlertState": "true", + "vmDataDiskSpaceTimeAggregation": "Average", + "cdnpOriginLatencyEvaluationFrequency": "PT1M", + "vmHeartBeatRGThreshold": "10", + "fdBackendHealthAlertState": "true", + "vmDataDiskWriteLatencyFailingPeriods": "1", "vmosDiskSpaceTimeAggregation": "Average", - "vmDataDiskWriteLatencyEvaluationPeriods": "1", + "vmHeartBeatRGEvaluationFrequency": "PT5M", + "vmNetworkOutWindowSize": "PT15M", + "fdBackendHealthAlertSeverity": "2", + "vmosDiskWriteLatencyFailingPeriods": "1", + "kvCapacityThreshold": "75", + "alzMonitorResourceGroupLocation": "australiaeast", "vmNetworkInAutoResolve": "true", - "kvAvailabilityPolicyEffect": "disabled", + "wsfHttpQueueLengthAlertState": "true", + "pipdDoSAttackEvaluationFrequency": "PT5M", + "agwComputeUnitsWindowSize": "PT5M", + "vmosDiskSpaceEvaluationPeriods": "1", + "kvAvailabilityThreshold": "20", + "pipBytesInDDoSPolicyEffect": "disabled", + "kvLatencyAvailabilityEvaluationFrequency": "PT5M", + "agwcpuUtilEvaluationFrequency": "PT1M", + "lbGlobalBackendAvailabilityWindowSize": "PT5M", + "lbGlobalBackendAvailabilityAlertState": "true", + "vnetddosAttackThreshold": "1", + "vmDataDiskReadLatencyAutoMitigate": "true", + "pipPacketsInDDoSWindowSize": "PT5M", + "lbUsedSNATPortsWindowSize": "PT5M", + "vmHeartBeatRGOperator": "GreaterThan", + "cdnpPercentage5XXPolicyEffect": "deployIfNotExists", + "vmosDiskSpaceAutoMitigate": "true", + "pipvipAvailabilityThreshold": "1", "agwFailedRequestsPolicyEffect": "deployIfNotExists", - "vmosDiskSpaceAlertState": "true", - "vmPercentMemoryAutoResolveTime": "00:10:00", + "vmosDiskReadLatencyWindowSize": "PT15M", + "wsfcpuPercentagePolicyEffect": "deployIfNotExists", + "cdnpPercentage4XXEvaluationFrequency": "PT1M", + "vmHeartBeatRGAlertSeverity": "1", + "wsfcpuPercentageEvaluationFrequency": "PT1M", + "cdnpPercentage4XXPolicyEffect": "deployIfNotExists", "vmosDiskWriteLatencyDisksToInclude": [ "C:", "/" ], - "vmosDiskWriteLatencyWindowSize": "PT15M", - "rvBackupHealthMonitorPolicyEffect": "modify", + "lbHealthProbeStatusAlertState": "true", + "vmNetworkInFailingPeriods": "1", "vmDataDiskReadLatencyAutoResolve": "true", - "vmNetworkOutEvaluationFrequency": "PT5M", + "kvLatencyAvailabilityAlertState": "true", "vmNetworkInWindowSize": "PT15M", - "vmosDiskWriteLatencyAutoResolveTime": "00:10:00", - "vmNetworkInAlertSeverity": "2", - "vmNetworkOutThreshold": "10000000", - "vmDataDiskWriteLatencyOperator": "LessThan", - "agwFailedRequestsAlertSeverity": "2", - "vmDataDiskSpaceThreshold": "10", - "agwCapacityUnitsAlertSeverity": "2", - "agwCapacityUnitsAlertState": "true", - "lbHealthProbeStatusAlertSeverity": "2", - "vmosDiskSpaceDisksToInclude": [ - "C:", - "/" + "vmPercentCPUAlertSeverity": "2", + "fdBackendRequestLatencyPolicyEffect": "deployIfNotExists", + "vmDataDiskWriteLatencyThreshold": "30", + "cdnpPercentage5XXAlertState": "true", + "wsfMemoryPercentageAlertSeverity": "2", + "agwResponseStatusAlertSeverity": "2", + "kvAvailabilityPolicyEffect": "disabled", + "fdBackendRequestLatencyAlertSeverity": "2", + "wsfDiskQueueLengthPolicyEffect": "deployIfNotExists", + "vmNetworkOutAutoResolve": "true", + "pipPacketsInDDoSAlertSeverity": "4", + "lbUsedSNATPortsEvaluationFrequency": "PT1M", + "cdnpOriginHealthPercentageAlertState": "true", + "vmosDiskSpaceAlertState": "true", + "activityUDRUpdateAlertState": "true", + "vmosDiskWriteLatencyEvaluationFrequency": "PT5M", + "wsfDiskQueueLengthEvaluationFrequency": "PT1M", + "vmNetworkOutNetworkInterfaceToInclude": [ + "*" ], - "agwComputeUnitsPolicyEffect": "deployIfNotExists", - "vmDataDiskSpaceDisksToInclude": [ + "vmNetworkInEvaluationFrequency": "PT5M", + "vmDataDiskWriteLatencyAutoResolveTime": "00:10:00", + "kvRequestWindowSize": "PT5M", + "vmPercentCPUTimeAggregation": "Average", + "agwBackendLastByteResponseTimeAlertSeverity": "2", + "vmosDiskReadLatencyComputersToInclude": [ "*" ], - "vmDataDiskSpacePolicyEffect": "deployIfNotExists", - "lbHealthProbeStatusAlertState": "true", - "lbDatapathAvailabilityPolicyEffect": "deployIfNotExists", - "agwUnhealthyHostCountAlertSeverity": "2", - "agwUnhealthyHostCountAlertState": "true" + "lbHealthProbeStatusPolicyEffect": "deployIfNotExists", + "kvAvailabilityWindowSize": "PT1M", + "agwBackendLastByteResponseTimeWindowSize": "PT5M", + "pipPacketsInDDoSThreshold": "40000", + "wsfMemoryPercentageWindowSize": "PT5M", + "agwUnhealthyHostCountWindowSize": "PT5M", + "vmPercentCPUWindowSize": "PT15M", + "vmDataDiskReadLatencyDisksToInclude": [ + "*" + ], + "vmNetworkInOperator": "GreaterThan", + "pipBytesInDDoSWindowSize": "PT5M", + "kvCapacityWindowSize": "PT5M", + "vmDataDiskSpaceAlertSeverity": "2", + "vmosDiskReadLatencyTimeAggregation": "Average", + "wsfMemoryPercentagePolicyEffect": "deployIfNotExists", + "agwCapacityUnitsAlertState": "true", + "lbUsedSNATPortsAlertSeverity": "1", + "vmHeartBeatRGAutoResolve": "true", + "vmosDiskWriteLatencyAutoResolveTime": "00:10:00", + "pipBytesInDDoSAlertState": "true", + "vmHeartBeatRGTimeAggregation": "Average", + "storageAccountAvailabilityAlertSeverity": "1", + "storageAccountAvailabilityThreshold": "90", + "cdnpPercentage5XXEvaluationFrequency": "PT1M", + "vmosDiskReadLatencyEvaluationPeriods": "1", + "vmDataDiskReadLatencyAlertSeverity": "2", + "vmPercentCPUAutoResolve": "true", + "pipdDoSAttackPolicyEffect": "deployIfNotExists", + "vnetddosAttackWindowSize": "PT5M", + "vmPercentMemoryOperator": "LessThan", + "vmNetworkOutOperator": "GreaterThan", + "vmDataDiskSpaceAlertState": "true", + "fdBackendHealthEvaluationFrequency": "PT1M", + "vmosDiskReadLatencyEvaluationFrequency": "PT5M", + "vmosDiskWriteLatencyThreshold": "50", + "cdnpPercentage5XXAlertSeverity": "2", + "vmDataDiskWriteLatencyComputersToInclude": [ + "*" + ], + "storageAccountAvailabilityAlertState": "true", + "lbDatapathAvailabilityEvaluationFrequency": "PT1M", + "lbGlobalBackendAvailabilityPolicyEffect": "deployIfNotExists", + "vmNetworkInTimeAggregation": "Average", + "vmosDiskWriteLatencyPolicyEffect": "deployIfNotExists", + "cdnpOriginLatencyAlertSeverity": "2", + "vmPercentCPUEvaluationFrequency": "PT5M", + "vmDataDiskReadLatencyOperator": "LessThan", + "alzMonitorResourceGroupTags": { + "Project": "amba-monitoring" + }, + "agwCapacityUnitsEvaluationFrequency": "PT1M", + "agwBackendLastByteResponseTimeAlertState": "true" }, "scope": { "amba": [ "/providers/Microsoft.Management/managementGroups/amba-landingzones" ] - }, - "managedIdentityLocations": { - "amba": "australiaeast" } } \ No newline at end of file diff --git a/Definitions/policyAssignments/alerting-management-policySet.jsonc b/Definitions/policyAssignments/alerting-management-policySet.jsonc index 6f9095b..5e8c58d 100644 --- a/Definitions/policyAssignments/alerting-management-policySet.jsonc +++ b/Definitions/policyAssignments/alerting-management-policySet.jsonc @@ -20,33 +20,32 @@ "_deployed_by_amba": true }, "parameters": { - "aaTotalJobAlertThreshold": "20", + "aaTotalJobAlertPolicyEffect": "deployIfNotExists", "activityLAWKeyRegenAlertState": "true", - "alzMonitorResourceGroupTags": { - "Project": "alz-monitor" - }, + "storageAccountDeletePolicyEffect": "deployIfNotExists", "aaTotalJobAlertEvaluationFrequency": "PT1M", "aaTotalJobAlertWindowSize": "PT5M", + "aaTotalJobAlertThreshold": "20", + "storageAccountAvailabilityFrequency": "PT5M", "aaTotalJobAlertAlertState": "true", - "alzMonitorResourceGroupName": "rg-amba-monitor", + "alzMonitorResourceGroupTags": { + "Project": "amba-monitoring" + }, "storageAccountAvailabilityAlertState": "true", - "storageAccountAvailabilityFrequency": "PT5M", + "alzMonitorResourceGroupLocation": "australiaeast", + "activityLAWDeleteAlertState": "true", + "aaTotalJobAlertSeverity": "2", + "storageAccountAvailabilityWindowSize": "PT5M", + "alzMonitorResourceGroupName": "rg-amba-monitoring-001", + "storageAccountDeleteAlertState": "true", + "storageAccountAvailabilityThreshold": "90", "rvBackupHealthMonitorPolicyEffect": "modify", "storageAccountAvailabilityAlertSeverity": "1", - "storageAccountAvailabilityThreshold": "90", - "storageAccountAvailabilityWindowSize": "PT5M", - "alzMonitorResourceGroupLocation": "eastus", - "aaTotalJobAlertPolicyEffect": "deployIfNotExists", - "activityLAWDeleteAlertState": "true", - "storageAccountAvailabilityPolicyEffect": "deployIfNotExists", - "aaTotalJobAlertSeverity": "2" + "storageAccountAvailabilityPolicyEffect": "deployIfNotExists" }, "scope": { "amba": [ "/providers/Microsoft.Management/managementGroups/amba-management" ] - }, - "managedIdentityLocations": { - "amba": "australiaeast" } } \ No newline at end of file diff --git a/Definitions/policyAssignments/alerting-servicehealth-policySet.jsonc b/Definitions/policyAssignments/alerting-servicehealth-policySet.jsonc index c8fc2d1..173b386 100644 --- a/Definitions/policyAssignments/alerting-servicehealth-policySet.jsonc +++ b/Definitions/policyAssignments/alerting-servicehealth-policySet.jsonc @@ -20,24 +20,35 @@ "_deployed_by_amba": true }, "parameters": { - "svcHlthAdvisoryAlertState": "true", + "byoAlertProcessingRule": "", + "serviceHealthAdvisoryPolicyEffect": "deployIfNotExists", + "svcHlthMaintenanceAlertState": "true", + "alzArmRoleId": "", + "alzMonitorResourceGroupTags": { + "Project": "amba-monitoring" + }, + "serviceHealthMaintenancePolicyEffect": "deployIfNotExists", + "alzFunctionTriggerUrl": "", + "alzLogicappCallbackUrl": "", "svcHlthSecAdvisoryAlertState": "true", + "svcHlthIncidentAlertState": "true", + "alzMonitorResourceGroupLocation": "australiaeast", + "alzWebhookServiceUri": "", + "resHlthUnhealthyPolicyEffect": "deployIfNotExists", + "alzFunctionResourceId": "", + "alzLogicappResourceId": "", "resHlthUnhealthyAlertState": "true", + "byoActionGroup": "", + "alzMonitorResourceGroupName": "rg-amba-monitoring-001", + "serviceHealthSecurityPolicyEffect": "deployIfNotExists", "alzMonitorActionGroupEmail": "action@mail.com", - "alzMonitorResourceGroupTags": { - "Project": "alz-monitor" - }, - "alzMonitorResourceGroupName": "rg-amba-monitor", - "svcHlthMaintenanceAlertState": "true", - "alzMonitorResourceGroupLocation": "eastus", - "svcHlthIncidentAlertState": "true" + "svcHlthAdvisoryAlertState": "true", + "alzEventHubResourceId": "", + "serviceHealthIncidentPolicyEffect": "deployIfNotExists" }, "scope": { "amba": [ "/providers/Microsoft.Management/managementGroups/amba" ] - }, - "managedIdentityLocations": { - "amba": "australiaeast" } } \ No newline at end of file diff --git a/Definitions/policyAssignments/notification-assets-policySet.jsonc b/Definitions/policyAssignments/notification-assets-policySet.jsonc index 830f8d1..713467e 100644 --- a/Definitions/policyAssignments/notification-assets-policySet.jsonc +++ b/Definitions/policyAssignments/notification-assets-policySet.jsonc @@ -20,18 +20,25 @@ "_deployed_by_amba": true }, "parameters": { - "alzMonitorResourceGroupName": "rg-amba-monitor", + "byoAlertProcessingRule": "", + "alzArmRoleId": "", "alzMonitorResourceGroupTags": { - "Project": "alz-monitor" + "Project": "amba-monitoring" }, - "alzMonitorResourceGroupLocation": "eastus" + "alzFunctionTriggerUrl": "", + "alzLogicappCallbackUrl": "", + "alzMonitorResourceGroupLocation": "australiaeast", + "alzWebhookServiceUri": "", + "alzFunctionResourceId": "", + "alzLogicappResourceId": "", + "byoActionGroup": "", + "alzMonitorResourceGroupName": "rg-amba-monitoring-001", + "alzMonitorActionGroupEmail": "action@mail.com", + "alzEventHubResourceId": "" }, "scope": { "amba": [ "/providers/Microsoft.Management/managementGroups/amba" ] - }, - "managedIdentityLocations": { - "amba": "australiaeast" } } \ No newline at end of file diff --git a/Definitions/policyDefinitions/Automation/deploy_aa_totaljob_alert.jsonc b/Definitions/policyDefinitions/Automation/deploy_aa_totaljob_alert.jsonc index 2dba1b7..aa4ee3f 100644 --- a/Definitions/policyDefinitions/Automation/deploy_aa_totaljob_alert.jsonc +++ b/Definitions/policyDefinitions/Automation/deploy_aa_totaljob_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Automation", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "0", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "0", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Automation Account TotalJob Alert", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,24 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "TotalJob", "operator": "GreaterThan", + "name": "TotalJob", "metricNamespace": "Microsoft.Automation/automationAccounts", "criterionType": "StaticThresholdCriterion", "metricName": "TotalJob", "dimensions": [ { - "name": "Status", "operator": "Exclude", + "name": "Status", "values": [ "Completed" ] @@ -303,7 +301,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -313,7 +314,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_availablememory_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_availablememory_alert.jsonc index af3d473..d2d468d 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_availablememory_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_availablememory_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1000", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1000", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Virtual Machine Available Memory (MBytes)", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "Average_AvailableMBytes", "operator": "LessThan", + "name": "Average_AvailableMBytes", "metricNamespace": "Microsoft.Compute/virtualMachines", "criterionType": "StaticThresholdCriterion", "metricName": "Available Memory Bytes" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_cpu_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_cpu_alert.jsonc index 9bd967b..1b39119 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_cpu_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_cpu_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,25 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -56,25 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, - "severity": { + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -83,36 +95,21 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "85", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "85", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", - "type": "String" - }, - "alertResourceGroupName": { - "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" - }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "timeAggregation": { - "metadata": { - "displayName": "TimeAggregation" - }, "allowedValues": [ "Average", "Count", @@ -121,42 +118,42 @@ "Total" ], "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, "type": "String" }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, "failingPeriods": { + "defaultValue": "1", "metadata": { "description": "Number of failing periods before alert is fired", "displayName": "Failing Periods" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "alertResourceGroupTags": { "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, - "defaultValue": { - "environment": "test" + "description": "Effect of the policy", + "displayName": "Effect" }, - "type": "Object" + "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -165,26 +162,29 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" } }, @@ -272,30 +272,30 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('failingPeriods')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, "operator": { "value": "[parameters('operator')]" }, @@ -306,7 +306,6 @@ "value": "[parameters('autoResolve')]" } }, - "mode": "incremental", "template": { "parameters": { "evaluationFrequency": { @@ -318,30 +317,30 @@ "windowSize": { "type": "String" }, + "alertResourceGroupLocation": { + "type": "string" + }, "enabled": { "type": "String" }, + "alertResourceGroupName": { + "type": "string" + }, "severity": { "type": "String" }, "threshold": { "type": "String" }, - "alertResourceGroupLocation": { - "type": "string" - }, - "alertResourceGroupName": { - "type": "string" - }, "timeAggregation": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "alertResourceGroupTags": { "type": "object" }, + "failingPeriods": { + "type": "String" + }, "operator": { "type": "String" }, @@ -358,8 +357,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('alertResourceGroupName')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, { @@ -367,23 +366,22 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" } }, - "mode": "Incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -398,6 +396,7 @@ "properties": { "description": "Log Alert for Virtual Machine CPU", "displayName": "[concat(subscription().displayName, '-VMHighCPUAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -408,21 +407,21 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, @@ -433,7 +432,6 @@ "value": "[parameters('autoResolve')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -452,8 +450,8 @@ "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": [ "*" ] @@ -475,15 +473,16 @@ ] }, "apiVersion": "2022-08-01-preview", - "name": "[concat(subscription().displayName, '-VMHighCPUAlert')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-VMHighCPUAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "VMCPUAlert", @@ -493,7 +492,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_datadiskreadlatency_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_datadiskreadlatency_alert.jsonc index d8b4b8d..f5a399b 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_datadiskreadlatency_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_datadiskreadlatency_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,37 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -68,29 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", - "type": "String" - }, - "alertResourceGroupName": { "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "description": "Window size for the alert", + "displayName": "Window Size" }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -99,56 +95,65 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "30", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "30", "type": "String" }, - "alertResourceGroupTags": { + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" + "displayName": "TimeAggregation" }, + "type": "String" + }, + "alertResourceGroupTags": { "defaultValue": { "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, - "effect": { + "failingPeriods": { + "defaultValue": "1", "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" }, + "type": "String" + }, + "effect": { "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "timeAggregation": { "metadata": { - "displayName": "TimeAggregation" + "description": "Effect of the policy", + "displayName": "Effect" }, - "allowedValues": [ - "Average", - "Count", - "Maximum", - "Minimum", - "Total" - ], - "defaultValue": "Average", "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -157,62 +162,57 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", - "type": "String" - }, - "failingPeriods": { "metadata": { - "description": "Number of failing periods before alert is fired", - "displayName": "Failing Periods" + "displayName": "Operator" }, - "defaultValue": "1", "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, - "computersToInclude": { - "metadata": { - "description": "Array of Computer to be monitored", - "displayName": "Computers to be included to be monitored" - }, - "defaultValue": [ - "*" - ], - "type": "array" - }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" }, - "disksToInclude": { + "computersToInclude": { + "defaultValue": [ + "*" + ], "metadata": { - "description": "Array of disk to be monitored for disk both windows and linux", - "displayName": "Disks to be included to be monitored" + "description": "Array of Computer to be monitored", + "displayName": "Computers to be included to be monitored" }, + "type": "array" + }, + "disksToInclude": { "defaultValue": [ "*" ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, "type": "array" } }, @@ -229,9 +229,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/scheduledQueryRules", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -288,6 +285,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -297,48 +297,48 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupTags": { - "value": "[parameters('alertResourceGroupTags')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "operator": { - "value": "[parameters('operator')]" + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, + "operator": { + "value": "[parameters('operator')]" + }, "autoResolveTime": { "value": "[parameters('autoResolveTime')]" }, "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "disksToInclude": { "value": "[parameters('disksToInclude')]" } @@ -351,16 +351,16 @@ "autoMitigate": { "type": "String" }, - "enabled": { - "type": "String" - }, "windowSize": { "type": "String" }, - "alertResourceGroupName": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { "type": "string" }, "severity": { @@ -369,35 +369,36 @@ "threshold": { "type": "String" }, + "timeAggregation": { + "type": "String" + }, "alertResourceGroupTags": { "type": "object" }, - "timeAggregation": { + "failingPeriods": { "type": "String" }, "operator": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "autoResolveTime": { "type": "String" }, "evaluationPeriods": { "type": "String" }, - "computersToInclude": { - "type": "array" - }, "autoResolve": { "type": "String" }, + "computersToInclude": { + "type": "array" + }, "disksToInclude": { "type": "array" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -411,35 +412,37 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/scheduledQueryRules", "properties": { "description": "Log Alert for Virtual Machine dataDiskReadLatency", "displayName": "[concat(subscription().displayName, '-VMHighdataDiskReadLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -447,16 +450,16 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, "severity": { @@ -474,45 +477,41 @@ "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "disksToInclude": { "value": "[parameters('disksToInclude')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[subscription().Id]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "[parameters('timeAggregation')]", - "operator": "[parameters('operator')]", "failingPeriods": { "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" }, + "operator": "[parameters('operator')]", "metricMeasureColumn": "AggregatedValue", "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": "[parameters('computersToInclude')]" }, { - "name": "Disk", "operator": "Include", + "name": "Disk", "values": "[parameters('disksToInclude')]" } ], @@ -520,6 +519,9 @@ } ] }, + "scopes": [ + "[subscription().Id]" + ], "ruleResolveConfiguration": { "timeToResolve": "[parameters('autoResolveTime')]", "autoResolved": "[parameters('autoResolve')]" @@ -536,7 +538,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -548,7 +549,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_datadiskspace_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_datadiskspace_alert.jsonc index b727c6f..27234c9 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_datadiskspace_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_datadiskspace_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,25 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -56,25 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, - "severity": { + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -83,36 +95,21 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "10", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "10", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", - "type": "String" - }, - "alertResourceGroupName": { - "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" - }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "timeAggregation": { - "metadata": { - "displayName": "TimeAggregation" - }, "allowedValues": [ "Average", "Count", @@ -121,42 +118,42 @@ "Total" ], "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, "type": "String" }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, "failingPeriods": { + "defaultValue": "1", "metadata": { "description": "Number of failing periods before alert is fired", "displayName": "Failing Periods" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "alertResourceGroupTags": { "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, - "defaultValue": { - "environment": "test" + "description": "Effect of the policy", + "displayName": "Effect" }, - "type": "Object" + "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -165,44 +162,47 @@ "LessThanOrEqual" ], "defaultValue": "LessThan", + "metadata": { + "displayName": "Operator" + }, "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" }, "disksToInclude": { + "defaultValue": [ + "*" + ], "metadata": { "description": "Array of disk to be monitored for disk both Windows and Linux", "displayName": "Disks to be included to be monitored" }, - "defaultValue": [ - "*" - ], "type": "array" } }, @@ -290,30 +290,30 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('failingPeriods')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, "operator": { "value": "[parameters('operator')]" }, @@ -330,7 +330,6 @@ "value": "[parameters('disksToInclude')]" } }, - "mode": "incremental", "template": { "parameters": { "evaluationFrequency": { @@ -342,30 +341,30 @@ "windowSize": { "type": "String" }, + "alertResourceGroupLocation": { + "type": "string" + }, "enabled": { "type": "String" }, + "alertResourceGroupName": { + "type": "string" + }, "severity": { "type": "String" }, "threshold": { "type": "String" }, - "alertResourceGroupLocation": { - "type": "string" - }, - "alertResourceGroupName": { - "type": "string" - }, "timeAggregation": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "alertResourceGroupTags": { "type": "object" }, + "failingPeriods": { + "type": "String" + }, "operator": { "type": "String" }, @@ -388,8 +387,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('alertResourceGroupName')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, { @@ -397,23 +396,22 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" } }, - "mode": "Incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -428,6 +426,7 @@ "properties": { "description": "Log Alert for Virtual Machine dataDiskSpace", "displayName": "[concat(subscription().displayName, '-VMLowdataDiskSpaceAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -438,21 +437,21 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, @@ -469,7 +468,6 @@ "value": "[parameters('disksToInclude')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -488,15 +486,15 @@ "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": [ "*" ] }, { - "name": "Disk", "operator": "Include", + "name": "Disk", "values": "[parameters('disksToInclude')]" } ], @@ -516,15 +514,16 @@ ] }, "apiVersion": "2022-08-01-preview", - "name": "[concat(subscription().displayName, '-VMLowdataDiskSpaceAlert')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-VMLowdataDiskSpaceAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "VMdataDiskSpaceAlert", @@ -534,7 +533,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_datadiskwritelatency_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_datadiskwritelatency_alert.jsonc index 850e61d..77a7b1f 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_datadiskwritelatency_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_datadiskwritelatency_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,25 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -56,25 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, - "severity": { + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -83,36 +95,21 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "30", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "30", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", - "type": "String" - }, - "alertResourceGroupName": { - "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" - }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "timeAggregation": { - "metadata": { - "displayName": "TimeAggregation" - }, "allowedValues": [ "Average", "Count", @@ -121,42 +118,42 @@ "Total" ], "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, "type": "String" }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, "failingPeriods": { + "defaultValue": "1", "metadata": { "description": "Number of failing periods before alert is fired", "displayName": "Failing Periods" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "alertResourceGroupTags": { "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, - "defaultValue": { - "environment": "test" + "description": "Effect of the policy", + "displayName": "Effect" }, - "type": "Object" + "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -165,54 +162,57 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "disksToInclude": { "metadata": { - "description": "Array of disk to be monitored for disk both windows and linux", - "displayName": "Disks to be included to be monitored" + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" }, + "type": "String" + }, + "computersToInclude": { "defaultValue": [ "*" ], - "type": "array" - }, - "computersToInclude": { "metadata": { "description": "Array of Computer to be monitored", "displayName": "Computers to be included to be monitored" }, + "type": "array" + }, + "disksToInclude": { "defaultValue": [ "*" ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, "type": "array" } }, @@ -300,30 +300,30 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('failingPeriods')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, "operator": { "value": "[parameters('operator')]" }, @@ -336,14 +336,13 @@ "autoResolve": { "value": "[parameters('autoResolve')]" }, - "disksToInclude": { - "value": "[parameters('disksToInclude')]" - }, "computersToInclude": { "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" } }, - "mode": "incremental", "template": { "parameters": { "evaluationFrequency": { @@ -355,30 +354,30 @@ "windowSize": { "type": "String" }, + "alertResourceGroupLocation": { + "type": "string" + }, "enabled": { "type": "String" }, + "alertResourceGroupName": { + "type": "string" + }, "severity": { "type": "String" }, "threshold": { "type": "String" }, - "alertResourceGroupLocation": { - "type": "string" - }, - "alertResourceGroupName": { - "type": "string" - }, "timeAggregation": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "alertResourceGroupTags": { "type": "object" }, + "failingPeriods": { + "type": "String" + }, "operator": { "type": "String" }, @@ -391,10 +390,10 @@ "autoResolve": { "type": "String" }, - "disksToInclude": { + "computersToInclude": { "type": "array" }, - "computersToInclude": { + "disksToInclude": { "type": "array" } }, @@ -404,8 +403,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('alertResourceGroupName')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, { @@ -413,23 +412,22 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" } }, - "mode": "Incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -444,6 +442,7 @@ "properties": { "description": "Log Alert for Virtual Machine dataDiskWriteLatency", "displayName": "[concat(subscription().displayName, '-VMHighdataDiskWriteLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -454,21 +453,21 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, @@ -481,14 +480,13 @@ "autoResolve": { "value": "[parameters('autoResolve')]" }, - "disksToInclude": { - "value": "[parameters('disksToInclude')]" - }, "computersToInclude": { "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -507,13 +505,13 @@ "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": "[parameters('computersToInclude')]" }, { - "name": "Disk", "operator": "Include", + "name": "Disk", "values": "[parameters('disksToInclude')]" } ], @@ -533,15 +531,16 @@ ] }, "apiVersion": "2022-08-01-preview", - "name": "[concat(subscription().displayName, '-VMHighdataDiskWriteLatencyAlert')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-VMHighdataDiskWriteLatencyAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "VMdataDiskWriteLatencyAlert", @@ -551,7 +550,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert.jsonc index 77e7551..9eeaf7d 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,25 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -56,25 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, - "severity": { + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -83,36 +95,21 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "10", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "10", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", - "type": "String" - }, - "alertResourceGroupName": { - "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" - }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "timeAggregation": { - "metadata": { - "displayName": "TimeAggregation" - }, "allowedValues": [ "Average", "Count", @@ -121,42 +118,42 @@ "Total" ], "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, "type": "String" }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, "failingPeriods": { + "defaultValue": "1", "metadata": { "description": "Number of failing periods before alert is fired", "displayName": "Failing Periods" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "alertResourceGroupTags": { "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, - "defaultValue": { - "environment": "test" + "description": "Effect of the policy", + "displayName": "Effect" }, - "type": "Object" + "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -165,34 +162,37 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" } }, @@ -280,30 +280,30 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('failingPeriods')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, "operator": { "value": "[parameters('operator')]" }, @@ -317,7 +317,6 @@ "value": "[parameters('autoResolve')]" } }, - "mode": "incremental", "template": { "parameters": { "evaluationFrequency": { @@ -329,30 +328,30 @@ "windowSize": { "type": "String" }, + "alertResourceGroupLocation": { + "type": "string" + }, "enabled": { "type": "String" }, + "alertResourceGroupName": { + "type": "string" + }, "severity": { "type": "String" }, "threshold": { "type": "String" }, - "alertResourceGroupLocation": { - "type": "string" - }, - "alertResourceGroupName": { - "type": "string" - }, "timeAggregation": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "alertResourceGroupTags": { "type": "object" }, + "failingPeriods": { + "type": "String" + }, "operator": { "type": "String" }, @@ -372,8 +371,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('alertResourceGroupName')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, { @@ -381,23 +380,22 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" } }, - "mode": "Incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -412,6 +410,7 @@ "properties": { "description": "Log Alert for Virtual Machine Heartbeat", "displayName": "[concat(subscription().displayName, '-VMHeartBeatAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -422,21 +421,21 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, @@ -450,7 +449,6 @@ "value": "[parameters('autoResolve')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -469,8 +467,8 @@ "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": [ "*" ] @@ -492,15 +490,16 @@ ] }, "apiVersion": "2022-08-01-preview", - "name": "[concat(subscription().displayName, '-VMHeartBeatAlert')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-VMHeartBeatAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "HeartBeatAlert", @@ -510,7 +509,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert_rg.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert_rg.jsonc index 94d78e9..2590fcb 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert_rg.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_heartbeat_alert_rg.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,37 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -68,13 +52,25 @@ "PT24H" ], "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -83,32 +79,21 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "10", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "10", - "type": "String" - }, - "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "deployIfNotExists", "type": "String" }, "timeAggregation": { - "metadata": { - "displayName": "TimeAggregation" - }, "allowedValues": [ "Average", "Count", @@ -117,20 +102,24 @@ "Total" ], "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, "type": "String" }, - "monitorDisable": { + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", + "description": "Effect of the policy", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -139,26 +128,37 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, - "autoResolve": { + "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" + "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", + "displayName": "Effect" }, + "type": "String" + }, + "autoResolve": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" } }, @@ -179,9 +179,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/scheduledQueryRules", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -238,6 +235,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -247,12 +247,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -280,10 +280,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -306,12 +306,14 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/scheduledQueryRules", "properties": { "description": "Log Alert for Virtual Machine Heartbeat", "displayName": "[concat(resourceGroup().name, '-VMHeartBeatAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -319,12 +321,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -338,30 +340,26 @@ "value": "[parameters('autoResolve')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[resourceGroup().Id]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "[parameters('timeAggregation')]", - "operator": "[parameters('operator')]", "failingPeriods": { "numberOfEvaluationPeriods": 1, "minFailingPeriodsToAlert": 1 }, + "operator": "[parameters('operator')]", "metricMeasureColumn": "AggregatedValue", "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": [ "*" ] @@ -371,6 +369,9 @@ } ] }, + "scopes": [ + "[resourceGroup().Id]" + ], "ruleResolveConfiguration": { "timeToResolve": "[parameters('autoResolveTime')]", "autoResolved": "[parameters('autoResolve')]" @@ -387,7 +388,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_memory_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_memory_alert.jsonc index 7a06fb2..bcc00f6 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_memory_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_memory_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,37 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -68,29 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", - "type": "String" - }, - "alertResourceGroupName": { "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "description": "Window size for the alert", + "displayName": "Window Size" }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -99,56 +95,65 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "10", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "10", "type": "String" }, - "alertResourceGroupTags": { + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" + "displayName": "TimeAggregation" }, + "type": "String" + }, + "alertResourceGroupTags": { "defaultValue": { "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, - "effect": { + "failingPeriods": { + "defaultValue": "1", "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" }, + "type": "String" + }, + "effect": { "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "timeAggregation": { "metadata": { - "displayName": "TimeAggregation" + "description": "Effect of the policy", + "displayName": "Effect" }, - "allowedValues": [ - "Average", - "Count", - "Maximum", - "Minimum", - "Total" - ], - "defaultValue": "Average", "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -157,42 +162,37 @@ "LessThanOrEqual" ], "defaultValue": "LessThan", - "type": "String" - }, - "failingPeriods": { "metadata": { - "description": "Number of failing periods before alert is fired", - "displayName": "Failing Periods" + "displayName": "Operator" }, - "defaultValue": "1", "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" } }, @@ -209,9 +209,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/scheduledQueryRules", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -268,6 +265,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -277,36 +277,36 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupTags": { - "value": "[parameters('alertResourceGroupTags')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "operator": { - "value": "[parameters('operator')]" + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, + "operator": { + "value": "[parameters('operator')]" + }, "autoResolveTime": { "value": "[parameters('autoResolveTime')]" }, @@ -325,16 +325,16 @@ "autoMitigate": { "type": "String" }, - "enabled": { - "type": "String" - }, "windowSize": { "type": "String" }, - "alertResourceGroupName": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { "type": "string" }, "severity": { @@ -343,18 +343,18 @@ "threshold": { "type": "String" }, + "timeAggregation": { + "type": "String" + }, "alertResourceGroupTags": { "type": "object" }, - "timeAggregation": { + "failingPeriods": { "type": "String" }, "operator": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "autoResolveTime": { "type": "String" }, @@ -366,6 +366,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -379,35 +380,37 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/scheduledQueryRules", "properties": { "description": "Log Alert for Virtual Machine Memory", "displayName": "[concat(subscription().displayName, '-VMLowMemoryAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -415,16 +418,16 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, "severity": { @@ -446,30 +449,26 @@ "value": "[parameters('autoResolve')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[subscription().Id]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "[parameters('timeAggregation')]", - "operator": "[parameters('operator')]", "failingPeriods": { "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" }, + "operator": "[parameters('operator')]", "metricMeasureColumn": "AggregatedValue", "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": [ "*" ] @@ -479,6 +478,9 @@ } ] }, + "scopes": [ + "[subscription().Id]" + ], "ruleResolveConfiguration": { "timeToResolve": "[parameters('autoResolveTime')]", "autoResolved": "[parameters('autoResolve')]" @@ -495,7 +497,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -507,7 +508,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_networkin_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_networkin_alert.jsonc index bcae537..f7f81ca 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_networkin_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_networkin_alert.jsonc @@ -3,23 +3,19 @@ "name": "Deploy_VM_NetworkIn_Alert", "properties": { "displayName": "Deploy VM Network Read Alert", - "description": "Policy to audit/deploy VM Nework Read Alert", + "description": "Policy to audit/deploy VM Network Read Alert", "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,37 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -68,29 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", - "type": "String" - }, - "alertResourceGroupName": { "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "description": "Window size for the alert", + "displayName": "Window Size" }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -99,56 +95,65 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "10000000", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "10000000", "type": "String" }, - "alertResourceGroupTags": { + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" + "displayName": "TimeAggregation" }, + "type": "String" + }, + "alertResourceGroupTags": { "defaultValue": { "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, - "effect": { + "failingPeriods": { + "defaultValue": "1", "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" }, + "type": "String" + }, + "effect": { "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "timeAggregation": { "metadata": { - "displayName": "TimeAggregation" + "description": "Effect of the policy", + "displayName": "Effect" }, - "allowedValues": [ - "Average", - "Count", - "Maximum", - "Minimum", - "Total" - ], - "defaultValue": "Average", "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -157,62 +162,57 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", - "type": "String" - }, - "failingPeriods": { "metadata": { - "description": "Number of failing periods before alert is fired", - "displayName": "Failing Periods" + "displayName": "Operator" }, - "defaultValue": "1", "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, - "computersToInclude": { - "metadata": { - "description": "Array of Computer to be monitored", - "displayName": "Computers to be included to be monitored" - }, - "defaultValue": [ - "*" - ], - "type": "array" - }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" }, - "networkInterfacesToInclude": { + "computersToInclude": { + "defaultValue": [ + "*" + ], "metadata": { - "description": "Array of Network Interface to be monitored", - "displayName": "Network Interface to be included to be monitored" + "description": "Array of Computer to be monitored", + "displayName": "Computers to be included to be monitored" }, + "type": "array" + }, + "networkInterfacesToInclude": { "defaultValue": [ "*" ], + "metadata": { + "description": "Array of Network Interface to be monitored", + "displayName": "Network Interface to be included to be monitored" + }, "type": "array" } }, @@ -229,9 +229,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/scheduledQueryRules", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -288,6 +285,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -297,48 +297,48 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupTags": { - "value": "[parameters('alertResourceGroupTags')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "operator": { - "value": "[parameters('operator')]" + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, + "operator": { + "value": "[parameters('operator')]" + }, "autoResolveTime": { "value": "[parameters('autoResolveTime')]" }, "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "networkInterfacesToInclude": { "value": "[parameters('networkInterfacesToInclude')]" } @@ -351,16 +351,16 @@ "autoMitigate": { "type": "String" }, - "enabled": { - "type": "String" - }, "windowSize": { "type": "String" }, - "alertResourceGroupName": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { "type": "string" }, "severity": { @@ -369,35 +369,36 @@ "threshold": { "type": "String" }, + "timeAggregation": { + "type": "String" + }, "alertResourceGroupTags": { "type": "object" }, - "timeAggregation": { + "failingPeriods": { "type": "String" }, "operator": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "autoResolveTime": { "type": "String" }, "evaluationPeriods": { "type": "String" }, - "computersToInclude": { - "type": "array" - }, "autoResolve": { "type": "String" }, + "computersToInclude": { + "type": "array" + }, "networkInterfacesToInclude": { "type": "array" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -411,35 +412,37 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/scheduledQueryRules", "properties": { "description": "Log Alert for Virtual Machine NetworkIn", "displayName": "[concat(subscription().displayName, '-VMHighNetworkInAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -447,16 +450,16 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, "severity": { @@ -474,45 +477,41 @@ "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "networkInterfacesToInclude": { "value": "[parameters('networkInterfacesToInclude')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[subscription().Id]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "[parameters('timeAggregation')]", - "operator": "[parameters('operator')]", "failingPeriods": { "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" }, + "operator": "[parameters('operator')]", "metricMeasureColumn": "AggregatedValue", "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": "[parameters('computersToInclude')]" }, { - "name": "NetworkInterface", "operator": "Include", + "name": "NetworkInterface", "values": "[parameters('networkInterfacesToInclude')]" } ], @@ -520,6 +519,9 @@ } ] }, + "scopes": [ + "[subscription().Id]" + ], "ruleResolveConfiguration": { "timeToResolve": "[parameters('autoResolveTime')]", "autoResolved": "[parameters('autoResolve')]" @@ -536,7 +538,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -548,7 +549,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_networkout_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_networkout_alert.jsonc index f10263b..074efe3 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_networkout_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_networkout_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,37 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -68,29 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", - "type": "String" - }, - "alertResourceGroupName": { "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "description": "Window size for the alert", + "displayName": "Window Size" }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -99,56 +95,65 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "10000000", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "10000000", "type": "String" }, - "alertResourceGroupTags": { + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" + "displayName": "TimeAggregation" }, + "type": "String" + }, + "alertResourceGroupTags": { "defaultValue": { "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, - "effect": { + "failingPeriods": { + "defaultValue": "1", "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" }, + "type": "String" + }, + "effect": { "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "timeAggregation": { "metadata": { - "displayName": "TimeAggregation" + "description": "Effect of the policy", + "displayName": "Effect" }, - "allowedValues": [ - "Average", - "Count", - "Maximum", - "Minimum", - "Total" - ], - "defaultValue": "Average", "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -157,62 +162,57 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", - "type": "String" - }, - "failingPeriods": { "metadata": { - "description": "Number of failing periods before alert is fired", - "displayName": "Failing Periods" + "displayName": "Operator" }, - "defaultValue": "1", "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, - "computersToInclude": { - "metadata": { - "description": "Array of Computer to be monitored", - "displayName": "Computers to be included to be monitored" - }, - "defaultValue": [ - "*" - ], - "type": "array" - }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" }, - "networkInterfacesToInclude": { + "computersToInclude": { + "defaultValue": [ + "*" + ], "metadata": { - "description": "Array of Network Interface to be monitored", - "displayName": "Network Interface to be included to be monitored" + "description": "Array of Computer to be monitored", + "displayName": "Computers to be included to be monitored" }, + "type": "array" + }, + "networkInterfacesToInclude": { "defaultValue": [ "*" ], + "metadata": { + "description": "Array of Network Interface to be monitored", + "displayName": "Network Interface to be included to be monitored" + }, "type": "array" } }, @@ -229,9 +229,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/scheduledQueryRules", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -288,6 +285,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -297,48 +297,48 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupTags": { - "value": "[parameters('alertResourceGroupTags')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "operator": { - "value": "[parameters('operator')]" + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, + "operator": { + "value": "[parameters('operator')]" + }, "autoResolveTime": { "value": "[parameters('autoResolveTime')]" }, "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "networkInterfacesToInclude": { "value": "[parameters('networkInterfacesToInclude')]" } @@ -351,16 +351,16 @@ "autoMitigate": { "type": "String" }, - "enabled": { - "type": "String" - }, "windowSize": { "type": "String" }, - "alertResourceGroupName": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { "type": "string" }, "severity": { @@ -369,35 +369,36 @@ "threshold": { "type": "String" }, + "timeAggregation": { + "type": "String" + }, "alertResourceGroupTags": { "type": "object" }, - "timeAggregation": { + "failingPeriods": { "type": "String" }, "operator": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "autoResolveTime": { "type": "String" }, "evaluationPeriods": { "type": "String" }, - "computersToInclude": { - "type": "array" - }, "autoResolve": { "type": "String" }, + "computersToInclude": { + "type": "array" + }, "networkInterfacesToInclude": { "type": "array" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -411,35 +412,37 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/scheduledQueryRules", "properties": { "description": "Log Alert for Virtual Machine NetworkOut", "displayName": "[concat(subscription().displayName, '-VMHighNetworkOutAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -447,16 +450,16 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, "severity": { @@ -474,45 +477,41 @@ "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "networkInterfacesToInclude": { "value": "[parameters('networkInterfacesToInclude')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[subscription().Id]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "[parameters('timeAggregation')]", - "operator": "[parameters('operator')]", "failingPeriods": { "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" }, + "operator": "[parameters('operator')]", "metricMeasureColumn": "AggregatedValue", "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": "[parameters('computersToInclude')]" }, { - "name": "NetworkInterface", "operator": "Include", + "name": "NetworkInterface", "values": "[parameters('networkInterfacesToInclude')]" } ], @@ -520,6 +519,9 @@ } ] }, + "scopes": [ + "[subscription().Id]" + ], "ruleResolveConfiguration": { "timeToResolve": "[parameters('autoResolveTime')]", "autoResolved": "[parameters('autoResolve')]" @@ -536,7 +538,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -548,7 +549,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_osdiskreadlatency_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_osdiskreadlatency_alert.jsonc index 3b6673f..24778f1 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_osdiskreadlatency_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_osdiskreadlatency_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,25 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -56,25 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, - "severity": { + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -83,36 +95,21 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "30", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "30", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", - "type": "String" - }, - "alertResourceGroupName": { - "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" - }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "timeAggregation": { - "metadata": { - "displayName": "TimeAggregation" - }, "allowedValues": [ "Average", "Count", @@ -121,42 +118,42 @@ "Total" ], "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, "type": "String" }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, "failingPeriods": { + "defaultValue": "1", "metadata": { "description": "Number of failing periods before alert is fired", "displayName": "Failing Periods" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "alertResourceGroupTags": { "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, - "defaultValue": { - "environment": "test" + "description": "Effect of the policy", + "displayName": "Effect" }, - "type": "Object" + "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -165,55 +162,58 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" }, - "disksToInclude": { + "computersToInclude": { + "defaultValue": [ + "*" + ], "metadata": { - "description": "Array of disk to be monitored for disk both windows and linux", + "description": "Array of Computer to be monitored", "displayName": "Disks to be included to be monitored" }, + "type": "array" + }, + "disksToInclude": { "defaultValue": [ "C:", "/" ], - "type": "array" - }, - "computersToInclude": { "metadata": { - "description": "Array of Computer to be monitored", + "description": "Array of disk to be monitored for disk both windows and linux", "displayName": "Disks to be included to be monitored" }, - "defaultValue": [ - "*" - ], "type": "array" } }, @@ -301,30 +301,30 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('failingPeriods')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, "operator": { "value": "[parameters('operator')]" }, @@ -337,14 +337,13 @@ "autoResolve": { "value": "[parameters('autoResolve')]" }, - "disksToInclude": { - "value": "[parameters('disksToInclude')]" - }, "computersToInclude": { "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" } }, - "mode": "incremental", "template": { "parameters": { "evaluationFrequency": { @@ -356,30 +355,30 @@ "windowSize": { "type": "String" }, + "alertResourceGroupLocation": { + "type": "string" + }, "enabled": { "type": "String" }, + "alertResourceGroupName": { + "type": "string" + }, "severity": { "type": "String" }, "threshold": { "type": "String" }, - "alertResourceGroupLocation": { - "type": "string" - }, - "alertResourceGroupName": { - "type": "string" - }, "timeAggregation": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "alertResourceGroupTags": { "type": "object" }, + "failingPeriods": { + "type": "String" + }, "operator": { "type": "String" }, @@ -392,10 +391,10 @@ "autoResolve": { "type": "String" }, - "disksToInclude": { + "computersToInclude": { "type": "array" }, - "computersToInclude": { + "disksToInclude": { "type": "array" } }, @@ -405,8 +404,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('alertResourceGroupName')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, { @@ -414,23 +413,22 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" } }, - "mode": "Incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -445,6 +443,7 @@ "properties": { "description": "Log Alert for Virtual Machine OSDiskreadLatency", "displayName": "[concat(subscription().displayName, '-VMLowOSDiskreadLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -455,21 +454,21 @@ "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, @@ -482,14 +481,13 @@ "autoResolve": { "value": "[parameters('autoResolve')]" }, - "disksToInclude": { - "value": "[parameters('disksToInclude')]" - }, "computersToInclude": { "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -508,13 +506,13 @@ "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": "[parameters('computersToInclude')]" }, { - "name": "Disk", "operator": "Include", + "name": "Disk", "values": "[parameters('disksToInclude')]" } ], @@ -534,15 +532,16 @@ ] }, "apiVersion": "2022-08-01-preview", - "name": "[concat(subscription().displayName, '-VMLowOSDiskreadLatencyAlert')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-VMLowOSDiskreadLatencyAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "VMOSDiskreadLatencyAlert", @@ -552,7 +551,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_osdiskspace_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_osdiskspace_alert.jsonc index 9d0a0e1..f52a6a5 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_osdiskspace_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_osdiskspace_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,13 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT5M", "PT15M", @@ -44,25 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, - "severity": { + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -71,84 +95,65 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "10", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "10", "type": "String" }, - "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, + "timeAggregation": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "Average", + "Count", + "Maximum", + "Minimum", + "Total" ], - "defaultValue": "deployIfNotExists", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", - "type": "String" - }, - "alertResourceGroupName": { + "defaultValue": "Average", "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "displayName": "TimeAggregation" }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "environment": "test" - }, "type": "Object" }, - "timeAggregation": { + "failingPeriods": { + "defaultValue": "1", "metadata": { - "displayName": "TimeAggregation" + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" }, + "type": "String" + }, + "effect": { "allowedValues": [ - "Average", - "Count", - "Maximum", - "Minimum", - "Total" + "deployIfNotExists", + "disabled" ], - "defaultValue": "Average", + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -157,64 +162,59 @@ "LessThanOrEqual" ], "defaultValue": "LessThan", - "type": "String" - }, - "failingPeriods": { "metadata": { - "description": "Number of failing periods before alert is fired", - "displayName": "Failing Periods" + "displayName": "Operator" }, - "defaultValue": "1", "type": "String" }, - "computersToInclude": { + "autoResolveTime": { + "defaultValue": "true", "metadata": { - "description": "Array of Computer to be monitored", - "displayName": "Disks to be included to be monitored" + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" }, - "defaultValue": [ - "*" - ], - "type": "array" + "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, - "autoResolveTime": { + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Auto Resolve time for the alert in ISO 8601 format", + "description": "Auto Resolve for the alert", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, - "disksToInclude": { + "computersToInclude": { + "defaultValue": [ + "*" + ], "metadata": { - "description": "Array of disk to be monitored for disk both windows and linux", + "description": "Array of Computer to be monitored", "displayName": "Disks to be included to be monitored" }, + "type": "array" + }, + "disksToInclude": { "defaultValue": [ "C:", "/" ], - "type": "array" - }, - "autoResolve": { "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", - "type": "String" + "type": "array" } }, "policyRule": { @@ -295,116 +295,116 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" + "timeAggregation": { + "value": "[parameters('timeAggregation')]" }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, - "timeAggregation": { - "value": "[parameters('timeAggregation')]" + "failingPeriods": { + "value": "[parameters('failingPeriods')]" }, "operator": { "value": "[parameters('operator')]" }, - "failingPeriods": { - "value": "[parameters('failingPeriods')]" - }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" }, "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('autoResolveTime')]" + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" }, "disksToInclude": { "value": "[parameters('disksToInclude')]" - }, - "autoResolve": { - "value": "[parameters('autoResolve')]" } }, - "mode": "incremental", "template": { "parameters": { "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, + "alertResourceGroupLocation": { + "type": "string" + }, "enabled": { "type": "String" }, - "severity": { - "type": "String" + "alertResourceGroupName": { + "type": "string" }, - "autoMitigate": { + "severity": { "type": "String" }, "threshold": { "type": "String" }, - "alertResourceGroupLocation": { - "type": "string" - }, - "alertResourceGroupName": { - "type": "string" + "timeAggregation": { + "type": "String" }, "alertResourceGroupTags": { "type": "object" }, - "timeAggregation": { + "failingPeriods": { "type": "String" }, "operator": { "type": "String" }, - "failingPeriods": { + "autoResolveTime": { "type": "String" }, - "computersToInclude": { - "type": "array" - }, "evaluationPeriods": { "type": "String" }, - "autoResolveTime": { + "autoResolve": { "type": "String" }, - "disksToInclude": { + "computersToInclude": { "type": "array" }, - "autoResolve": { - "type": "String" + "disksToInclude": { + "type": "array" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", - "location": "[parameters('alertResourceGroupLocation')]", "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, @@ -413,23 +413,22 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" } }, - "mode": "Incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -437,86 +436,87 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/scheduledQueryRules", "properties": { "description": "Log Alert for Virtual Machine OSDiskSpace", "displayName": "[concat(subscription().displayName, '-VMLowOSDiskSpaceAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" }, "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('autoResolveTime')]" + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" }, "disksToInclude": { "value": "[parameters('disksToInclude')]" - }, - "autoResolve": { - "value": "[parameters('autoResolve')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "[parameters('timeAggregation')]", - "operator": "[parameters('operator')]", "failingPeriods": { "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" }, - "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk", + "operator": "[parameters('operator')]", "metricMeasureColumn": "AggregatedValue", "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": "[parameters('computersToInclude')]" }, { - "name": "Disk", "operator": "Include", + "name": "Disk", "values": "[parameters('disksToInclude')]" } - ] + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" } ] }, @@ -524,24 +524,24 @@ "[subscription().Id]" ], "ruleResolveConfiguration": { - "autoResolved": "[parameters('autoResolve')]", - "timeToResolve": "[parameters('autoResolveTime')]" + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" }, "targetResourceTypes": [ "Microsoft.Compute/virtualMachines" ] }, - "location": "[parameters('alertResourceGroupLocation')]", "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", "name": "[concat(subscription().displayName, '-VMLowOSDiskSpaceAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "VMOSDiskSpaceAlert", @@ -550,9 +550,9 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Compute/deploy_vm_osdiskwritelatency_alert.jsonc b/Definitions/policyDefinitions/Compute/deploy_vm_osdiskwritelatency_alert.jsonc index 012e6bb..742299b 100644 --- a/Definitions/policyDefinitions/Compute/deploy_vm_osdiskwritelatency_alert.jsonc +++ b/Definitions/policyDefinitions/Compute/deploy_vm_osdiskwritelatency_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Compute", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT5M", "PT15M", @@ -27,37 +23,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT5M", "PT15M", @@ -68,29 +52,41 @@ "PT24H" ], "defaultValue": "PT15M", - "type": "String" - }, - "alertResourceGroupName": { "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "description": "Window size for the alert", + "displayName": "Window Size" }, - "defaultValue": "AlzMonitoring-rg", "type": "String" }, "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -99,56 +95,65 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "50", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "50", "type": "String" }, - "alertResourceGroupTags": { + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" + "displayName": "TimeAggregation" }, + "type": "String" + }, + "alertResourceGroupTags": { "defaultValue": { "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, - "effect": { + "failingPeriods": { + "defaultValue": "1", "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" }, + "type": "String" + }, + "effect": { "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", - "type": "String" - }, - "timeAggregation": { "metadata": { - "displayName": "TimeAggregation" + "description": "Effect of the policy", + "displayName": "Effect" }, - "allowedValues": [ - "Average", - "Count", - "Maximum", - "Minimum", - "Total" - ], - "defaultValue": "Average", "type": "String" }, "operator": { - "metadata": { - "displayName": "Operator" - }, "allowedValues": [ "Equals", "GreaterThan", @@ -157,63 +162,58 @@ "LessThanOrEqual" ], "defaultValue": "GreaterThan", - "type": "String" - }, - "failingPeriods": { "metadata": { - "description": "Number of failing periods before alert is fired", - "displayName": "Failing Periods" + "displayName": "Operator" }, - "defaultValue": "1", "type": "String" }, "autoResolveTime": { + "defaultValue": "true", "metadata": { "description": "Auto Resolve time for the alert in ISO 8601 format", "displayName": "Auto Resolve" }, - "defaultValue": "true", "type": "String" }, "evaluationPeriods": { + "defaultValue": "1", "metadata": { "description": "The number of aggregated lookback points.", "displayName": "Evaluation Periods" }, - "defaultValue": "1", "type": "String" }, - "computersToInclude": { - "metadata": { - "description": "Array of Computer to be monitored", - "displayName": "Disks to be included to be monitored" - }, - "defaultValue": [ - "*" - ], - "type": "array" - }, "autoResolve": { - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "Auto Resolve" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, "type": "String" }, - "disksToInclude": { + "computersToInclude": { + "defaultValue": [ + "*" + ], "metadata": { - "description": "Array of disk to be monitored for disk both windows and linux", + "description": "Array of Computer to be monitored", "displayName": "Disks to be included to be monitored" }, + "type": "array" + }, + "disksToInclude": { "defaultValue": [ "C:", "/" ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, "type": "array" } }, @@ -230,9 +230,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/scheduledQueryRules", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -289,6 +286,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -298,48 +298,48 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, "severity": { "value": "[parameters('severity')]" }, "threshold": { "value": "[parameters('threshold')]" }, - "alertResourceGroupTags": { - "value": "[parameters('alertResourceGroupTags')]" - }, "timeAggregation": { "value": "[parameters('timeAggregation')]" }, - "operator": { - "value": "[parameters('operator')]" + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" }, "failingPeriods": { "value": "[parameters('failingPeriods')]" }, + "operator": { + "value": "[parameters('operator')]" + }, "autoResolveTime": { "value": "[parameters('autoResolveTime')]" }, "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "disksToInclude": { "value": "[parameters('disksToInclude')]" } @@ -352,16 +352,16 @@ "autoMitigate": { "type": "String" }, - "enabled": { - "type": "String" - }, "windowSize": { "type": "String" }, - "alertResourceGroupName": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { "type": "string" }, "severity": { @@ -370,35 +370,36 @@ "threshold": { "type": "String" }, + "timeAggregation": { + "type": "String" + }, "alertResourceGroupTags": { "type": "object" }, - "timeAggregation": { + "failingPeriods": { "type": "String" }, "operator": { "type": "String" }, - "failingPeriods": { - "type": "String" - }, "autoResolveTime": { "type": "String" }, "evaluationPeriods": { "type": "String" }, - "computersToInclude": { - "type": "array" - }, "autoResolve": { "type": "String" }, + "computersToInclude": { + "type": "array" + }, "disksToInclude": { "type": "array" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -412,35 +413,37 @@ "type": "Microsoft.Resources/deployments", "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" - }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/scheduledQueryRules", "properties": { "description": "Log Alert for Virtual Machine OSDiskwriteLatency", "displayName": "[concat(subscription().displayName, '-VMLowOSDiskwriteLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -448,16 +451,16 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, - "alertResourceGroupName": { - "value": "[parameters('alertResourceGroupName')]" - }, "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, "severity": { @@ -475,45 +478,41 @@ "evaluationPeriods": { "value": "[parameters('evaluationPeriods')]" }, - "computersToInclude": { - "value": "[parameters('computersToInclude')]" - }, "autoResolve": { "value": "[parameters('autoResolve')]" }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, "disksToInclude": { "value": "[parameters('disksToInclude')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[subscription().Id]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "[parameters('timeAggregation')]", - "operator": "[parameters('operator')]", "failingPeriods": { "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" }, + "operator": "[parameters('operator')]", "metricMeasureColumn": "AggregatedValue", "resourceIdColumn": "_ResourceId", "dimensions": [ { - "name": "Computer", "operator": "Include", + "name": "Computer", "values": "[parameters('computersToInclude')]" }, { - "name": "Disk", "operator": "Include", + "name": "Disk", "values": "[parameters('disksToInclude')]" } ], @@ -521,6 +520,9 @@ } ] }, + "scopes": [ + "[subscription().Id]" + ], "ruleResolveConfiguration": { "timeToResolve": "[parameters('autoResolveTime')]", "autoResolved": "[parameters('autoResolve')]" @@ -537,7 +539,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -549,7 +550,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_availablememory_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_availablememory_alert.jsonc new file mode 100644 index 0000000..a004b68 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_availablememory_alert.jsonc @@ -0,0 +1,317 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_AvailableMemory_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Available Memory Alert", + "description": "Policy to audit/deploy VM Available Memory Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "1000", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "monitorDisable": { + "defaultValue": "MonitorDisable", + "metadata": { + "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", + "displayName": "Effect" + }, + "type": "String" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + }, + { + "field": "[concat('tags[', parameters('MonitorDisable'), ']')]", + "notEquals": "true" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/metricAlerts", + "existenceCondition": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].metricNamespace" + }, + { + "equals": "Available Memory Bytes", + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].metricName" + }, + { + "equals": "[concat(subscription().id, '/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Compute/virtualMachines/', field('fullName'))]", + "field": "Microsoft.Insights/metricalerts/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/metricAlerts/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/metricAlerts/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/metricAlerts/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/metricalerts/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/metricAlerts/autoMitigate" + }, + { + "equals": "Average", + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].timeAggregation" + }, + { + "equals": "LessThan", + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].operator" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-SingleResourceMultipleMetricCriteria.allOf[*].threshold" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "resourceId": { + "value": "[field('id')]" + }, + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "resourceName": { + "value": "[field('name')]" + } + }, + "template": { + "parameters": { + "resourceId": { + "metadata": { + "description": "Resource ID of the resource emitting the metric that will be used for the comparison", + "displayName": "resourceId" + }, + "type": "String" + }, + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "enabled": { + "type": "String" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "resourceName": { + "metadata": { + "description": "Name of the resource", + "displayName": "resourceName" + }, + "type": "String" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/metricAlerts", + "properties": { + "description": "Metric Alert for Virtual Machine Available Memory (MBytes)", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "Average", + "operator": "LessThan", + "name": "Average_AvailableMBytes", + "metricNamespace": "Microsoft.HybridCompute/machines", + "criterionType": "StaticThresholdCriterion", + "metricName": "Available Memory Bytes" + } + ], + "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" + }, + "scopes": [ + "[parameters('resourceId')]" + ] + }, + "apiVersion": "2018-03-01", + "location": "global", + "name": "[concat(parameters('resourceName'), '-AvailableMemoryAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_cpu_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_cpu_alert.jsonc new file mode 100644 index 0000000..97c9c01 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_cpu_alert.jsonc @@ -0,0 +1,507 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_CPU_Alert", + "properties": { + "displayName": "Deploy Hybrid VM CPU Alert", + "description": "Policy to audit/deploy VM CPU Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "85", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMHighCPUAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "1", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Processor\" and Name == \"UtilizationPercentage\"| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "autoResolve": { + "type": "String" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine CPU", + "displayName": "[concat(subscription().displayName, '-HybridVMHighCPUAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "1", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": [ + "*" + ] + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Processor\" and Name == \"UtilizationPercentage\"| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMHighCPUAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMCPUAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskreadlatency_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskreadlatency_alert.jsonc new file mode 100644 index 0000000..bebc553 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskreadlatency_alert.jsonc @@ -0,0 +1,565 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_dataDiskReadLatency_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Data Disk Read Latency Alert", + "description": "Policy to audit/deploy VM dataDiskReadLatency Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "30", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "computersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Computer to be monitored", + "displayName": "Computers to be included to be monitored" + }, + "type": "array" + }, + "disksToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMHighdataDiskReadLatencyAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "computersToInclude": { + "type": "array" + }, + "disksToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine dataDiskReadLatency", + "displayName": "[concat(subscription().displayName, '-HybridVMHighdataDiskReadLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": "[parameters('computersToInclude')]" + }, + { + "operator": "Include", + "name": "Disk", + "values": "[parameters('disksToInclude')]" + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMHighdataDiskReadLatencyAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMdataDiskReadLatencyAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskspace_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskspace_alert.jsonc new file mode 100644 index 0000000..ef65187 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskspace_alert.jsonc @@ -0,0 +1,548 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_dataDiskSpace_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Data Disk Space Alert", + "description": "Policy to audit/deploy VM data Disk Space Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "disksToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of disk to be monitored for disk both Windows and Linux", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMLowdataDiskSpaceAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "disksToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine dataDiskSpace", + "displayName": "[concat(subscription().displayName, '-HybridVMLowdataDiskSpaceAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": [ + "*" + ] + }, + { + "operator": "Include", + "name": "Disk", + "values": "[parameters('disksToInclude')]" + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMLowdataDiskSpaceAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMdataDiskSpaceAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskwritelatency_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskwritelatency_alert.jsonc new file mode 100644 index 0000000..310263e --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_datadiskwritelatency_alert.jsonc @@ -0,0 +1,566 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_dataDiskWriteLatency_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Data Disk Write Latency Alert", + "description": "Policy to audit/deploy VM dataDiskWriteLatency Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "30", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "computersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Computer to be monitored", + "displayName": "Computers to be included to be monitored" + }, + "type": "array" + }, + "disksToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMHighdataDiskWriteLatencyAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "computersToInclude": { + "type": "array" + }, + "disksToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine dataDiskWriteLatency", + "displayName": "[concat(subscription().displayName, '-HybridVMHighdataDiskWriteLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": "[parameters('computersToInclude')]" + }, + { + "operator": "Include", + "name": "Disk", + "values": "[parameters('disksToInclude')]" + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])|where Disk !in ('C:','/')| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines", + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMHighdataDiskWriteLatencyAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMdataDiskWriteLatencyAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_disconnected_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_disconnected_alert.jsonc new file mode 100644 index 0000000..05789f4 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_disconnected_alert.jsonc @@ -0,0 +1,542 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_Disconnected_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Disconnected Alert", + "description": "Policy to Deploy Hybrid VM Disconnected Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT12H", + "P1D" + ], + "defaultValue": "P1D", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT12H", + "P1D" + ], + "defaultValue": "P1D", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "eastus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "0", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Maximum", + "Minimum", + "Total", + "Count" + ], + "defaultValue": "Count", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "Project": "amba-monitoring" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "userAssignedManagedIdentityName": { + "defaultValue": "id-AMBA-ARG-Reader-001", + "metadata": { + "description": "The name of the user assigned managed identity to be created for monitoring purpose.", + "displayName": "Name of the user assigned managed identity to be created." + }, + "type": "string" + }, + "managementSubscriptionId": { + "defaultValue": "", + "metadata": { + "description": "The subscription ID of the management subscription where the user assigned managed identity will be created." + }, + "type": "string" + }, + "byoUserAssignedManagedIdentityResourceId": { + "defaultValue": "", + "metadata": { + "description": "The resource Id of the user assigned managed identity provided by the customer.", + "displayName": "Customer defined User Assigned managed Identity resource Id." + }, + "type": "string" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "microsoft.hybridcompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMDisconnected')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledQueryRules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledQueryRules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledQueryRules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledQueryRules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledQueryRules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledQueryRules/autoMitigate" + }, + { + "equals": 0, + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "[format('arg(\"\").resources | where type == \"microsoft.hybridcompute/machines\" | where tostring(properties.status) == \"Disconnected\" | extend lastContactedDate = todatetime(properties.lastStatusChange) | where lastContactedDate <= ago({0}d) | extend status = tostring(properties.status) | project id, Computer=name, status, lastContactedDate', parameters('threshold'))]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "BYOUserAssignedManagedIdentityResourceId": { + "value": "[parameters('BYOUserAssignedManagedIdentityResourceId')]" + }, + "userAssignedManagedIdentityName": { + "value": "[parameters('userAssignedManagedIdentityName')]" + }, + "managementSubscriptionId": { + "value": "[parameters('managementSubscriptionId')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "BYOUserAssignedManagedIdentityResourceId": { + "type": "string" + }, + "userAssignedManagedIdentityName": { + "type": "string" + }, + "managementSubscriptionId": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": { + "uamiResourceId": "[if(empty(parameters('BYOUserAssignedManagedIdentityResourceId')), resourceId(parameters('managementSubscriptionId'), parameters('alertResourceGroupName'), 'Microsoft.ManagedIdentity/userAssignedIdentities', parameters('userAssignedManagedIdentityName')),parameters('BYOUserAssignedManagedIdentityResourceId'))]" + }, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "BYOUserAssignedManagedIdentityResourceId": { + "value": "[parameters('BYOUserAssignedManagedIdentityResourceId')]" + }, + "userAssignedManagedIdentityName": { + "value": "[parameters('userAssignedManagedIdentityName')]" + }, + "managementSubscriptionId": { + "value": "[parameters('managementSubscriptionId')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + }, + "BYOUserAssignedManagedIdentityResourceId": { + "type": "string" + }, + "userAssignedManagedIdentityName": { + "type": "string" + }, + "managementSubscriptionId": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Hybrid VM in disconnected state. Not being connected, prevents extensions to be correctly managed from the portal and Azure policies to be correctly applied. Ensure that both server the specific service (Azure Hybrid Instance Metadata Service on Windows or azcmagent on Linux) are running.", + "displayName": "[concat(subscription().displayName, '-HybridVMDisconnected')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "BYOUserAssignedManagedIdentityResourceId": { + "value": "[parameters('BYOUserAssignedManagedIdentityResourceId')]" + }, + "userAssignedManagedIdentityName": { + "value": "[parameters('userAssignedManagedIdentityName')]" + }, + "managementSubscriptionId": { + "value": "[parameters('managementSubscriptionId')]" + } + }, + "autoMitigate": "false", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": 0, + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "resourceIdColumn": "id", + "dimensions": [], + "query": "[format('arg(\"\").resources | where type == \"microsoft.hybridcompute/machines\" | where tostring(properties.status) == \"Disconnected\" | extend lastContactedDate = todatetime(properties.lastStatusChange) | where lastContactedDate <= ago({0}d) | extend status = tostring(properties.status) | project id, Computer=name, status, lastContactedDate', parameters('threshold'))]" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMDisconnected')]", + "tags": { + "_deployed_by_amba": true + }, + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "[variables('uamiResourceId')]": {} + } + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "HybridVMDisconnectedAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourceGroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert.jsonc new file mode 100644 index 0000000..21b3c88 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert.jsonc @@ -0,0 +1,524 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_HeartBeat_Alert", + "properties": { + "displayName": "Deploy Hybrid VM HeartBeat Alert", + "description": "Policy to audit/deploy VM HeartBeat Alert for all VMs in the subscription", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMHeartBeatAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "Heartbeat| summarize TimeGenerated=max(TimeGenerated) by Computer, _ResourceId| extend Duration = datetime_diff('minute',now(),TimeGenerated)| summarize AggregatedValue = min(Duration) by Computer, bin(TimeGenerated,5m), _ResourceId", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine Heartbeat", + "displayName": "[concat(subscription().displayName, '-HybridVMHeartBeatAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": [ + "*" + ] + } + ], + "query": "Heartbeat| summarize TimeGenerated=max(TimeGenerated) by Computer, _ResourceId| extend Duration = datetime_diff('minute',now(),TimeGenerated)| summarize AggregatedValue = min(Duration) by Computer, bin(TimeGenerated,5m), _ResourceId" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMHeartBeatAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "HeartBeatAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert_rg.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert_rg.jsonc new file mode 100644 index 0000000..08a0c44 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_heartbeat_alert_rg.jsonc @@ -0,0 +1,400 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_HeartBeat_Alert_RG", + "properties": { + "displayName": "Deploy Hybrid VM HeartBeat Alert", + "description": "Policy to audit/deploy VM HeartBeat Alert for VMs in the resource group", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "monitorDisable": { + "defaultValue": "MonitorDisable", + "metadata": { + "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", + "displayName": "Effect" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + }, + { + "field": "[concat('tags[', parameters('MonitorDisable'), ']')]", + "notEquals": "true" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(resourceGroup().name, '-HybridVMHeartBeatAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[concat(subscription().id, '/resourceGroups/', resourceGroup().name)]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "1", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "1", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "Heartbeat| summarize TimeGenerated=max(TimeGenerated) by Computer, _ResourceId| extend Duration = datetime_diff('minute',now(),TimeGenerated)| summarize AggregatedValue = min(Duration) by Computer, bin(TimeGenerated,5m), _ResourceId", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "enabled": { + "type": "String" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "autoResolve": { + "type": "String" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine Heartbeat", + "displayName": "[concat(resourceGroup().name, '-HybridVMHeartBeatAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": 1, + "minFailingPeriodsToAlert": 1 + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": [ + "*" + ] + } + ], + "query": "Heartbeat| summarize TimeGenerated=max(TimeGenerated) by Computer, _ResourceId| extend Duration = datetime_diff('minute',now(),TimeGenerated)| summarize AggregatedValue = min(Duration) by Computer, bin(TimeGenerated,5m), _ResourceId" + } + ] + }, + "scopes": [ + "[resourceGroup().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[resourceGroup().location]", + "name": "[concat(resourceGroup().name, '-HybridVMHeartBeatAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_memory_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_memory_alert.jsonc new file mode 100644 index 0000000..45c1c5c --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_memory_alert.jsonc @@ -0,0 +1,524 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_Memory_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Memory Alert", + "description": "Policy to audit/deploy VM Memory Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMLowMemoryAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"|where Namespace == \"Memory\" and Name == \"AvailableMB\"| extend TotalMemory = toreal(todynamic(Tags)[\"vm.azm.ms/memorySizeMB\"]) | extend AvailableMemoryPercentage = (toreal(Val) / TotalMemory) * 100.0| summarize AggregatedValue = avg(AvailableMemoryPercentage) by bin(TimeGenerated, 15m), Computer, _ResourceId", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine Memory", + "displayName": "[concat(subscription().displayName, '-HybridVMLowMemoryAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": [ + "*" + ] + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"|where Namespace == \"Memory\" and Name == \"AvailableMB\"| extend TotalMemory = toreal(todynamic(Tags)[\"vm.azm.ms/memorySizeMB\"]) | extend AvailableMemoryPercentage = (toreal(Val) / TotalMemory) * 100.0| summarize AggregatedValue = avg(AvailableMemoryPercentage) by bin(TimeGenerated, 15m), Computer, _ResourceId" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMLowMemoryAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMMemoryAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkin_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkin_alert.jsonc new file mode 100644 index 0000000..6b27749 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkin_alert.jsonc @@ -0,0 +1,565 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_NetworkIn_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Network Read Alert", + "description": "Policy to audit/deploy VM Nework Read Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "10000000", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "computersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Computer to be monitored", + "displayName": "Computers to be included to be monitored" + }, + "type": "array" + }, + "networkInterfacesToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Network Interface to be monitored", + "displayName": "Network Interface to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMHighNetworkInAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "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", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "networkInterfacesToInclude": { + "value": "[parameters('networkInterfacesToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "computersToInclude": { + "type": "array" + }, + "networkInterfacesToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine NetworkIn", + "displayName": "[concat(subscription().displayName, '-HybridVMHighNetworkInAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "networkInterfacesToInclude": { + "value": "[parameters('networkInterfacesToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": "[parameters('computersToInclude')]" + }, + { + "operator": "Include", + "name": "NetworkInterface", + "values": "[parameters('networkInterfacesToInclude')]" + } + ], + "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" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMHighNetworkInAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMNetworkInAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkout_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkout_alert.jsonc new file mode 100644 index 0000000..ba80493 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_networkout_alert.jsonc @@ -0,0 +1,565 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_NetworkOut_Alert", + "properties": { + "displayName": "Deploy Hybrid VM Network Write Alert", + "description": "Policy to audit/deploy VM Network Out Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "10000000", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "computersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Computer to be monitored", + "displayName": "Computers to be included to be monitored" + }, + "type": "array" + }, + "networkInterfacesToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Network Interface to be monitored", + "displayName": "Network Interface to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMHighNetworkOutAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Network\" and Name == \"WriteBytesPerSecond\"| extend NetworkInterface=tostring(todynamic(Tags)[\"vm.azm.ms/networkDeviceId\"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "networkInterfacesToInclude": { + "value": "[parameters('networkInterfacesToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "computersToInclude": { + "type": "array" + }, + "networkInterfacesToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine NetworkOut", + "displayName": "[concat(subscription().displayName, '-HybridVMHighNetworkOutAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "networkInterfacesToInclude": { + "value": "[parameters('networkInterfacesToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": "[parameters('computersToInclude')]" + }, + { + "operator": "Include", + "name": "NetworkInterface", + "values": "[parameters('networkInterfacesToInclude')]" + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"Network\" and Name == \"WriteBytesPerSecond\"| extend NetworkInterface=tostring(todynamic(Tags)[\"vm.azm.ms/networkDeviceId\"])|summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, NetworkInterface" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMHighNetworkOutAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMNetworkOutAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskreadlatency_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskreadlatency_alert.jsonc new file mode 100644 index 0000000..43be4e2 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskreadlatency_alert.jsonc @@ -0,0 +1,566 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_OSDiskreadLatency_Alert", + "properties": { + "displayName": "Deploy Hybrid VM OS Disk Read Latency Alert", + "description": "Policy to audit/deploy VM OSDiskreadLatency Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "30", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "computersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Computer to be monitored", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + }, + "disksToInclude": { + "defaultValue": [ + "C:", + "/" + ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMLowOSDiskreadLatencyAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "computersToInclude": { + "type": "array" + }, + "disksToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine OSDiskreadLatency", + "displayName": "[concat(subscription().displayName, '-HybridVMLowOSDiskreadLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": "[parameters('computersToInclude')]" + }, + { + "operator": "Include", + "name": "Disk", + "values": "[parameters('disksToInclude')]" + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMLowOSDiskreadLatencyAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMOSDiskreadLatencyAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskspace_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskspace_alert.jsonc new file mode 100644 index 0000000..0e317a3 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskspace_alert.jsonc @@ -0,0 +1,566 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_OSDiskSpace_Alert", + "properties": { + "displayName": "Deploy Hybrid VM OS Disk Space Alert", + "description": "Policy to audit/deploy VM OSDiskSpace Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "computersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Computer to be monitored", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + }, + "disksToInclude": { + "defaultValue": [ + "C:", + "/" + ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMLowOSDiskSpaceAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "computersToInclude": { + "type": "array" + }, + "disksToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine OSDiskSpace", + "displayName": "[concat(subscription().displayName, '-HybridVMLowOSDiskSpaceAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": "[parameters('computersToInclude')]" + }, + { + "operator": "Include", + "name": "Disk", + "values": "[parameters('disksToInclude')]" + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMLowOSDiskSpaceAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMOSDiskSpaceAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskwritelatency_alert.jsonc b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskwritelatency_alert.jsonc new file mode 100644 index 0000000..16f0930 --- /dev/null +++ b/Definitions/policyDefinitions/Hybrid Compute/deploy_hybrid_vm_osdiskwritelatency_alert.jsonc @@ -0,0 +1,566 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", + "name": "Deploy_Hybrid_VM_OSDiskwriteLatency_Alert", + "properties": { + "displayName": "Deploy Hybrid VM OS Disk Write Latency Alert", + "description": "Policy to audit/deploy VM OSDiskwriteLatency Alert", + "mode": "All", + "metadata": { + "_deployed_by_amba": "True", + "alzCloudEnvironments": [ + "AzureCloud" + ], + "version": "1.0.0", + "category": "Hybrid Compute", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "evaluationFrequency": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, + "type": "String" + }, + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, + "type": "String" + }, + "windowSize": { + "allowedValues": [ + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "PT24H" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, + "type": "String" + }, + "alertResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" + }, + "type": "String" + }, + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, + "type": "String" + }, + "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, + "severity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, + "type": "String" + }, + "threshold": { + "defaultValue": "50", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Threshold" + }, + "type": "String" + }, + "timeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "displayName": "TimeAggregation" + }, + "type": "String" + }, + "alertResourceGroupTags": { + "defaultValue": { + "environment": "test" + }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, + "type": "Object" + }, + "failingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Number of failing periods before alert is fired", + "displayName": "Failing Periods" + }, + "type": "String" + }, + "effect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, + "type": "String" + }, + "operator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "displayName": "Operator" + }, + "type": "String" + }, + "autoResolveTime": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve time for the alert in ISO 8601 format", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "evaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "The number of aggregated lookback points.", + "displayName": "Evaluation Periods" + }, + "type": "String" + }, + "autoResolve": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Auto Resolve" + }, + "type": "String" + }, + "computersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Array of Computer to be monitored", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + }, + "disksToInclude": { + "defaultValue": [ + "C:", + "/" + ], + "metadata": { + "description": "Array of disk to be monitored for disk both windows and linux", + "displayName": "Disks to be included to be monitored" + }, + "type": "array" + } + }, + "policyRule": { + "if": { + "allOf": [ + { + "equals": "Microsoft.HybridCompute/machines", + "field": "type" + } + ] + }, + "then": { + "effect": "[parameters('effect')]", + "details": { + "type": "Microsoft.Insights/scheduledQueryRules", + "existenceCondition": { + "allOf": [ + { + "equals": "[concat(subscription().displayName, '-HybridVMLowOSDiskwriteLatencyAlert')]", + "field": "Microsoft.Insights/scheduledQueryRules/displayName" + }, + { + "equals": "[subscription().id]", + "field": "Microsoft.Insights/scheduledqueryrules/scopes[*]" + }, + { + "equals": "[parameters('enabled')]", + "field": "Microsoft.Insights/scheduledqueryrules/enabled" + }, + { + "equals": "[parameters('evaluationFrequency')]", + "field": "Microsoft.Insights/scheduledqueryrules/evaluationFrequency" + }, + { + "equals": "[parameters('windowSize')]", + "field": "Microsoft.Insights/scheduledqueryrules/windowSize" + }, + { + "equals": "[parameters('severity')]", + "field": "Microsoft.Insights/scheduledqueryrules/severity" + }, + { + "equals": "[parameters('autoMitigate')]", + "field": "Microsoft.Insights/scheduledqueryrules/autoMitigate" + }, + { + "equals": "[parameters('threshold')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].threshold" + }, + { + "equals": "[parameters('operator')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].operator" + }, + { + "equals": "[parameters('timeAggregation')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].timeAggregation" + }, + { + "equals": "[parameters('evaluationPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.numberOfEvaluationPeriods" + }, + { + "equals": "[parameters('failingPeriods')]", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].failingPeriods.minFailingPeriodsToAlert" + }, + { + "equals": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk", + "field": "Microsoft.Insights/scheduledQueryRules/criteria.allOf[*].query" + } + ] + }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], + "deployment": { + "properties": { + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "timeAggregation": { + "value": "[parameters('timeAggregation')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('alertResourceGroupTags')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "operator": { + "value": "[parameters('operator')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "template": { + "parameters": { + "evaluationFrequency": { + "type": "String" + }, + "autoMitigate": { + "type": "String" + }, + "windowSize": { + "type": "String" + }, + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "String" + }, + "alertResourceGroupName": { + "type": "string" + }, + "severity": { + "type": "String" + }, + "threshold": { + "type": "String" + }, + "timeAggregation": { + "type": "String" + }, + "alertResourceGroupTags": { + "type": "object" + }, + "failingPeriods": { + "type": "String" + }, + "operator": { + "type": "String" + }, + "autoResolveTime": { + "type": "String" + }, + "evaluationPeriods": { + "type": "String" + }, + "autoResolve": { + "type": "String" + }, + "computersToInclude": { + "type": "array" + }, + "disksToInclude": { + "type": "array" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Resources/resourceGroups", + "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", + "tags": "[parameters('alertResourceGroupTags')]" + }, + { + "resourceGroup": "[parameters('alertResourceGroupName')]", + "type": "Microsoft.Resources/deployments", + "properties": { + "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + } + }, + "template": { + "parameters": { + "alertResourceGroupLocation": { + "type": "string" + }, + "enabled": { + "type": "string" + }, + "alertResourceGroupName": { + "type": "string" + } + }, + "contentVersion": "1.0.0.0", + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/scheduledQueryRules", + "properties": { + "description": "Log Alert for Virtual Machine OSDiskwriteLatency", + "displayName": "[concat(subscription().displayName, '-HybridVMLowOSDiskwriteLatencyAlert')]", + "evaluationFrequency": "[parameters('evaluationFrequency')]", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('evaluationFrequency')]" + }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, + "windowSize": { + "value": "[parameters('windowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('enabled')]" + }, + "alertResourceGroupName": { + "value": "[parameters('alertResourceGroupName')]" + }, + "severity": { + "value": "[parameters('severity')]" + }, + "threshold": { + "value": "[parameters('threshold')]" + }, + "failingPeriods": { + "value": "[parameters('failingPeriods')]" + }, + "autoResolveTime": { + "value": "[parameters('autoResolveTime')]" + }, + "evaluationPeriods": { + "value": "[parameters('evaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('autoResolve')]" + }, + "computersToInclude": { + "value": "[parameters('computersToInclude')]" + }, + "disksToInclude": { + "value": "[parameters('disksToInclude')]" + } + }, + "autoMitigate": "[parameters('autoMitigate')]", + "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", + "severity": "[parameters('severity')]", + "criteria": { + "allOf": [ + { + "threshold": "[parameters('threshold')]", + "timeAggregation": "[parameters('timeAggregation')]", + "failingPeriods": { + "numberOfEvaluationPeriods": "[parameters('evaluationPeriods')]", + "minFailingPeriodsToAlert": "[parameters('failingPeriods')]" + }, + "operator": "[parameters('operator')]", + "metricMeasureColumn": "AggregatedValue", + "resourceIdColumn": "_ResourceId", + "dimensions": [ + { + "operator": "Include", + "name": "Computer", + "values": "[parameters('computersToInclude')]" + }, + { + "operator": "Include", + "name": "Disk", + "values": "[parameters('disksToInclude')]" + } + ], + "query": "InsightsMetrics| where Origin == \"vm.azm.ms\"| where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\"| extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"])| summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk" + } + ] + }, + "scopes": [ + "[subscription().Id]" + ], + "ruleResolveConfiguration": { + "timeToResolve": "[parameters('autoResolveTime')]", + "autoResolved": "[parameters('autoResolve')]" + }, + "targetResourceTypes": [ + "Microsoft.HybridCompute/machines" + ] + }, + "apiVersion": "2022-08-01-preview", + "location": "[parameters('alertResourceGroupLocation')]", + "name": "[concat(subscription().displayName, '-HybridVMLowOSDiskwriteLatencyAlert')]", + "tags": { + "_deployed_by_amba": true + } + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "Incremental" + }, + "apiVersion": "2019-10-01", + "name": "VMOSDiskwriteLatencyAlert", + "dependsOn": [ + "[concat('Microsoft.Resources/resourceGroups/', parameters('alertResourceGroupName'))]" + ] + } + ], + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" + }, + "mode": "incremental" + }, + "location": "australiaeast" + }, + "resourceGroupName": "[parameters('alertResourceGroupName')]", + "deploymentScope": "subscription", + "existenceScope": "resourcegroup" + } + } + } + } +} \ No newline at end of file diff --git a/Definitions/policyDefinitions/Key Vault/deploy_activitylog_keyvault_delete.jsonc b/Definitions/policyDefinitions/Key Vault/deploy_activitylog_keyvault_delete.jsonc index 64b724c..0bfd00d 100644 --- a/Definitions/policyDefinitions/Key Vault/deploy_activitylog_keyvault_delete.jsonc +++ b/Definitions/policyDefinitions/Key Vault/deploy_activitylog_keyvault_delete.jsonc @@ -7,59 +7,59 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.1", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.1", "category": "Key Vault", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "AlzMonitoring-rg", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { - "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, "defaultValue": { "_deployed_by_amba": true, "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -80,9 +80,6 @@ "effect": "deployIfNotExists", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -125,32 +122,35 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "name": "ActivityKeyVaultDelete", "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -158,6 +158,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -188,6 +189,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -229,7 +231,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -241,7 +242,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_availability_alert.jsonc b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_availability_alert.jsonc index a8f997e..3284dd8 100644 --- a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_availability_alert.jsonc +++ b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_availability_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for KeyVault Availability", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "Availability", "operator": "LessThan", + "name": "Availability", "metricNamespace": "microsoft.keyvault/vaults", "criterionType": "StaticThresholdCriterion", "metricName": "Availability" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-Availability')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-Availability')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_capacity_alert.jsonc b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_capacity_alert.jsonc index 14ecfff..5f8caf7 100644 --- a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_capacity_alert.jsonc +++ b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_capacity_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Key Vault", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "75", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "75", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for KeyVault Capacity", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "SaturationShoebox", "operator": "GreaterThan", + "name": "SaturationShoebox", "metricNamespace": "microsoft.keyvault/vaults", "criterionType": "StaticThresholdCriterion", "metricName": "SaturationShoebox" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_latency_alert.jsonc b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_latency_alert.jsonc index 97dda64..4ae547d 100644 --- a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_latency_alert.jsonc +++ b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_latency_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1000", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1000", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for KeyVault Latency", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "ServiceApiLatency", "operator": "GreaterThan", + "name": "ServiceApiLatency", "metricNamespace": "microsoft.keyvault/vaults", "criterionType": "StaticThresholdCriterion", "metricName": "ServiceApiLatency" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-LatencyAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-LatencyAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_requests_alert.jsonc b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_requests_alert.jsonc index f93dbb2..e83983f 100644 --- a/Definitions/policyDefinitions/Key Vault/deploy_keyvault_requests_alert.jsonc +++ b/Definitions/policyDefinitions/Key Vault/deploy_keyvault_requests_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Key Vault", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { - "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", - "displayName": "Effect" + "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", + "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -172,11 +172,11 @@ "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods" } ] @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -249,6 +248,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for KeyVault Requests", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -266,7 +266,6 @@ "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -275,12 +274,12 @@ "allOf": [ { "timeAggregation": "Average", - "name": "ServiceApiResult", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, "operator": "GreaterThan", + "name": "ServiceApiResult", "metricNamespace": "microsoft.keyvault/vaults", "criterionType": "DynamicThresholdCriterion", "metricName": "ServiceApiResult", @@ -294,15 +293,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-RequestsAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-RequestsAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_delete.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_delete.jsonc index 6afb976..5420f85 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_delete.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_delete.jsonc @@ -7,58 +7,58 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.3", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.3", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -79,9 +79,6 @@ "effect": "deployIfNotExists", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -124,32 +121,35 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "name": "ActivityLAWorkspaceDelete", "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -157,6 +157,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -187,6 +188,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -228,7 +230,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -240,7 +241,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_keyregen.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_keyregen.jsonc index a6cce57..28f7afc 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_keyregen.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_laworkspace_keyregen.jsonc @@ -7,59 +7,59 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.2", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.2", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { - "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, "defaultValue": { "_deployed_by_amba": true, "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -80,9 +80,6 @@ "effect": "deployIfNotExists", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -125,32 +122,35 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "name": "ActivityLAWorkspaceRegenKey", "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -158,6 +158,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -188,6 +189,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -229,7 +231,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -241,7 +242,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_resourcehealth_unhealthy_alert.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_resourcehealth_unhealthy_alert.jsonc index 7f3ea4c..e2bb519 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_resourcehealth_unhealthy_alert.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_resourcehealth_unhealthy_alert.jsonc @@ -7,78 +7,78 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" }, "byoActionGroup": { + "defaultValue": "", "metadata": { "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", "displayName": "Customer defined Action Group Resource ID" }, - "defaultValue": "", "type": "String" } }, @@ -99,9 +99,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -170,18 +167,21 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, @@ -191,13 +191,13 @@ }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -208,6 +208,19 @@ } }, "contentVersion": "1.0.0.0", + "variables": { + "varBYOActionGroups": "[split(parameters('BYOActionGroup'), ',')]", + "copy": [ + { + "name": "varActionGroupIds", + "mode": "serial", + "count": "[length(variables('varBYOActionGroups'))]", + "input": { + "actionGroupId": "[trim(variables('varBYOActionGroups')[copyIndex('varActionGroupIds')])]" + } + } + ] + }, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -244,6 +257,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -365,7 +379,6 @@ "condition": "[not(empty(parameters('BYOActionGroup')))]" } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -377,19 +390,6 @@ ] } ], - "variables": { - "varBYOActionGroups": "[split(parameters('BYOActionGroup'), ',')]", - "copy": [ - { - "name": "varActionGroupIds", - "mode": "serial", - "count": "[length(variables('varBYOActionGroups'))]", - "input": { - "actionGroupId": "[trim(variables('varBYOActionGroups')[copyIndex('varActionGroupIds')])]" - } - } - ] - }, "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_healthadvisory.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_healthadvisory.jsonc index 7d4db78..f68bd86 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_healthadvisory.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_healthadvisory.jsonc @@ -15,78 +15,78 @@ "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "alertResourceGroupLocation": { "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" + "description": "Alert state for the alert", + "displayName": "Alert State" }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", "type": "String" }, - "effect": { + "alertResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" }, + "type": "Object" + }, + "effect": { "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", - "type": "String" - }, - "alertResourceGroupTags": { "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, - "defaultValue": { - "_deployed_by_amba": true + "description": "Effect of the policy", + "displayName": "Effect" }, - "type": "Object" + "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alzMonitorActionGroupEmail": { + "defaultValue": "", "metadata": { "description": "Email addresses to send alerts to", "displayName": "Action Group Email Addresses" }, - "defaultValue": "", "type": "String" }, "byoActionGroup": { + "defaultValue": "", "metadata": { "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", "displayName": "Customer defined Action Group Resource ID" }, - "defaultValue": "", "type": "String" } }, @@ -193,12 +193,12 @@ "deployment": { "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, @@ -212,13 +212,12 @@ "value": "[parameters('BYOActionGroup')]" } }, - "mode": "incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -252,8 +251,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('alertResourceGroupName')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, { @@ -274,7 +273,6 @@ "value": "[parameters('BYOActionGroup')]" } }, - "mode": "Incremental", "template": { "parameters": { "enabled": { @@ -327,8 +325,8 @@ } }, "apiVersion": "2020-10-01", - "name": "ServiceHealthAdvisoryEvent", "location": "Global", + "name": "ServiceHealthAdvisoryEvent", "tags": { "_deployed_by_amba": true }, @@ -364,8 +362,8 @@ } }, "apiVersion": "2020-10-01", - "name": "ServiceHealthAdvisoryEvent", "location": "Global", + "name": "ServiceHealthAdvisoryEvent", "tags": { "_deployed_by_amba": true }, @@ -373,7 +371,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "ServiceHealthHealth", @@ -383,7 +382,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_incident.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_incident.jsonc index 0eb8a8e..7c1cfd2 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_incident.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_incident.jsonc @@ -7,86 +7,86 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.2.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", - "type": "String" - }, - "byoActionGroup": { - "metadata": { - "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", - "displayName": "Customer defined Action Group Resource ID" - }, - "defaultValue": "", "type": "String" }, "alzMonitorActionGroupEmail": { + "defaultValue": "", "metadata": { "description": "Email addresses to send alerts to", "displayName": "Action Group Email Addresses" }, + "type": "String" + }, + "byoActionGroup": { "defaultValue": "", + "metadata": { + "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", + "displayName": "Customer defined Action Group Resource ID" + }, "type": "String" } }, @@ -107,9 +107,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -190,18 +187,21 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, @@ -214,13 +214,13 @@ }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -234,6 +234,19 @@ } }, "contentVersion": "1.0.0.0", + "variables": { + "varBYOActionGroups": "[split(parameters('BYOActionGroup'), ',')]", + "copy": [ + { + "name": "varActionGroupIds", + "mode": "serial", + "count": "[length(variables('varBYOActionGroups'))]", + "input": { + "actionGroupId": "[trim(variables('varBYOActionGroups')[copyIndex('varActionGroupIds')])]" + } + } + ] + }, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -276,6 +289,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -356,7 +370,6 @@ "condition": "[not(empty(parameters('BYOActionGroup')))]" } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -368,19 +381,6 @@ ] } ], - "variables": { - "varBYOActionGroups": "[split(parameters('BYOActionGroup'), ',')]", - "copy": [ - { - "name": "varActionGroupIds", - "mode": "serial", - "count": "[length(variables('varBYOActionGroups'))]", - "input": { - "actionGroupId": "[trim(variables('varBYOActionGroups')[copyIndex('varActionGroupIds')])]" - } - } - ] - }, "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_maintenance.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_maintenance.jsonc index 4eb0997..2987651 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_maintenance.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_maintenance.jsonc @@ -7,86 +7,86 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.2.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", - "type": "String" - }, - "byoActionGroup": { - "metadata": { - "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", - "displayName": "Customer defined Action Group Resource ID" - }, - "defaultValue": "", "type": "String" }, "alzMonitorActionGroupEmail": { + "defaultValue": "", "metadata": { "description": "Email addresses to send alerts to", "displayName": "Action Group Email Addresses" }, + "type": "String" + }, + "byoActionGroup": { "defaultValue": "", + "metadata": { + "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", + "displayName": "Customer defined Action Group Resource ID" + }, "type": "String" } }, @@ -107,9 +107,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -190,18 +187,21 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" }, @@ -214,13 +214,13 @@ }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -234,6 +234,19 @@ } }, "contentVersion": "1.0.0.0", + "variables": { + "varBYOActionGroups": "[split(parameters('BYOActionGroup'), ',')]", + "copy": [ + { + "name": "varActionGroupIds", + "mode": "serial", + "count": "[length(variables('varBYOActionGroups'))]", + "input": { + "actionGroupId": "[trim(variables('varBYOActionGroups')[copyIndex('varActionGroupIds')])]" + } + } + ] + }, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -276,6 +289,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -356,7 +370,6 @@ "condition": "[not(empty(parameters('BYOActionGroup')))]" } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -368,19 +381,6 @@ ] } ], - "variables": { - "varBYOActionGroups": "[split(parameters('BYOActionGroup'), ',')]", - "copy": [ - { - "name": "varActionGroupIds", - "mode": "serial", - "count": "[length(variables('varBYOActionGroups'))]", - "input": { - "actionGroupId": "[trim(variables('varBYOActionGroups')[copyIndex('varActionGroupIds')])]" - } - } - ] - }, "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_securityadvisory.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_securityadvisory.jsonc index 252307f..cac1669 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_securityadvisory.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_servicehealth_securityadvisory.jsonc @@ -15,78 +15,78 @@ "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "alertResourceGroupLocation": { "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" + "description": "Alert state for the alert", + "displayName": "Alert State" }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", "type": "String" }, - "effect": { + "alertResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" }, + "type": "Object" + }, + "effect": { "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", - "type": "String" - }, - "alertResourceGroupTags": { "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, - "defaultValue": { - "_deployed_by_amba": true + "description": "Effect of the policy", + "displayName": "Effect" }, - "type": "Object" + "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alzMonitorActionGroupEmail": { + "defaultValue": "", "metadata": { "description": "Email addresses to send alerts to", "displayName": "Action Group Email Addresses" }, - "defaultValue": "", "type": "String" }, "byoActionGroup": { + "defaultValue": "", "metadata": { "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", "displayName": "Customer defined Action Group Resource ID" }, - "defaultValue": "", "type": "String" } }, @@ -193,12 +193,12 @@ "deployment": { "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, @@ -212,13 +212,12 @@ "value": "[parameters('BYOActionGroup')]" } }, - "mode": "incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -252,8 +251,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('alertResourceGroupName')]", "location": "[parameters('alertResourceGroupLocation')]", + "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, { @@ -274,7 +273,6 @@ "value": "[parameters('BYOActionGroup')]" } }, - "mode": "Incremental", "template": { "parameters": { "enabled": { @@ -327,8 +325,8 @@ } }, "apiVersion": "2020-10-01", - "name": "ServiceHealthSecurityIncident", "location": "global", + "name": "ServiceHealthSecurityIncident", "tags": { "_deployed_by_amba": true }, @@ -364,8 +362,8 @@ } }, "apiVersion": "2020-10-01", - "name": "ServiceHealthSecurityIncident", "location": "global", + "name": "ServiceHealthSecurityIncident", "tags": { "_deployed_by_amba": true }, @@ -373,7 +371,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "ServiceSecurityIncident", @@ -383,7 +382,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_storageaccount_delete.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_storageaccount_delete.jsonc index e8ce969..34036fc 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_activitylog_storageaccount_delete.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_activitylog_storageaccount_delete.jsonc @@ -7,70 +7,70 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -91,9 +91,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -136,32 +133,35 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "name": "Activity Log Storage Account Delete", "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -169,6 +169,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -199,6 +200,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -240,7 +242,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -252,7 +253,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Monitoring/deploy_alertprocessing_rule.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_alertprocessing_rule.jsonc index ae35e48..dcbe64f 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_alertprocessing_rule.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_alertprocessing_rule.jsonc @@ -16,117 +16,117 @@ }, "parameters": { "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alzMonitorActionGroupEmail": { + "defaultValue": "", "metadata": { "description": "Email addresses to send alerts to", "displayName": "Action Group Email Addresses" }, - "defaultValue": "", - "type": "String" - }, - "byoActionGroup": { - "metadata": { - "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", - "displayName": "Customer defined Action Group Resource ID" - }, - "defaultValue": "", "type": "String" }, "alzMonitorResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", "type": "String" }, - "alzMonitorResourceGroupName": { + "byoActionGroup": { + "defaultValue": "", "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", + "displayName": "Customer defined Action Group Resource ID" }, - "defaultValue": "rg-amba-monitoring-001", "type": "String" }, "alzMonitorResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" }, + "alzMonitorResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, "byoAlertProcessingRule": { + "defaultValue": "", "metadata": { "description": "The Resource ID of an existing Alert Processing Rule already deployed by the customer in his environment", "displayName": "Customer defined Alert Processing Rule Resource ID" }, - "defaultValue": "", "type": "String" }, "alzLogicappCallbackUrl": { + "defaultValue": "", "metadata": { "description": "Callback URL that triggers the Logic App", "displayName": "Logic App Callback URL" }, - "defaultValue": "", "type": "String" }, - "alzLogicappResourceId": { + "alzFunctionTriggerUrl": { + "defaultValue": "", "metadata": { - "description": "Logic App Resource Id for Action Group to send alerts to", - "displayName": "Logic App Resource Id" + "description": "URL that triggers the Function", + "displayName": "Function Trigger URL" }, - "defaultValue": "", "type": "String" }, "alzEventHubResourceId": { + "defaultValue": "", "metadata": { "description": "Event Hub resource id for action group to send alerts to", "displayName": "Event Hub resource id" }, - "defaultValue": "", "type": "String" }, - "alzFunctionTriggerUrl": { + "alzLogicappResourceId": { + "defaultValue": "", "metadata": { - "description": "URL that triggers the Function", - "displayName": "Function Trigger URL" + "description": "Logic App Resource Id for Action Group to send alerts to", + "displayName": "Logic App Resource Id" }, - "defaultValue": "", "type": "String" }, "alzFunctionResourceId": { + "defaultValue": "", "metadata": { "description": "Function Resource Id for Action Group to send alerts to", "displayName": "Function Resource Id" }, - "defaultValue": "", "type": "String" }, "alzWebhookServiceUri": { + "defaultValue": "", "metadata": { "description": "Indicates the service uri of the webhook to send alerts to", "displayName": "Webhook Service Uri" }, - "defaultValue": "", "type": "String" }, "alzArmRoleId": { + "defaultValue": "", "metadata": { "description": "Arm Built-in Role Id for action group to send alerts to a subscription level, will only send to individual members of role", "displayName": "Arm Role Id" }, - "defaultValue": "", "type": "String" } }, @@ -174,15 +174,15 @@ "ALZMonitorResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, + "ALZMonitorResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, "BYOAlertProcessingRule": { "value": "[parameters('BYOAlertProcessingRule')]" }, "ALZLogicappCallbackUrl": { "value": "[parameters('ALZLogicappCallbackUrl')]" }, - "ALZLogicappResourceId": { - "value": "[parameters('ALZLogicappResourceId')]" - }, "ALZEventHubResourceId": { "value": "[parameters('ALZEventHubResourceId')]" }, @@ -192,20 +192,19 @@ "ALZFunctionTriggerUrl": { "value": "[parameters('ALZFunctionTriggerUrl')]" }, + "ALZLogicappResourceId": { + "value": "[parameters('ALZLogicappResourceId')]" + }, "ALZWebhookServiceUri": { "value": "[parameters('ALZWebhookServiceUri')]" }, - "ALZMonitorResourceGroupLocation": { - "value": "[parameters('ALZMonitorResourceGroupLocation')]" + "ALZMonitorResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" }, "ALZArmRoleId": { "value": "[parameters('ALZArmRoleId')]" - }, - "ALZMonitorResourceGroupTags": { - "value": "[parameters('ALZMonitorResourceGroupTags')]" } }, - "mode": "incremental", "template": { "parameters": { "ALZMonitorActionGroupEmail": { @@ -217,15 +216,15 @@ "ALZMonitorResourceGroupName": { "type": "string" }, + "ALZMonitorResourceGroupLocation": { + "type": "string" + }, "BYOAlertProcessingRule": { "type": "String" }, "ALZLogicappCallbackUrl": { "type": "String" }, - "ALZLogicappResourceId": { - "type": "string" - }, "ALZEventHubResourceId": { "type": "string" }, @@ -235,17 +234,17 @@ "ALZFunctionTriggerUrl": { "type": "String" }, - "ALZWebhookServiceUri": { - "type": "string" - }, - "ALZMonitorResourceGroupLocation": { + "ALZLogicappResourceId": { "type": "string" }, - "ALZArmRoleId": { + "ALZWebhookServiceUri": { "type": "string" }, "ALZMonitorResourceGroupTags": { "type": "object" + }, + "ALZArmRoleId": { + "type": "string" } }, "contentVersion": "1.0.0.0", @@ -261,16 +260,6 @@ } ], "varALZEventHubResourceId": "[array(split(parameters('ALZEventHubResourceId'),','))]", - "varALZWebhookServiceUri": "[array(split(parameters('ALZWebhookServiceUri'),','))]", - "varLogicAppReceivers": [ - { - "resourceId": "[if(empty(parameters('ALZLogicappResourceId')), null(), trim(parameters('ALZLogicappResourceId')))]", - "name": "AlzLA-0", - "useCommonSchema": true, - "callbackUrl": "[if(empty(parameters('ALZLogicappCallbackUrl')), null(), trim(parameters('ALZLogicappCallbackUrl')))]" - } - ], - "varALZArmRoleId": "[array(split(parameters('ALZArmRoleId'),','))]", "copy": [ { "name": "varEmailReceivers", @@ -299,8 +288,8 @@ "input": { "subscriptionId": "[if(empty(parameters('ALZEventHubResourceId')), null(), split(trim(variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]),'/')[2])]", "name": "[concat('AlzEH-', indexOf(variables('varALZEventHubResourceId'), variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]))]", - "tenantId": "[subscription().tenantId]", "useCommonAlertSchema": true, + "tenantId": "[subscription().tenantId]", "eventHubNameSpace": "[if(empty(parameters('ALZEventHubResourceId')), null(), split(trim(variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]),'/')[8])]", "eventHubName": "[if(empty(parameters('ALZEventHubResourceId')), null(), split(trim(variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]),'/')[10])]" } @@ -311,8 +300,8 @@ "count": "[length(variables('varALZWebhookServiceUri'))]", "input": { "name": "[concat('AlzWh-', indexOf(variables('varALZWebhookServiceUri'), variables('varALZWebhookServiceUri')[copyIndex('varWebhookReceivers')]))]", - "tenantId": "null()", "useCommonAlertSchema": true, + "tenantId": "null()", "identifierUri": "null()", "useAadAuth": "false", "serviceUri": "[trim(variables('varALZWebhookServiceUri')[copyIndex('varWebhookReceivers')])]", @@ -326,6 +315,16 @@ "input": "[trim(variables('varBYOAGs')[copyIndex('varAGIds')])]" } ], + "varALZWebhookServiceUri": "[array(split(parameters('ALZWebhookServiceUri'),','))]", + "varLogicAppReceivers": [ + { + "resourceId": "[if(empty(parameters('ALZLogicappResourceId')), null(), trim(parameters('ALZLogicappResourceId')))]", + "name": "AlzLA-0", + "useCommonSchema": true, + "callbackUrl": "[if(empty(parameters('ALZLogicappCallbackUrl')), null(), trim(parameters('ALZLogicappCallbackUrl')))]" + } + ], + "varALZArmRoleId": "[array(split(parameters('ALZArmRoleId'),','))]", "varBYOAlertProcessingRule": "[if(empty(parameters('BYOAlertProcessingRule')), null(), trim(parameters('BYOAlertProcessingRule')))]", "varBYOAGs": "[split(parameters('BYOActionGroup'), ',')]" }, @@ -333,8 +332,8 @@ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('ALZMonitorResourceGroupName')]", "location": "[parameters('ALZMonitorResourceGroupLocation')]", + "name": "[parameters('ALZMonitorResourceGroupName')]", "tags": "[parameters('ALZMonitorResourceGroupTags')]" }, { @@ -357,9 +356,6 @@ "ALZLogicappCallbackUrl": { "value": "[parameters('ALZLogicappCallbackUrl')]" }, - "ALZLogicappResourceId": { - "value": "[parameters('ALZLogicappResourceId')]" - }, "ALZEventHubResourceId": { "value": "[parameters('ALZEventHubResourceId')]" }, @@ -369,6 +365,9 @@ "ALZFunctionTriggerUrl": { "value": "[parameters('ALZFunctionTriggerUrl')]" }, + "ALZLogicappResourceId": { + "value": "[parameters('ALZLogicappResourceId')]" + }, "ALZWebhookServiceUri": { "value": "[parameters('ALZWebhookServiceUri')]" }, @@ -376,7 +375,6 @@ "value": "[parameters('ALZArmRoleId')]" } }, - "mode": "Incremental", "template": { "parameters": { "ALZMonitorActionGroupEmail": { @@ -394,9 +392,6 @@ "ALZLogicappCallbackUrl": { "type": "string" }, - "ALZLogicappResourceId": { - "type": "string" - }, "ALZEventHubResourceId": { "type": "string" }, @@ -406,6 +401,9 @@ "ALZFunctionTriggerUrl": { "type": "string" }, + "ALZLogicappResourceId": { + "type": "string" + }, "ALZWebhookServiceUri": { "type": "string" }, @@ -421,16 +419,16 @@ "properties": { "enabled": true, "azureFunctionReceivers": "[if(empty(parameters('ALZFunctionResourceId')), null(), variables('varAzureFunctionReceivers'))]", - "eventHubReceivers": "[if(empty(parameters('ALZEventHubResourceId')), null(), variables('varEventHubReceivers'))]", "logicAppReceivers": "[if(empty(parameters('ALZLogicappResourceId')), null(), variables('varLogicAppReceivers'))]", + "eventHubReceivers": "[if(empty(parameters('ALZEventHubResourceId')), null(), variables('varEventHubReceivers'))]", "webhookReceivers": "[if(empty(parameters('ALZWebhookServiceUri')), null(), variables('varWebhookReceivers'))]", "armRoleReceivers": "[if(empty(parameters('ALZArmRoleId')), null(), variables('varArmRoleReceivers'))]", "groupShortName": "ActGrp", "emailReceivers": "[if(empty(parameters('ALZMonitorActionGroupEmail')), null(), variables('varEmailReceivers'))]" }, "apiVersion": "2023-01-01", - "name": "[concat('ag-AMBA-', subscription().displayName, '-001')]", "location": "Global", + "name": "[concat('ag-AMBA-', subscription().displayName, '-001')]", "tags": { "_deployed_by_amba": true }, @@ -446,25 +444,26 @@ ], "actions": [ { - "actiongroupIds": "[if(empty(parameters('BYOActionGroup')), array(concat(subscription().Id, '/resourceGroups/', parameters('ALZMonitorResourceGroupName'), '/providers/microsoft.insights/actionGroups/', 'ag-AMBA-', subscription().displayName, '-001')), variables('varAGIds'))]", - "actionType": "AddActionGroups" + "actionType": "AddActionGroups", + "actiongroupIds": "[if(empty(parameters('BYOActionGroup')), array(concat(subscription().Id, '/resourceGroups/', parameters('ALZMonitorResourceGroupName'), '/providers/microsoft.insights/actionGroups/', 'ag-AMBA-', subscription().displayName, '-001')), variables('varAGIds'))]" } ] }, "apiVersion": "2021-08-08", - "name": "[concat('apr-AMBA-',subscription().displayName, '-001')]", "location": "Global", + "name": "[concat('apr-AMBA-',subscription().displayName, '-001')]", "tags": { "_deployed_by_amba": true }, - "condition": "[empty(parameters('BYOAlertProcessingRule'))]", "dependsOn": [ "[concat('ag-AMBA-', subscription().displayName, '-001')]" - ] + ], + "condition": "[empty(parameters('BYOAlertProcessingRule'))]" } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "ActionGroupDeployment", @@ -474,7 +473,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Monitoring/deploy_servicehealth_actiongroups.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_servicehealth_actiongroups.jsonc index f3de40c..b8e6f55 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_servicehealth_actiongroups.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_servicehealth_actiongroups.jsonc @@ -16,117 +16,117 @@ }, "parameters": { "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring Subscription level alerts. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alzMonitorActionGroupEmail": { + "defaultValue": "", "metadata": { "description": "Email addresses to send alerts to", "displayName": "Action Group Email Addresses" }, - "defaultValue": "", - "type": "String" - }, - "byoActionGroup": { - "metadata": { - "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", - "displayName": "Customer defined Action Group Resource ID" - }, - "defaultValue": "", "type": "String" }, "alzMonitorResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", "type": "String" }, - "alzMonitorResourceGroupName": { + "byoActionGroup": { + "defaultValue": "", "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" + "description": "The Resource ID of an existing Action Group already deployed by the customer in his environment", + "displayName": "Customer defined Action Group Resource ID" }, - "defaultValue": "rg-amba-monitoring-001", "type": "String" }, "alzMonitorResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" }, + "alzMonitorResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" + }, "byoAlertProcessingRule": { + "defaultValue": "", "metadata": { "description": "The Resource ID of an existing Alert Processing Rule already deployed by the customer in his environment", "displayName": "Customer defined Alert Processing Rule Resource ID" }, - "defaultValue": "", "type": "String" }, "alzLogicappCallbackUrl": { + "defaultValue": "", "metadata": { "description": "Callback URL that triggers the Logic App", "displayName": "Logic App Callback URL" }, - "defaultValue": "", "type": "String" }, - "alzLogicappResourceId": { + "alzFunctionTriggerUrl": { + "defaultValue": "", "metadata": { - "description": "Logic App Resource Id for Action Group to send alerts to", - "displayName": "Logic App Resource Id" + "description": "URL that triggers the Function", + "displayName": "Function Trigger URL" }, - "defaultValue": "", "type": "String" }, "alzEventHubResourceId": { + "defaultValue": "", "metadata": { "description": "Event Hub resource id for action group to send alerts to", "displayName": "Event Hub resource id" }, - "defaultValue": "", "type": "String" }, - "alzFunctionTriggerUrl": { + "alzLogicappResourceId": { + "defaultValue": "", "metadata": { - "description": "URL that triggers the Function", - "displayName": "Function Trigger URL" + "description": "Logic App Resource Id for Action Group to send alerts to", + "displayName": "Logic App Resource Id" }, - "defaultValue": "", "type": "String" }, "alzFunctionResourceId": { + "defaultValue": "", "metadata": { "description": "Function Resource Id for Action Group to send alerts to", "displayName": "Function Resource Id" }, - "defaultValue": "", "type": "String" }, "alzWebhookServiceUri": { + "defaultValue": "", "metadata": { "description": "Indicates the service uri of the webhook to send alerts to", "displayName": "Webhook Service Uri" }, - "defaultValue": "", "type": "String" }, "alzArmRoleId": { + "defaultValue": "", "metadata": { "description": "Arm Built-in Role Id for action group to send alerts to a subscription level, will only send to individual members of role", "displayName": "Arm Role Id" }, - "defaultValue": "", "type": "String" } }, @@ -178,15 +178,15 @@ "ALZMonitorResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, + "ALZMonitorResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, "BYOAlertProcessingRule": { "value": "[parameters('BYOAlertProcessingRule')]" }, "ALZLogicappCallbackUrl": { "value": "[parameters('ALZLogicappCallbackUrl')]" }, - "ALZLogicappResourceId": { - "value": "[parameters('ALZLogicappResourceId')]" - }, "ALZEventHubResourceId": { "value": "[parameters('ALZEventHubResourceId')]" }, @@ -196,20 +196,19 @@ "ALZFunctionTriggerUrl": { "value": "[parameters('ALZFunctionTriggerUrl')]" }, + "ALZLogicappResourceId": { + "value": "[parameters('ALZLogicappResourceId')]" + }, "ALZWebhookServiceUri": { "value": "[parameters('ALZWebhookServiceUri')]" }, - "ALZMonitorResourceGroupLocation": { - "value": "[parameters('ALZMonitorResourceGroupLocation')]" + "ALZMonitorResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" }, "ALZArmRoleId": { "value": "[parameters('ALZArmRoleId')]" - }, - "ALZMonitorResourceGroupTags": { - "value": "[parameters('ALZMonitorResourceGroupTags')]" } }, - "mode": "incremental", "template": { "parameters": { "ALZMonitorActionGroupEmail": { @@ -221,15 +220,15 @@ "ALZMonitorResourceGroupName": { "type": "string" }, + "ALZMonitorResourceGroupLocation": { + "type": "string" + }, "BYOAlertProcessingRule": { "type": "String" }, "ALZLogicappCallbackUrl": { "type": "String" }, - "ALZLogicappResourceId": { - "type": "string" - }, "ALZEventHubResourceId": { "type": "string" }, @@ -239,17 +238,17 @@ "ALZFunctionTriggerUrl": { "type": "String" }, - "ALZWebhookServiceUri": { - "type": "string" - }, - "ALZMonitorResourceGroupLocation": { + "ALZLogicappResourceId": { "type": "string" }, - "ALZArmRoleId": { + "ALZWebhookServiceUri": { "type": "string" }, "ALZMonitorResourceGroupTags": { "type": "object" + }, + "ALZArmRoleId": { + "type": "string" } }, "contentVersion": "1.0.0.0", @@ -265,16 +264,6 @@ } ], "varALZEventHubResourceId": "[array(split(parameters('ALZEventHubResourceId'),','))]", - "varALZWebhookServiceUri": "[array(split(parameters('ALZWebhookServiceUri'),','))]", - "varLogicAppReceivers": [ - { - "resourceId": "[if(empty(parameters('ALZLogicappResourceId')), null(), trim(parameters('ALZLogicappResourceId')))]", - "name": "AlzLA-0", - "useCommonSchema": true, - "callbackUrl": "[if(empty(parameters('ALZLogicappCallbackUrl')), null(), trim(parameters('ALZLogicappCallbackUrl')))]" - } - ], - "varALZArmRoleId": "[array(split(parameters('ALZArmRoleId'),','))]", "copy": [ { "name": "varEmailReceivers", @@ -303,8 +292,8 @@ "input": { "subscriptionId": "[if(empty(parameters('ALZEventHubResourceId')), null(), split(trim(variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]),'/')[2])]", "name": "[concat('AlzEH-', indexOf(variables('varALZEventHubResourceId'), variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]))]", - "tenantId": "[subscription().tenantId]", "useCommonAlertSchema": true, + "tenantId": "[subscription().tenantId]", "eventHubNameSpace": "[if(empty(parameters('ALZEventHubResourceId')), null(), split(trim(variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]),'/')[8])]", "eventHubName": "[if(empty(parameters('ALZEventHubResourceId')), null(), split(trim(variables('varALZEventHubResourceId')[copyIndex('varEventHubReceivers')]),'/')[10])]" } @@ -315,22 +304,32 @@ "count": "[length(variables('varALZWebhookServiceUri'))]", "input": { "name": "[concat('AlzWh-', indexOf(variables('varALZWebhookServiceUri'), variables('varALZWebhookServiceUri')[copyIndex('varWebhookReceivers')]))]", - "tenantId": "null()", "useCommonAlertSchema": true, + "tenantId": "null()", "identifierUri": "null()", "useAadAuth": "false", "serviceUri": "[trim(variables('varALZWebhookServiceUri')[copyIndex('varWebhookReceivers')])]", "objectId": "null()" } } - ] + ], + "varALZWebhookServiceUri": "[array(split(parameters('ALZWebhookServiceUri'),','))]", + "varLogicAppReceivers": [ + { + "resourceId": "[if(empty(parameters('ALZLogicappResourceId')), null(), trim(parameters('ALZLogicappResourceId')))]", + "name": "AlzLA-0", + "useCommonSchema": true, + "callbackUrl": "[if(empty(parameters('ALZLogicappCallbackUrl')), null(), trim(parameters('ALZLogicappCallbackUrl')))]" + } + ], + "varALZArmRoleId": "[array(split(parameters('ALZArmRoleId'),','))]" }, "resources": [ { "type": "Microsoft.Resources/resourceGroups", "apiVersion": "2021-04-01", - "name": "[parameters('ALZMonitorResourceGroupName')]", "location": "[parameters('ALZMonitorResourceGroupLocation')]", + "name": "[parameters('ALZMonitorResourceGroupName')]", "tags": "[parameters('ALZMonitorResourceGroupTags')]" }, { @@ -353,9 +352,6 @@ "ALZLogicappCallbackUrl": { "value": "[parameters('ALZLogicappCallbackUrl')]" }, - "ALZLogicappResourceId": { - "value": "[parameters('ALZLogicappResourceId')]" - }, "ALZEventHubResourceId": { "value": "[parameters('ALZEventHubResourceId')]" }, @@ -365,6 +361,9 @@ "ALZFunctionTriggerUrl": { "value": "[parameters('ALZFunctionTriggerUrl')]" }, + "ALZLogicappResourceId": { + "value": "[parameters('ALZLogicappResourceId')]" + }, "ALZWebhookServiceUri": { "value": "[parameters('ALZWebhookServiceUri')]" }, @@ -372,7 +371,6 @@ "value": "[parameters('ALZArmRoleId')]" } }, - "mode": "Incremental", "template": { "parameters": { "ALZMonitorActionGroupEmail": { @@ -390,9 +388,6 @@ "ALZLogicappCallbackUrl": { "type": "string" }, - "ALZLogicappResourceId": { - "type": "string" - }, "ALZEventHubResourceId": { "type": "string" }, @@ -402,6 +397,9 @@ "ALZFunctionTriggerUrl": { "type": "string" }, + "ALZLogicappResourceId": { + "type": "string" + }, "ALZWebhookServiceUri": { "type": "string" }, @@ -417,16 +415,16 @@ "properties": { "enabled": true, "azureFunctionReceivers": "[if(empty(parameters('ALZFunctionResourceId')), null(), variables('varAzureFunctionReceivers'))]", - "eventHubReceivers": "[if(empty(parameters('ALZEventHubResourceId')), null(), variables('varEventHubReceivers'))]", "logicAppReceivers": "[if(empty(parameters('ALZLogicappResourceId')), null(), variables('varLogicAppReceivers'))]", + "eventHubReceivers": "[if(empty(parameters('ALZEventHubResourceId')), null(), variables('varEventHubReceivers'))]", "webhookReceivers": "[if(empty(parameters('ALZWebhookServiceUri')), null(), variables('varWebhookReceivers'))]", "armRoleReceivers": "[if(empty(parameters('ALZArmRoleId')), null(), variables('varArmRoleReceivers'))]", "groupShortName": "SH-ActGrp", "emailReceivers": "[if(empty(parameters('ALZMonitorActionGroupEmail')), null(), variables('varEmailReceivers'))]" }, "apiVersion": "2023-01-01", - "name": "[concat('ag-AMBA-SH-', subscription().displayName, '-001')]", "location": "Global", + "name": "[concat('ag-AMBA-SH-', subscription().displayName, '-001')]", "tags": { "_deployed_by_amba": true }, @@ -434,7 +432,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "SH-ActionGroupDeployment", @@ -444,7 +443,8 @@ } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, diff --git a/Definitions/policyDefinitions/Monitoring/deploy_suppression_alertprocessing_rule.jsonc b/Definitions/policyDefinitions/Monitoring/deploy_suppression_alertprocessing_rule.jsonc index 1c49b75..3da617f 100644 --- a/Definitions/policyDefinitions/Monitoring/deploy_suppression_alertprocessing_rule.jsonc +++ b/Definitions/policyDefinitions/Monitoring/deploy_suppression_alertprocessing_rule.jsonc @@ -7,47 +7,47 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.0", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alzMonitorResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { "description": "Location of the Resource group the alert is placed in", "displayName": "Resource Group Location" }, - "defaultValue": "centralus", - "type": "String" - }, - "alzMonitorResourceGroupName": { - "metadata": { - "description": "Resource group the alert is placed in", - "displayName": "Resource Group Name" - }, - "defaultValue": "rg-amba-monitoring-001", "type": "String" }, "alzMonitorResourceGroupTags": { + "defaultValue": { + "_deployed_by_amba": true + }, "metadata": { "description": "Tags on the Resource group the alert is placed in", "displayName": "Resource Group Tags" }, - "defaultValue": { - "_deployed_by_amba": true - }, "type": "Object" + }, + "alzMonitorResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", + "metadata": { + "description": "Resource group the alert is placed in", + "displayName": "Resource Group Name" + }, + "type": "String" } }, "policyRule": { @@ -67,9 +67,6 @@ "effect": "deployIfNotExists", "details": { "type": "Microsoft.AlertsManagement/actionRules", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -78,6 +75,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -104,6 +104,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -128,6 +129,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.AlertsManagement/actionRules", @@ -152,7 +154,6 @@ "dependsOn": [] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -164,7 +165,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_activitylog_firewall_delete.jsonc b/Definitions/policyDefinitions/Network/deploy_activitylog_firewall_delete.jsonc index 3494c61..5ca1ea3 100644 --- a/Definitions/policyDefinitions/Network/deploy_activitylog_firewall_delete.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_activitylog_firewall_delete.jsonc @@ -7,59 +7,59 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.2", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.2", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { - "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, "defaultValue": { "_deployed_by_amba": true, "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -80,9 +80,6 @@ "effect": "deployIfNotExists", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -125,32 +122,35 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "name": "ActivityAzureFirewallDelete", "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -158,6 +158,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -188,6 +189,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -229,7 +231,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -241,7 +242,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_activitylog_nsg_delete.jsonc b/Definitions/policyDefinitions/Network/deploy_activitylog_nsg_delete.jsonc index c027b12..dcd0c6c 100644 --- a/Definitions/policyDefinitions/Network/deploy_activitylog_nsg_delete.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_activitylog_nsg_delete.jsonc @@ -7,59 +7,59 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.2", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.2", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "alertResourceGroupLocation": { "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" + "description": "Alert state for the alert", + "displayName": "Alert State" }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupName": { + "defaultValue": "rg-amba-monitoring-001", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "rg-amba-monitoring-001", "type": "String" }, "alertResourceGroupTags": { - "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, "defaultValue": { "_deployed_by_amba": true, "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,15 +125,16 @@ "roleDefinitionIds": [ "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" ], + "name": "ActivityNSGDelete", "deployment": { "properties": { "parameters": { - "enabled": { - "value": "[parameters('enabled')]" - }, "alertResourceGroupLocation": { "value": "[parameters('alertResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, @@ -141,13 +142,12 @@ "value": "[parameters('alertResourceGroupTags')]" } }, - "mode": "incremental", "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupLocation": { + "enabled": { "type": "string" }, "alertResourceGroupName": { @@ -158,11 +158,12 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", - "location": "[parameters('alertResourceGroupLocation')]", "apiVersion": "2021-04-01", + "location": "[parameters('alertResourceGroupLocation')]", "name": "[parameters('alertResourceGroupName')]", "tags": "[parameters('alertResourceGroupTags')]" }, @@ -178,7 +179,6 @@ "value": "[parameters('alertResourceGroupName')]" } }, - "mode": "Incremental", "template": { "parameters": { "enabled": { @@ -189,6 +189,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -222,17 +223,17 @@ ] } }, - "location": "global", "apiVersion": "2020-10-01", + "location": "global", "name": "ActivityNSGDelete", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "Incremental" }, "apiVersion": "2019-10-01", "name": "ActivityNSGDelete", @@ -241,13 +242,12 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" }, "location": "australiaeast" }, - "name": "ActivityNSGDelete", "resourceGroupName": "[parameters('alertResourceGroupName')]", "deploymentScope": "subscription", "existenceScope": "resourcegroup" diff --git a/Definitions/policyDefinitions/Network/deploy_activitylog_routetable_update.jsonc b/Definitions/policyDefinitions/Network/deploy_activitylog_routetable_update.jsonc index 9958655..b398bb7 100644 --- a/Definitions/policyDefinitions/Network/deploy_activitylog_routetable_update.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_activitylog_routetable_update.jsonc @@ -7,59 +7,59 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.1", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.1", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "AlzMonitoring-rg", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { - "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, "defaultValue": { "_deployed_by_amba": true, "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring on resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -80,9 +80,6 @@ "effect": "deployIfNotExists", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -125,32 +122,35 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "name": "ActivityUDRUpdate", "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -158,6 +158,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -188,6 +189,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -229,7 +231,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -241,7 +242,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_activitylog_vpngateway_delete.jsonc b/Definitions/policyDefinitions/Network/deploy_activitylog_vpngateway_delete.jsonc index 59476b9..6d13e59 100644 --- a/Definitions/policyDefinitions/Network/deploy_activitylog_vpngateway_delete.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_activitylog_vpngateway_delete.jsonc @@ -7,59 +7,59 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.1", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.1", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "enabled": { + "alertResourceGroupLocation": { + "defaultValue": "centralus", "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Location of the Resource group the alert is placed in", + "displayName": "Resource Group Location" }, + "type": "String" + }, + "enabled": { "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "alertResourceGroupName": { + "defaultValue": "AlzMonitoring-rg", "metadata": { "description": "Resource group the alert is placed in", "displayName": "Resource Group Name" }, - "defaultValue": "AlzMonitoring-rg", - "type": "String" - }, - "alertResourceGroupLocation": { - "metadata": { - "description": "Location of the Resource group the alert is placed in", - "displayName": "Resource Group Location" - }, - "defaultValue": "centralus", "type": "String" }, "alertResourceGroupTags": { - "metadata": { - "description": "Tags on the Resource group the alert is placed in", - "displayName": "Resource Group Tags" - }, "defaultValue": { "_deployed_by_amba": true, "environment": "test" }, + "metadata": { + "description": "Tags on the Resource group the alert is placed in", + "displayName": "Resource Group Tags" + }, "type": "Object" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -80,9 +80,6 @@ "effect": "deployIfNotExists", "details": { "type": "Microsoft.Insights/activityLogAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -125,31 +122,34 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { + "alertResourceGroupLocation": { + "value": "[parameters('alertResourceGroupLocation')]" + }, "enabled": { "value": "[parameters('enabled')]" }, "alertResourceGroupName": { "value": "[parameters('alertResourceGroupName')]" }, - "alertResourceGroupLocation": { - "value": "[parameters('alertResourceGroupLocation')]" - }, "alertResourceGroupTags": { "value": "[parameters('alertResourceGroupTags')]" } }, "template": { "parameters": { - "enabled": { + "alertResourceGroupLocation": { "type": "string" }, - "alertResourceGroupName": { + "enabled": { "type": "string" }, - "alertResourceGroupLocation": { + "alertResourceGroupName": { "type": "string" }, "alertResourceGroupTags": { @@ -157,6 +157,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Resources/resourceGroups", @@ -187,6 +188,7 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "microsoft.insights/activityLogAlerts", @@ -228,7 +230,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "Incremental" @@ -240,7 +241,6 @@ ] } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_afw_firewallhealth_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_afw_firewallhealth_alert.jsonc index 8696e0c..7d12dd8 100644 --- a/Definitions/policyDefinitions/Network/deploy_afw_firewallhealth_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_afw_firewallhealth_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for AFW FirewallHealth", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "FirewallHealth", "operator": "LessThan", + "name": "FirewallHealth", "metricNamespace": "Microsoft.Network/azureFirewalls", "criterionType": "StaticThresholdCriterion", "metricName": "FirewallHealth" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_afw_snatportutilization_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_afw_snatportutilization_alert.jsonc index cc369e6..6f4034c 100644 --- a/Definitions/policyDefinitions/Network/deploy_afw_snatportutilization_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_afw_snatportutilization_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "80", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for AFW SNATPortUtilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "SNATPortUtilization", "operator": "GreaterThan", + "name": "SNATPortUtilization", "metricNamespace": "Microsoft.Network/azureFirewalls", "criterionType": "StaticThresholdCriterion", "metricName": "SNATPortUtilization" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_dnsz_registrationcapacityutil_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_dnsz_registrationcapacityutil_alert.jsonc index b7e1e18..e66ee00 100644 --- a/Definitions/policyDefinitions/Network/deploy_dnsz_registrationcapacityutil_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_dnsz_registrationcapacityutil_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT1H", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT1H", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "80", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Private DNS Zone Registration Capacity Utilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Maximum", - "name": "VirtualNetworkWithRegistrationCapacityUtilization", "operator": "GreaterThanOrEqual", + "name": "VirtualNetworkWithRegistrationCapacityUtilization", "metricNamespace": "Microsoft.Network/privateDnsZones", "criterionType": "StaticThresholdCriterion", "metricName": "VirtualNetworkWithRegistrationCapacityUtilization" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-RequestsAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-RequestsAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_ercir_arpavailability_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_ercir_arpavailability_alert.jsonc index 27ce52f..12bcd70 100644 --- a/Definitions/policyDefinitions/Network/deploy_ercir_arpavailability_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_ercir_arpavailability_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ExpressRoute Circuit Arp Availability", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "ArpAvailability", "operator": "LessThan", + "name": "ArpAvailability", "metricNamespace": "Microsoft.Network/expressRouteCircuits", "criterionType": "StaticThresholdCriterion", "metricName": "ArpAvailability" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_ercir_bgpavailability_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_ercir_bgpavailability_alert.jsonc index 8d1dc29..343e54a 100644 --- a/Definitions/policyDefinitions/Network/deploy_ercir_bgpavailability_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_ercir_bgpavailability_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ExpressRoute Circuit Bgp Availability", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "BgpAvailability", "operator": "LessThan", + "name": "BgpAvailability", "metricNamespace": "Microsoft.Network/expressRouteCircuits", "criterionType": "StaticThresholdCriterion", "metricName": "BgpAvailability" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-BgpAvailability')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-BgpAvailability')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsinpersecond_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsinpersecond_alert.jsonc index 77f1af8..5a00731 100644 --- a/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsinpersecond_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsinpersecond_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,9 +125,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -242,11 +242,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ExpressRoute Circuit QosDropBitsInPerSecond", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -254,34 +256,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "QosDropBitsInPerSecond", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, + "operator": "GreaterThan", + "name": "QosDropBitsInPerSecond", "metricNamespace": "Microsoft.Network/expressRouteCircuits", "criterionType": "DynamicThresholdCriterion", "metricName": "QosDropBitsInPerSecond", @@ -289,7 +287,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -299,7 +300,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsoutpersecond_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsoutpersecond_alert.jsonc index d3bcc87..848ea88 100644 --- a/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsoutpersecond_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_ercir_qosdropbitsoutpersecond_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,9 +125,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -242,11 +242,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ExpressRoute Circuit QosDropBitsOutPerSecond", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -254,34 +256,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "QosDropBitsOutPerSecond", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, + "operator": "GreaterThan", + "name": "QosDropBitsOutPerSecond", "metricNamespace": "Microsoft.Network/expressRouteCircuits", "criterionType": "DynamicThresholdCriterion", "metricName": "QosDropBitsOutPerSecond", @@ -289,7 +287,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -299,7 +300,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsin_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsin_alert.jsonc index cbcc7e0..d4487b4 100644 --- a/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsin_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsin_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Gateway Connection BitsInPerSecond", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "ERGatewayConnectionBitsInPerSecond", "operator": "LessThan", + "name": "ERGatewayConnectionBitsInPerSecond", "metricNamespace": "Microsoft.Network/expressroutegateways", "criterionType": "StaticThresholdCriterion", "metricName": "ERGatewayConnectionBitsInPerSecond" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-GatewayERBitsInAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-GatewayERBitsInAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsout_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsout_alert.jsonc index 1defe06..a6b925e 100644 --- a/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsout_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_ergw_expressroutebitsout_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Gateway Connection BitsOutPerSecond", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "ERGatewayConnectionBitsOutPerSecond", "operator": "LessThan", + "name": "ERGatewayConnectionBitsOutPerSecond", "metricNamespace": "Microsoft.Network/expressroutegateways", "criterionType": "StaticThresholdCriterion", "metricName": "ERGatewayConnectionBitsOutPerSecond" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_ergw_expressroutecpuutil_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_ergw_expressroutecpuutil_alert.jsonc index d57a177..7c984f9 100644 --- a/Definitions/policyDefinitions/Network/deploy_ergw_expressroutecpuutil_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_ergw_expressroutecpuutil_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "80", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Gateway Express Route CPU Utilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "ExpressRouteGatewayCpuUtilization", "operator": "GreaterThan", + "name": "ExpressRouteGatewayCpuUtilization", "metricNamespace": "Microsoft.Network/expressroutegateways", "criterionType": "StaticThresholdCriterion", "metricName": "ExpressRouteGatewayCpuUtilization" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-GatewayERCPUAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-GatewayERCPUAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_pdnsz_capacityutil_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_pdnsz_capacityutil_alert.jsonc index 30fbfa5..45c366b 100644 --- a/Definitions/policyDefinitions/Network/deploy_pdnsz_capacityutil_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_pdnsz_capacityutil_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1H", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT1H", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "80", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Private DNS Zone Virtual Network Link Capacity Utilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Maximum", - "name": "VirtualNetworkLinkCapacityUtilization", "operator": "GreaterThanOrEqual", + "name": "VirtualNetworkLinkCapacityUtilization", "metricNamespace": "Microsoft.Network/privateDnsZones", "criterionType": "StaticThresholdCriterion", "metricName": "VirtualNetworkLinkCapacityUtilization" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_pdnsz_queryvolume_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_pdnsz_queryvolume_alert.jsonc index e1d6853..4db57c3 100644 --- a/Definitions/policyDefinitions/Network/deploy_pdnsz_queryvolume_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_pdnsz_queryvolume_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT1H", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT1H", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "4", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "500", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "500", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Private DNS Query Volume", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Total", - "name": "QueryVolume", "operator": "GreaterThanOrEqual", + "name": "QueryVolume", "metricNamespace": "Microsoft.Network/privateDnsZones", "criterionType": "StaticThresholdCriterion", "metricName": "QueryVolume" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-QueryVolumeAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-QueryVolumeAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_pdnsz_recordsetcapacity_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_pdnsz_recordsetcapacity_alert.jsonc index 1acb7f4..efed190 100644 --- a/Definitions/policyDefinitions/Network/deploy_pdnsz_recordsetcapacity_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_pdnsz_recordsetcapacity_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,13 +24,25 @@ "PT1H" ], "defaultValue": "PT1H", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -46,25 +54,25 @@ "P1D" ], "defaultValue": "PT1H", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -73,46 +81,38 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "80", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -193,6 +193,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -202,9 +205,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -225,6 +224,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -234,9 +236,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -249,15 +248,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Private DNS Zone Record Set Capacity Utilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -267,27 +271,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Maximum", + "operator": "GreaterThanOrEqual", + "name": "RecordSetCapacityUtilization", "metricNamespace": "Microsoft.Network/privateDnsZones", "criterionType": "StaticThresholdCriterion", - "name": "RecordSetCapacityUtilization", - "operator": "GreaterThanOrEqual", "metricName": "RecordSetCapacityUtilization" } ], @@ -297,17 +297,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-RecordSet_Capacity_Utilization')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_publicip_bytesinddosattack_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_publicip_bytesinddosattack_alert.jsonc index 7ea9248..0315712 100644 --- a/Definitions/policyDefinitions/Network/deploy_publicip_bytesinddosattack_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_publicip_bytesinddosattack_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "4", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "8000000", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "8000000", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Public IP Address Bytes IN DDOS", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Maximum", - "name": "bytesinddos", "operator": "GreaterThan", + "name": "bytesinddos", "metricNamespace": "Microsoft.Network/publicIPAddresses", "criterionType": "StaticThresholdCriterion", "metricName": "bytesinddos" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-BytesInDDOSAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-BytesInDDOSAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_publicip_ddosattack_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_publicip_ddosattack_alert.jsonc index 918fbab..c08a681 100644 --- a/Definitions/policyDefinitions/Network/deploy_publicip_ddosattack_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_publicip_ddosattack_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "0", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "0", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Public IP Address Under Attack", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Maximum", - "name": "ifunderddosattack", "operator": "GreaterThan", + "name": "ifunderddosattack", "metricNamespace": "Microsoft.Network/publicIPAddresses", "criterionType": "StaticThresholdCriterion", "metricName": "ifunderddosattack" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_publicip_packetsinddosattack_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_publicip_packetsinddosattack_alert.jsonc index cc797b3..529563e 100644 --- a/Definitions/policyDefinitions/Network/deploy_publicip_packetsinddosattack_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_publicip_packetsinddosattack_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,13 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -46,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -73,46 +81,38 @@ "4" ], "defaultValue": "4", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "40000", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "40000", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -193,6 +193,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -202,9 +205,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -225,6 +224,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -234,9 +236,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -249,15 +248,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Public IP Address Packets IN DDOS", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -267,27 +271,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Total", + "operator": "GreaterThanOrEqual", + "name": "PacketsInDDoS", "metricNamespace": "Microsoft.Network/publicIPAddresses", "criterionType": "StaticThresholdCriterion", - "name": "PacketsInDDoS", - "operator": "GreaterThanOrEqual", "metricName": "PacketsInDDoS" } ], @@ -297,17 +297,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-PacketsInDDosAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_publicip_vipavailability_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_publicip_vipavailability_alert.jsonc index 6b51bff..3aa8d1d 100644 --- a/Definitions/policyDefinitions/Network/deploy_publicip_vipavailability_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_publicip_vipavailability_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -137,9 +137,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -188,6 +185,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -200,12 +200,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -231,10 +231,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -252,11 +252,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Public IP Address VIP Availability", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -264,12 +266,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -277,28 +279,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "VipAvailability", "operator": "LessThan", + "name": "VipAvailability", "metricNamespace": "Microsoft.Network/publicIPAddresses", "criterionType": "StaticThresholdCriterion", "metricName": "VipAvailability" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -308,7 +309,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vnet_ddosattack_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnet_ddosattack_alert.jsonc index ae1b576..dc29cb7 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnet_ddosattack_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnet_ddosattack_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "0", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "0", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VNet DDOS Attack", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Maximum", - "name": "ifunderddosattack", "operator": "GreaterThan", + "name": "ifunderddosattack", "metricNamespace": "Microsoft.Network/virtualNetworks", "criterionType": "StaticThresholdCriterion", "metricName": "ifunderddosattack" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutebitspersecond_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutebitspersecond_alert.jsonc index f5050b7..3e63266 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutebitspersecond_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutebitspersecond_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -259,6 +258,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VNet Gateway Express Route Bits Per Second", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -279,7 +279,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -289,8 +288,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "ExpressRouteGatewayBitsPerSecond", "operator": "LessThan", + "name": "ExpressRouteGatewayBitsPerSecond", "metricNamespace": "Microsoft.Network/virtualNetworkGateways", "criterionType": "StaticThresholdCriterion", "metricName": "ExpressRouteGatewayBitsPerSecond" @@ -303,15 +302,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-GatewayERBitsAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-GatewayERBitsAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutecpuutil_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutecpuutil_alert.jsonc index 98de7a6..c4e88f9 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutecpuutil_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_expressroutecpuutil_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,13 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -46,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -73,46 +81,38 @@ "4" ], "defaultValue": "1", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "80", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -197,6 +197,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -206,9 +209,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -229,13 +228,13 @@ "evaluationFrequency": { "type": "String" }, - "windowSize": { + "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "autoMitigate": { + "enabled": { "type": "String" }, "threshold": { @@ -250,15 +249,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VNet Gateway Express Route CPU Utilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -268,27 +272,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "GreaterThan", + "name": "ExpressRouteGatewayCpuUtilization", "metricNamespace": "Microsoft.Network/virtualNetworkGateways", "criterionType": "StaticThresholdCriterion", - "name": "ExpressRouteGatewayCpuUtilization", - "operator": "GreaterThan", "metricName": "ExpressRouteGatewayCpuUtilization" } ], @@ -298,17 +298,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-GatewayERCPUAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelbandwidth_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelbandwidth_alert.jsonc index 7f1a793..d288976 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelbandwidth_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelbandwidth_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -137,9 +137,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -188,6 +185,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -200,12 +200,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -231,10 +231,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -252,11 +252,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VNet Gateway Tunnel Avg Bandwidth", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -264,12 +266,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -277,28 +279,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "TunnelAverageBandwidth", "operator": "LessThan", + "name": "TunnelAverageBandwidth", "metricNamespace": "Microsoft.Network/virtualNetworkGateways", "criterionType": "StaticThresholdCriterion", "metricName": "TunnelAverageBandwidth" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -308,7 +309,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegress_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegress_alert.jsonc index 2915c82..0b91c06 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegress_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegress_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -259,6 +258,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VNet Gateway Tunnel Egress Bytes", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -279,7 +279,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -289,8 +288,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "TunnelEgressBytes", "operator": "LessThan", + "name": "TunnelEgressBytes", "metricNamespace": "Microsoft.Network/virtualNetworkGateways", "criterionType": "StaticThresholdCriterion", "metricName": "TunnelEgressBytes" @@ -303,15 +302,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-TunnelEgressAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-TunnelEgressAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropcount_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropcount_alert.jsonc index 265d463..84adfb7 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropcount_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropcount_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { - "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", - "displayName": "Effect" + "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", + "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -129,9 +129,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -179,15 +176,18 @@ "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods" } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -200,12 +200,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -228,10 +228,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -246,11 +246,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Vnet Gateway tunnel TunnelEgressPacketDropCount", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -258,34 +260,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "TunnelEgressPacketDropCount", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, + "operator": "GreaterThan", + "name": "TunnelEgressPacketDropCount", "metricNamespace": "microsoft.network/virtualNetworkGateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelEgressPacketDropCount", @@ -293,7 +291,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -303,7 +304,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropmismatch_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropmismatch_alert.jsonc index 5340087..a18b0ce 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropmismatch_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelegresspacketdropmismatch_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { - "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", - "displayName": "Effect" + "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", + "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -176,11 +176,11 @@ "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods" } ] @@ -213,7 +213,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -253,6 +252,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Vnet Gateway tunnel TunnelEgressPacketDropTSMismatch", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -270,7 +270,6 @@ "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -279,12 +278,12 @@ "allOf": [ { "timeAggregation": "Average", - "name": "TunnelEgressPacketDropTSMismatch", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, "operator": "GreaterThan", + "name": "TunnelEgressPacketDropTSMismatch", "metricNamespace": "microsoft.network/virtualNetworkGateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelEgressPacketDropTSMismatch", @@ -298,15 +297,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-TunnelEgressPacketDropTSMismatchAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-TunnelEgressPacketDropTSMismatchAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingress_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingress_alert.jsonc index 1b2398d..9d89d08 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingress_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingress_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -259,6 +258,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VNet Gateway Tunnel ingress Bytes", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -279,7 +279,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -289,8 +288,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "TunnelIngressBytes", "operator": "LessThan", + "name": "TunnelIngressBytes", "metricNamespace": "Microsoft.Network/virtualNetworkGateways", "criterionType": "StaticThresholdCriterion", "metricName": "TunnelIngressBytes" @@ -303,15 +302,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-TunnelIngressAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-TunnelIngressAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropcount_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropcount_alert.jsonc index eee093d..79c1d5c 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropcount_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropcount_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.2.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { - "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", - "displayName": "Effect" + "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", + "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -129,9 +129,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -179,15 +176,18 @@ "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods" } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -200,12 +200,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -228,10 +228,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -246,11 +246,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Vnet Gateway tunnel TunnelIngressPacketDropCount", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -258,34 +260,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "TunnelIngressPacketDropCount", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, + "operator": "GreaterThan", + "name": "TunnelIngressPacketDropCount", "metricNamespace": "microsoft.network/virtualNetworkGateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelIngressPacketDropCount", @@ -293,7 +291,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -303,7 +304,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropmismatch_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropmismatch_alert.jsonc index 06d8b7a..3a9d10f 100644 --- a/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropmismatch_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vnetgw_tunnelingresspacketdropmismatch_alert.jsonc @@ -10,16 +10,12 @@ "alzCloudEnvironments": [ "AzureCloud" ], - "version": "1.1.0", + "version": "1.2.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { - "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", - "displayName": "Effect" + "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", + "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -176,11 +176,11 @@ "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.alertSensitivity" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.minFailingPeriodsToAlert" }, { - "equals": 2, + "equals": 4, "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].DynamicThresholdCriterion.failingPeriods.numberOfEvaluationPeriods" } ] @@ -213,7 +213,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -253,6 +252,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Vnet Gateway tunnel TunnelIngressPacketDropTSMismatch", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -270,7 +270,6 @@ "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -279,12 +278,12 @@ "allOf": [ { "timeAggregation": "Average", - "name": "TunnelIngressPacketDropTSMismatch", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, "operator": "GreaterThan", + "name": "TunnelIngressPacketDropTSMismatch", "metricNamespace": "microsoft.network/virtualNetworkGateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelIngressPacketDropTSMismatch", @@ -298,15 +297,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-TunnelIngressPacketDropTSMismatchAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-TunnelIngressPacketDropTSMismatchAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_bandwidthutil_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_bandwidthutil_alert.jsonc index e38b034..c773d0d 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_bandwidthutil_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_bandwidthutil_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,13 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -46,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -73,46 +81,38 @@ "4" ], "defaultValue": "0", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -193,6 +193,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -202,9 +205,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -225,6 +224,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -234,9 +236,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -249,15 +248,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway Bandwidth Utilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -267,27 +271,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "LessThan", + "name": "tunnelaveragebandwidth", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "StaticThresholdCriterion", - "name": "tunnelaveragebandwidth", - "operator": "LessThan", "metricName": "tunnelaveragebandwidth" } ], @@ -297,17 +297,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-GatewayBandwidthAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_bgppeerstatus_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_bgppeerstatus_alert.jsonc index 0bf43e7..c7286b8 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_bgppeerstatus_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_bgppeerstatus_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,13 +24,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -46,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -73,46 +81,38 @@ "4" ], "defaultValue": "0", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -193,6 +193,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -202,9 +205,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -225,6 +224,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -234,9 +236,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -249,15 +248,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway BGP peer status", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -267,27 +271,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Total", + "operator": "LessThan", + "name": "bgppeerstatus", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "StaticThresholdCriterion", - "name": "bgppeerstatus", - "operator": "LessThan", "metricName": "bgppeerstatus" } ], @@ -297,17 +297,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-BGPPeerStatusAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_egress_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_egress_alert.jsonc index 75771e3..a8b00bd 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_egress_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_egress_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway tunnel egress bytes", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "tunnelegressbytes", "operator": "LessThan", + "name": "tunnelegressbytes", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "StaticThresholdCriterion", "metricName": "tunnelegressbytes" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_ingress_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_ingress_alert.jsonc index 993f499..beeb4d1 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_ingress_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_ingress_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -212,7 +212,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -255,6 +254,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway tunnel ingress bytes", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -275,7 +275,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -285,8 +284,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "tunnelingressbytes", "operator": "LessThan", + "name": "tunnelingressbytes", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "StaticThresholdCriterion", "metricName": "tunnelingressbytes" @@ -299,15 +298,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-TunnelIngressAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-TunnelIngressAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropcount_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropcount_alert.jsonc index 5a7592d..e86d453 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropcount_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropcount_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,9 +125,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -242,11 +242,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway tunnel TunnelEgressPacketDropCount", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -254,34 +256,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "TunnelEgressPacketDropCount", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, + "operator": "GreaterThan", + "name": "TunnelEgressPacketDropCount", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelEgressPacketDropCount", @@ -289,7 +287,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -299,7 +300,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropmismatch_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropmismatch_alert.jsonc index de8f243..a595b23 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropmismatch_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelegresspacketdropmismatch_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -249,6 +248,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway tunnel TunnelEgressPacketDropTSMismatch", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -266,7 +266,6 @@ "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -275,12 +274,12 @@ "allOf": [ { "timeAggregation": "Average", - "name": "TunnelEgressPacketDropTSMismatch", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, "operator": "GreaterThan", + "name": "TunnelEgressPacketDropTSMismatch", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelEgressPacketDropTSMismatch", @@ -294,15 +293,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-TunnelEgressPacketDropTSMismatchAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-TunnelEgressPacketDropTSMismatchAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropcount_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropcount_alert.jsonc index 4704dc3..73a0c49 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropcount_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropcount_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Network", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,9 +125,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -242,11 +242,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway tunnel TunnelIngressPacketDropCount", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -254,34 +256,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "TunnelIngressPacketDropCount", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, + "operator": "GreaterThan", + "name": "TunnelIngressPacketDropCount", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelIngressPacketDropCount", @@ -289,7 +287,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -299,7 +300,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropmismatch_alert.jsonc b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropmismatch_alert.jsonc index 536ad92..7c9dc0b 100644 --- a/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropmismatch_alert.jsonc +++ b/Definitions/policyDefinitions/Network/deploy_vpngw_tunnelingresspacketdropmismatch_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "3", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -249,6 +248,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for VPN Gateway tunnel TunnelIngressPacketDropTSMismatch", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -266,7 +266,6 @@ "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -275,12 +274,12 @@ "allOf": [ { "timeAggregation": "Average", - "name": "TunnelIngressPacketDropTSMismatch", "failingPeriods": { "numberOfEvaluationPeriods": 4, "minFailingPeriodsToAlert": 4 }, "operator": "GreaterThan", + "name": "TunnelIngressPacketDropTSMismatch", "metricNamespace": "microsoft.network/vpngateways", "criterionType": "DynamicThresholdCriterion", "metricName": "TunnelIngressPacketDropTSMismatch", @@ -294,15 +293,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-TunnelIngressPacketDropTSMismatchAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-TunnelIngressPacketDropTSMismatchAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Networking/deploy_fd_backendrequestlatency_alert.jsonc b/Definitions/policyDefinitions/Networking/deploy_fd_backendrequestlatency_alert.jsonc index a7cc6ea..4049368 100644 --- a/Definitions/policyDefinitions/Networking/deploy_fd_backendrequestlatency_alert.jsonc +++ b/Definitions/policyDefinitions/Networking/deploy_fd_backendrequestlatency_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,9 +125,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -242,11 +242,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Frontdoor BackendRequestLatency", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -254,34 +256,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "ServiceApiResult", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, + "operator": "GreaterThan", + "name": "ServiceApiResult", "metricNamespace": "Microsoft.Network/frontdoors", "criterionType": "DynamicThresholdCriterion", "metricName": "BackendRequestLatency", @@ -289,7 +287,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -299,7 +300,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_originlatency_alert.jsonc b/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_originlatency_alert.jsonc index 6b1362e..594aaf7 100644 --- a/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_originlatency_alert.jsonc +++ b/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_originlatency_alert.jsonc @@ -1,25 +1,21 @@ { "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", - "name": "Deploy_FrontdoorCDN_OriginLatency_Alert", + "name": "Deploy_FrontDoorCDN_OriginLatency_Alert", "properties": { "displayName": "Deploy Frontdoor CDN Profile Origin Latency Alert", "description": "Policy to audit/deploy Frontdoor CDN Profile Origin Latency Alert", "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,9 +125,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -242,11 +242,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Frontdoor CDN Origin Latency", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -254,34 +256,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "ServiceApiResult", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, + "operator": "GreaterThan", + "name": "ServiceApiResult", "metricNamespace": "Microsoft.Cdn/profiles", "criterionType": "DynamicThresholdCriterion", "metricName": "OriginLatency", @@ -289,7 +287,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -299,7 +300,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage4xx_alert.jsonc b/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage4xx_alert.jsonc index 98be073..3119fbc 100644 --- a/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage4xx_alert.jsonc +++ b/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage4xx_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,13 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -46,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -73,38 +81,30 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -193,6 +193,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -202,14 +205,10 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "resourceName": { "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -222,6 +221,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -231,9 +233,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "resourceName": { "metadata": { "description": "Name of the resource", @@ -243,15 +242,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Frontdoor CDN Origin Latency", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -260,29 +264,25 @@ }, "severity": { "value": "[parameters('severity')]" - }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "timeAggregation": "Average", - "metricNamespace": "Microsoft.Cdn/profiles", - "criterionType": "DynamicThresholdCriterion", - "name": "ServiceApiResult", - "operator": "GreaterThan", - "metricName": "Percentage4XX", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, + "operator": "GreaterThan", + "name": "ServiceApiResult", + "metricNamespace": "Microsoft.Cdn/profiles", + "criterionType": "DynamicThresholdCriterion", + "metricName": "Percentage4XX", "alertSensitivity": "Medium" } ], @@ -292,17 +292,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-Percentage4XXAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage5xx_alert.jsonc b/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage5xx_alert.jsonc index c1f3f1c..bb9d316 100644 --- a/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage5xx_alert.jsonc +++ b/Definitions/policyDefinitions/Networking/deploy_frontdoorcdn_percentage5xx_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Networking", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -125,9 +125,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -242,11 +242,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Frontdoor CDN Origin Latency", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -254,34 +256,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Average", - "name": "ServiceApiResult", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, + "operator": "GreaterThan", + "name": "ServiceApiResult", "metricNamespace": "Microsoft.Cdn/profiles", "criterionType": "DynamicThresholdCriterion", "metricName": "Percentage5XX", @@ -289,7 +287,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -299,7 +300,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Site Recovery/deploy_recoveryvault_backuphealthmonitor_alert.jsonc b/Definitions/policyDefinitions/Site Recovery/deploy_recoveryvault_backuphealthmonitor_alert.jsonc index b997f38..37c83b2 100644 --- a/Definitions/policyDefinitions/Site Recovery/deploy_recoveryvault_backuphealthmonitor_alert.jsonc +++ b/Definitions/policyDefinitions/Site Recovery/deploy_recoveryvault_backuphealthmonitor_alert.jsonc @@ -7,33 +7,33 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.0.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.0.0", "category": "Site Recovery", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "modify", "audit", "disabled" ], "defaultValue": "modify", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, diff --git a/Definitions/policyDefinitions/Storage/deploy_storageaccount_availability_alert.jsonc b/Definitions/policyDefinitions/Storage/deploy_storageaccount_availability_alert.jsonc index e94d773..46fa1b2 100644 --- a/Definitions/policyDefinitions/Storage/deploy_storageaccount_availability_alert.jsonc +++ b/Definitions/policyDefinitions/Storage/deploy_storageaccount_availability_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Storage", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,37 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -70,13 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -85,34 +81,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Monitoring disabled" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -133,9 +133,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -184,6 +181,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -196,12 +196,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -227,10 +227,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -248,11 +248,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Storage Account Availability", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -260,12 +262,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -273,28 +275,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "Availability", "operator": "LessThan", + "name": "Availability", "metricNamespace": "Microsoft.Storage/storageAccounts", "criterionType": "StaticThresholdCriterion", "metricName": "Availability" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -304,7 +305,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_applicationgatewaytotaltime_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_applicationgatewaytotaltime_alert.jsonc index 4bd75f0..54257ca 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_applicationgatewaytotaltime_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_applicationgatewaytotaltime_alert.jsonc @@ -7,16 +7,12 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", + "version": "1.2.0", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "Category": "Networking" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,39 +78,43 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alertSensitivity": { - "metadata": { - "description": "Alert Sensitivity for the alert", - "displayName": "Alert Sensitivity" - }, "allowedValues": [ "Low", "Medium", "High" ], "defaultValue": "Medium", + "metadata": { + "description": "Alert Sensitivity for the alert", + "displayName": "Alert Sensitivity" + }, "type": "String" } }, @@ -177,7 +177,7 @@ "field": "Microsoft.Insights/metricAlerts/autoMitigate" }, { - "equals": "Total", + "equals": "Average", "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation" }, { @@ -229,7 +229,6 @@ "value": "[parameters('alertSensitivity')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -272,6 +271,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway ApplicationGatewayTotalTime", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -292,7 +292,6 @@ "value": "[parameters('alertSensitivity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -300,13 +299,13 @@ "criteria": { "allOf": [ { - "timeAggregation": "Total", - "name": "ApplicationGatewayTotalTime", + "timeAggregation": "Average", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, "operator": "GreaterThan", + "name": "ApplicationGatewayTotalTime", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "DynamicThresholdCriterion", "metricName": "ApplicationGatewayTotalTime", @@ -320,15 +319,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-agApplicationGatewayTotalTime')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-agApplicationGatewayTotalTime')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_backendlastbyteresponsetime_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_backendlastbyteresponsetime_alert.jsonc index aff7418..4c272e4 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_backendlastbyteresponsetime_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_backendlastbyteresponsetime_alert.jsonc @@ -7,16 +7,12 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", + "version": "1.2.0", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/", "Category": "Networking" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,39 +78,43 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alertSensitivity": { - "metadata": { - "description": "Alert Sensitivity for the alert", - "displayName": "Alert Sensitivity" - }, "allowedValues": [ "Low", "Medium", "High" ], "defaultValue": "Medium", + "metadata": { + "description": "Alert Sensitivity for the alert", + "displayName": "Alert Sensitivity" + }, "type": "String" } }, @@ -142,9 +142,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -180,7 +177,7 @@ "field": "Microsoft.Insights/metricAlerts/autoMitigate" }, { - "equals": "Total", + "equals": "Average", "field": "Microsoft.Insights/metricAlerts/criteria.Microsoft-Azure-Monitor-MultipleResourceMultipleMetricCriteria.allOf[*].timeAggregation" }, { @@ -201,6 +198,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -213,12 +213,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -244,10 +244,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -265,11 +265,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway BackendLastByteResponseTime", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -277,12 +279,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -290,24 +292,20 @@ "value": "[parameters('alertSensitivity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { - "timeAggregation": "Total", - "name": "BackendLastByteResponseTime", - "operator": "GreaterThan", + "timeAggregation": "Average", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, + "operator": "GreaterThan", + "name": "BackendLastByteResponseTime", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "DynamicThresholdCriterion", "metricName": "BackendLastByteResponseTime", @@ -315,7 +313,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -325,7 +326,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_capacityunits_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_capacityunits_alert.jsonc index 0d66af9..f5d6287 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_capacityunits_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_capacityunits_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,13 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -43,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -70,46 +78,38 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "75", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "75", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -197,6 +197,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -206,9 +209,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -229,6 +228,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -238,9 +240,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -253,15 +252,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway Capacity Units", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -271,27 +275,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "GreaterThan", + "name": "CapacityUnits", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "StaticThresholdCriterion", - "name": "CapacityUnits", - "operator": "GreaterThan", "metricName": "CapacityUnits" } ], @@ -301,17 +301,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-agCapacityUnits')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_computeunits_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_computeunits_alert.jsonc index fb45e2a..8b5ad08 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_computeunits_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_computeunits_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "75", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "75", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -259,6 +258,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway Compute Units", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -279,7 +279,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -289,8 +288,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "ComputeUnits", "operator": "GreaterThan", + "name": "ComputeUnits", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "StaticThresholdCriterion", "metricName": "ComputeUnits" @@ -303,15 +302,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-agComputeUnits')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-agComputeUnits')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_cpuutilization_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_cpuutilization_alert.jsonc index 5c3001e..d63ee6b 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_cpuutilization_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_cpuutilization_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,13 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -43,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -70,46 +78,38 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "80", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -197,6 +197,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -206,9 +209,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -229,6 +228,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -238,9 +240,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -253,15 +252,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway CPU Utilization", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -271,27 +275,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "GreaterThan", + "name": "CpuUtilization", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "StaticThresholdCriterion", - "name": "CpuUtilization", - "operator": "GreaterThan", "metricName": "CpuUtilization" } ], @@ -301,17 +301,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-agCpuUtilization')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_failedrequests_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_failedrequests_alert.jsonc index 4adde40..2d050d9 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_failedrequests_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_failedrequests_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,26 +78,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -122,9 +122,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -181,6 +178,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -193,12 +193,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -221,10 +221,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -239,11 +239,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway FailedRequests", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -251,34 +253,30 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "timeAggregation": "Total", - "name": "FailedRequests", - "operator": "GreaterThan", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, + "operator": "GreaterThan", + "name": "FailedRequests", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "DynamicThresholdCriterion", "metricName": "FailedRequests", @@ -286,7 +284,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -296,7 +297,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_responsestatus_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_responsestatus_alert.jsonc index fa1ab9c..ca5f619 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_responsestatus_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_responsestatus_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,39 +78,43 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" }, "alertSensitivity": { - "metadata": { - "description": "Alert Sensitivity for the alert", - "displayName": "Alert Sensitivity" - }, "allowedValues": [ "Low", "Medium", "High" ], "defaultValue": "Medium", + "metadata": { + "description": "Alert Sensitivity for the alert", + "displayName": "Alert Sensitivity" + }, "type": "String" } }, @@ -222,7 +222,6 @@ "value": "[parameters('alertSensitivity')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -265,6 +264,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway ResponseStatus", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -285,7 +285,6 @@ "value": "[parameters('alertSensitivity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -294,20 +293,20 @@ "allOf": [ { "timeAggregation": "Total", - "name": "ResponseStatus", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, "operator": "GreaterThan", + "name": "ResponseStatus", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "DynamicThresholdCriterion", "metricName": "ResponseStatus", "alertSensitivity": "[parameters('alertSensitivity')]", "dimensions": [ { - "name": "HttpStatusGroup", "operator": "Include", + "name": "HttpStatusGroup", "values": [ "4xx", "5xx" @@ -323,15 +322,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-agResponseStatus')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-agResponseStatus')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_ag_unhealthyhostcount_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_ag_unhealthyhostcount_alert.jsonc index dbcf155..24c25f5 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_ag_unhealthyhostcount_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_ag_unhealthyhostcount_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,13 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -43,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -70,46 +78,38 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "20", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "20", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -190,6 +190,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -199,9 +202,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -222,6 +221,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -231,9 +233,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -246,15 +245,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Gateway Unhealthy Host Count", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -264,27 +268,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "GreaterThan", + "name": "CpuUtilization", "metricNamespace": "Microsoft.Network/applicationgateways", "criterionType": "StaticThresholdCriterion", - "name": "CpuUtilization", - "operator": "GreaterThan", "metricName": "UnhealthyHostCount" } ], @@ -294,17 +294,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-agUnhealthyHostCount')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_alb_datapathavailability_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_alb_datapathavailability_alert.jsonc index 2b40522..5180286 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_alb_datapathavailability_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_alb_datapathavailability_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,13 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -43,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -70,46 +78,38 @@ "4" ], "defaultValue": "0", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -197,6 +197,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -206,9 +209,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -216,7 +216,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -229,6 +228,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -238,9 +240,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -253,15 +252,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ALB Data Path Availability", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -271,27 +275,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "LessThan", + "name": "VipAvailability", "metricNamespace": "Microsoft.Network/loadBalancers", "criterionType": "StaticThresholdCriterion", - "name": "VipAvailability", - "operator": "LessThan", "metricName": "VipAvailability" } ], @@ -301,17 +301,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-ALBDataPathAvailability')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_alb_globalbackendavailability_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_alb_globalbackendavailability_alert.jsonc index 915e8f2..90cafdf 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_alb_globalbackendavailability_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_alb_globalbackendavailability_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -134,9 +134,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -185,6 +182,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -197,12 +197,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -228,10 +228,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -249,11 +249,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Global Backend Availability", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -261,12 +263,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -274,28 +276,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "GlobalBackendAvailability", "operator": "LessThan", + "name": "GlobalBackendAvailability", "metricNamespace": "Microsoft.Network/loadBalancers", "criterionType": "StaticThresholdCriterion", "metricName": "GlobalBackendAvailability" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -305,7 +306,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_alb_healthprobestatus_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_alb_healthprobestatus_alert.jsonc index 2ee04ee..fac78d7 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_alb_healthprobestatus_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_alb_healthprobestatus_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -220,7 +220,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -263,6 +262,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ALB Health Probe Status", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -283,7 +283,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -293,8 +292,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "DipAvailability", "operator": "LessThan", + "name": "DipAvailability", "metricNamespace": "Microsoft.Network/loadBalancers", "criterionType": "StaticThresholdCriterion", "metricName": "DipAvailability" @@ -307,15 +306,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-ALBHealthProbeStatus')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-ALBHealthProbeStatus')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_alb_usedsnatports_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_alb_usedsnatports_alert.jsonc index 4125648..c21c43e 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_alb_usedsnatports_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_alb_usedsnatports_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,13 +21,25 @@ "PT1H" ], "defaultValue": "PT1M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -43,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -70,46 +78,38 @@ "4" ], "defaultValue": "1", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "900", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "900", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -190,6 +190,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -199,9 +202,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -222,6 +221,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -231,9 +233,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -246,15 +245,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ALB Used SNAT Ports", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -264,27 +268,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "GreaterThan", + "name": "UsedSNATPorts", "metricNamespace": "Microsoft.Network/loadBalancers", "criterionType": "StaticThresholdCriterion", - "name": "UsedSNATPorts", - "operator": "GreaterThan", "metricName": "UsedSNATPorts" } ], @@ -294,17 +294,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-ALBUsedSNATPorts')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsin_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsin_alert.jsonc index 7d4e685..63b338a 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsin_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsin_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -252,6 +251,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Direct Connection BitsInPerSecond", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -272,7 +272,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -282,8 +281,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "PortBitsInPerSecond", "operator": "LessThan", + "name": "PortBitsInPerSecond", "metricNamespace": "Microsoft.Network/expressRoutePorts", "criterionType": "StaticThresholdCriterion", "metricName": "PortBitsInPerSecond" @@ -296,15 +295,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-DirectERBitsInAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-DirectERBitsInAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsout_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsout_alert.jsonc index ffaf739..dc7d005 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsout_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutebitsout_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "1", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -252,6 +251,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Direct Connection BitsOutPerSecond", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -272,7 +272,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -282,8 +281,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "PortBitsOutPerSecond", "operator": "LessThan", + "name": "PortBitsOutPerSecond", "metricNamespace": "Microsoft.Network/expressRoutePorts", "criterionType": "StaticThresholdCriterion", "metricName": "PortBitsOutPerSecond" @@ -296,15 +295,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-DirectERBitsOutAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-DirectERBitsOutAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutlineprotocol_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutlineprotocol_alert.jsonc index c291b89..c6e0837 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutlineprotocol_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutlineprotocol_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "0", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "0.9", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "0.9", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -130,9 +130,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -181,6 +178,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -193,12 +193,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -245,11 +245,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Direct Connection LineProtocolPerSecond", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -257,12 +259,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -270,28 +272,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "LineProtocol", "operator": "LessThan", + "name": "LineProtocol", "metricNamespace": "Microsoft.Network/expressRoutePorts", "criterionType": "StaticThresholdCriterion", "metricName": "LineProtocol" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -301,7 +302,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevell_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevell_alert.jsonc index b4afa5f..71661cd 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevell_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevell_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "0", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "0", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -130,9 +130,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -185,6 +182,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -197,12 +197,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -228,10 +228,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -249,11 +249,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Direct Connection RxLightLevelHigh", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -261,12 +263,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -274,28 +276,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "RxLightLevel", "operator": "GreaterThan", + "name": "RxLightLevel", "metricNamespace": "Microsoft.Network/expressRoutePorts", "criterionType": "StaticThresholdCriterion", "metricName": "RxLightLevel" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -305,7 +306,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevellow_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevellow_alert.jsonc index 947c986..99a6b21 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevellow_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressroutrxlightlevellow_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "-10", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "-10", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -130,9 +130,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -185,6 +182,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -197,12 +197,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -228,10 +228,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -249,11 +249,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Direct Connection RxLightLevelLow", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -261,12 +263,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -274,28 +276,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "RxLightLevel", "operator": "LessThan", + "name": "RxLightLevel", "metricNamespace": "Microsoft.Network/expressRoutePorts", "criterionType": "StaticThresholdCriterion", "metricName": "RxLightLevel" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -305,7 +306,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevell_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevell_alert.jsonc index ee26ff3..2d34b7e 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevell_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevell_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,13 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -43,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -70,46 +78,38 @@ "4" ], "defaultValue": "1", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "0", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "0", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -194,6 +194,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -203,9 +206,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -213,7 +213,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -226,6 +225,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -235,9 +237,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -250,15 +249,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Direct Connection TxLightLevelHigh", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -268,27 +272,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "GreaterThan", + "name": "TxLightLevel", "metricNamespace": "Microsoft.Network/expressRoutePorts", "criterionType": "StaticThresholdCriterion", - "name": "TxLightLevel", - "operator": "GreaterThan", "metricName": "TxLightLevel" } ], @@ -298,17 +298,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-DirectERTxLightLevelHighAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevellow_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevellow_alert.jsonc index 485dc6f..5fdab68 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevellow_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_erp_expressrouttxlightlevellow_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "1", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "-10", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "-10", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -130,9 +130,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -185,6 +182,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -197,12 +197,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -228,10 +228,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -249,11 +249,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for ER Direct Connection TxLightLevelLow", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -261,12 +263,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -274,28 +276,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "TxLightLevel", "operator": "LessThan", + "name": "TxLightLevel", "metricNamespace": "Microsoft.Network/expressRoutePorts", "criterionType": "StaticThresholdCriterion", "metricName": "TxLightLevel" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -305,7 +306,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_fd_backendhealth_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_fd_backendhealth_alert.jsonc index 0dde749..364af6f 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_fd_backendhealth_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_fd_backendhealth_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "disabled", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -252,6 +251,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Frontdoor Backend Health Percentage", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -272,7 +272,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -282,8 +281,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "BackendHealthPercentage", "operator": "LessThan", + "name": "BackendHealthPercentage", "metricNamespace": "Microsoft.Network/frontdoors", "criterionType": "StaticThresholdCriterion", "metricName": "BackendHealthPercentage" @@ -296,15 +295,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-BackendHealthPercentage')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-BackendHealthPercentage')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_frontdoorcdn_originhealthpercentage_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_frontdoorcdn_originhealthpercentage_alert.jsonc index fd42ff5..3f78e3f 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_frontdoorcdn_originhealthpercentage_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_frontdoorcdn_originhealthpercentage_alert.jsonc @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-definition-schema.json", "name": "Deploy_FrontDoorCDN_OriginHealthPercentage_Alert", "properties": { - "displayName": "Deploy Frontdoor CDN Profile Origin Health Percentage Alert", + "displayName": "Deploy FrontDoor CDN Profile Origin Health Percentage Alert", "description": "Policy to audit/deploy FrontDoor Origin Health Percentage Alert", "mode": "All", "metadata": { @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,25 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -55,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -252,6 +251,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Frontdoor Origin Health Percentage", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -272,7 +272,6 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -282,8 +281,8 @@ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "OriginHealthPercentage", "operator": "LessThan", + "name": "OriginHealthPercentage", "metricNamespace": "Microsoft.Cdn/profiles", "criterionType": "StaticThresholdCriterion", "metricName": "OriginHealthPercentage" @@ -296,15 +295,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-OriginHealthPercentage')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-OriginHealthPercentage')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_tm_endpointhealth_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_tm_endpointhealth_alert.jsonc index 2a1e1e4..84fbd80 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_tm_endpointhealth_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_tm_endpointhealth_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "0.9", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "0.9", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -130,9 +130,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -181,6 +178,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -193,12 +193,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -245,11 +245,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for Traffic Manager Endpoint Health", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -257,12 +259,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -270,28 +272,24 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "EndpointHealth", "operator": "LessThan", + "name": "EndpointHealth", "metricNamespace": "Microsoft.Network/trafficmanagerprofiles", "criterionType": "StaticThresholdCriterion", "metricName": "ProbeAgentCurrentEndpointStateByProfileResourceId", "dimensions": [ { - "name": "EndpointName", "operator": "Include", + "name": "EndpointName", "values": [ "*" ] @@ -300,7 +298,10 @@ } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -310,7 +311,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_wsf_cpupercentage_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_wsf_cpupercentage_alert.jsonc index 8e08fba..a93e44a 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_wsf_cpupercentage_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_wsf_cpupercentage_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,13 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -43,25 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -70,46 +78,38 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "threshold": { + "defaultValue": "90", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "90", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -190,6 +190,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -199,9 +202,6 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -222,6 +221,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -231,9 +233,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "threshold": { "type": "String" }, @@ -246,15 +245,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Service Plan CPU Percentage", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -264,27 +268,23 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "threshold": { "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", + "operator": "GreaterThan", + "name": "CpuPercentage", "metricNamespace": "Microsoft.Web/serverfarms", "criterionType": "StaticThresholdCriterion", - "name": "CpuPercentage", - "operator": "GreaterThan", "metricName": "CpuPercentage" } ], @@ -294,17 +294,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-CpuPercentage')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Unknown Category/deploy_wsf_memorypercentage_alert.jsonc b/Definitions/policyDefinitions/Unknown Category/deploy_wsf_memorypercentage_alert.jsonc index 31dc3bc..fd4a59e 100644 --- a/Definitions/policyDefinitions/Unknown Category/deploy_wsf_memorypercentage_alert.jsonc +++ b/Definitions/policyDefinitions/Unknown Category/deploy_wsf_memorypercentage_alert.jsonc @@ -13,10 +13,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -25,37 +21,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", - "type": "String" - }, - "enabled": { "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -67,13 +51,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, - "severity": { + "enabled": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" + "description": "Alert state for the alert", + "displayName": "Alert State" }, + "type": "String" + }, + "severity": { "allowedValues": [ "0", "1", @@ -82,34 +78,38 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "threshold": { + "defaultValue": "85", "metadata": { "description": "Threshold for the alert", "displayName": "Threshold" }, - "defaultValue": "85", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -130,9 +130,6 @@ "effect": "[parameters('effect')]", "details": { "type": "Microsoft.Insights/metricAlerts", - "roleDefinitionIds": [ - "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" - ], "existenceCondition": { "allOf": [ { @@ -181,6 +178,9 @@ } ] }, + "roleDefinitionIds": [ + "/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c" + ], "deployment": { "properties": { "parameters": { @@ -193,12 +193,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -224,10 +224,10 @@ "autoMitigate": { "type": "String" }, - "enabled": { + "windowSize": { "type": "String" }, - "windowSize": { + "enabled": { "type": "String" }, "severity": { @@ -245,11 +245,13 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Service Plan Memory Percentage", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -257,12 +259,12 @@ "autoMitigate": { "value": "[parameters('autoMitigate')]" }, - "enabled": { - "value": "[parameters('enabled')]" - }, "windowSize": { "value": "[parameters('windowSize')]" }, + "enabled": { + "value": "[parameters('enabled')]" + }, "severity": { "value": "[parameters('severity')]" }, @@ -270,28 +272,27 @@ "value": "[parameters('threshold')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", - "enabled": "[parameters('enabled')]", "windowSize": "[parameters('windowSize')]", + "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "scopes": [ - "[parameters('resourceId')]" - ], "criteria": { "allOf": [ { "threshold": "[parameters('threshold')]", "timeAggregation": "Average", - "name": "MemoryPercentage", "operator": "GreaterThan", + "name": "MemoryPercentage", "metricNamespace": "Microsoft.Web/serverfarms", "criterionType": "StaticThresholdCriterion", "metricName": "MemoryPercentage" } ], "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" - } + }, + "scopes": [ + "[parameters('resourceId')]" + ] }, "apiVersion": "2018-03-01", "location": "global", @@ -301,7 +302,6 @@ } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" }, "mode": "incremental" diff --git a/Definitions/policyDefinitions/Web Services/deploy_wsf_diskqueuelength_alert.jsonc b/Definitions/policyDefinitions/Web Services/deploy_wsf_diskqueuelength_alert.jsonc index 8e9c81b..b9d5c70 100644 --- a/Definitions/policyDefinitions/Web Services/deploy_wsf_diskqueuelength_alert.jsonc +++ b/Definitions/policyDefinitions/Web Services/deploy_wsf_diskqueuelength_alert.jsonc @@ -7,19 +7,15 @@ "mode": "All", "metadata": { "_deployed_by_amba": "True", - "version": "1.1.0", "alzCloudEnvironments": [ "AzureCloud" ], + "version": "1.1.0", "category": "Web Services", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,13 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, - "windowSize": { + "autoMitigate": { + "allowedValues": [ + "true", + "false" + ], + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" }, + "type": "String" + }, + "windowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -46,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -73,38 +81,30 @@ "4" ], "defaultValue": "2", - "type": "String" - }, - "autoMitigate": { "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" + "description": "Severity of the Alert", + "displayName": "Severity" }, - "allowedValues": [ - "true", - "false" - ], - "defaultValue": "true", "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -193,6 +193,9 @@ "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -202,14 +205,10 @@ "severity": { "value": "[parameters('severity')]" }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" - }, "resourceName": { "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -222,6 +221,9 @@ "evaluationFrequency": { "type": "String" }, + "autoMitigate": { + "type": "String" + }, "windowSize": { "type": "String" }, @@ -231,9 +233,6 @@ "severity": { "type": "String" }, - "autoMitigate": { - "type": "String" - }, "resourceName": { "metadata": { "description": "Name of the resource", @@ -243,15 +242,20 @@ } }, "contentVersion": "1.0.0.0", + "variables": {}, "resources": [ { "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Service Plan Disk Queue Length", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" }, + "autoMitigate": { + "value": "[parameters('autoMitigate')]" + }, "windowSize": { "value": "[parameters('windowSize')]" }, @@ -260,29 +264,25 @@ }, "severity": { "value": "[parameters('severity')]" - }, - "autoMitigate": { - "value": "[parameters('autoMitigate')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", + "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", "severity": "[parameters('severity')]", - "autoMitigate": "[parameters('autoMitigate')]", "criteria": { "allOf": [ { "timeAggregation": "Average", - "metricNamespace": "Microsoft.Web/serverfarms", - "criterionType": "DynamicThresholdCriterion", - "name": "ServiceApiResult", - "operator": "GreaterThan", - "metricName": "DiskQueueLength", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, + "operator": "GreaterThan", + "name": "ServiceApiResult", + "metricNamespace": "Microsoft.Web/serverfarms", + "criterionType": "DynamicThresholdCriterion", + "metricName": "DiskQueueLength", "alertSensitivity": "Medium" } ], @@ -292,17 +292,17 @@ "[parameters('resourceId')]" ] }, - "location": "global", "apiVersion": "2018-03-01", + "location": "global", "name": "[concat(parameters('resourceName'), '-DiskQueueLengthAlert')]", "tags": { "_deployed_by_amba": true } } ], - "variables": {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policyDefinitions/Web Services/deploy_wsf_httpqueuelength_alert.jsonc b/Definitions/policyDefinitions/Web Services/deploy_wsf_httpqueuelength_alert.jsonc index 2f4fa35..fdac3fa 100644 --- a/Definitions/policyDefinitions/Web Services/deploy_wsf_httpqueuelength_alert.jsonc +++ b/Definitions/policyDefinitions/Web Services/deploy_wsf_httpqueuelength_alert.jsonc @@ -16,10 +16,6 @@ }, "parameters": { "evaluationFrequency": { - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Evaluation Frequency" - }, "allowedValues": [ "PT1M", "PT5M", @@ -28,25 +24,25 @@ "PT1H" ], "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Evaluation Frequency" + }, "type": "String" }, "autoMitigate": { - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "Auto Mitigate" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Auto Mitigate" + }, "type": "String" }, "windowSize": { - "metadata": { - "description": "Window size for the alert", - "displayName": "Window Size" - }, "allowedValues": [ "PT1M", "PT5M", @@ -58,25 +54,25 @@ "P1D" ], "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Window Size" + }, "type": "String" }, "enabled": { - "metadata": { - "description": "Alert state for the alert", - "displayName": "Alert State" - }, "allowedValues": [ "true", "false" ], "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Alert State" + }, "type": "String" }, "severity": { - "metadata": { - "description": "Severity of the Alert", - "displayName": "Severity" - }, "allowedValues": [ "0", "1", @@ -85,26 +81,30 @@ "4" ], "defaultValue": "2", + "metadata": { + "description": "Severity of the Alert", + "displayName": "Severity" + }, "type": "String" }, "effect": { - "metadata": { - "description": "Effect of the policy", - "displayName": "Effect" - }, "allowedValues": [ "deployIfNotExists", "disabled" ], "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Effect of the policy", + "displayName": "Effect" + }, "type": "String" }, "monitorDisable": { + "defaultValue": "MonitorDisable", "metadata": { "description": "Tag name to disable monitoring resource. Set to true if monitoring should be disabled", "displayName": "Effect" }, - "defaultValue": "MonitorDisable", "type": "String" } }, @@ -209,7 +209,6 @@ "value": "[field('name')]" } }, - "mode": "incremental", "template": { "parameters": { "resourceId": { @@ -249,6 +248,7 @@ "type": "Microsoft.Insights/metricAlerts", "properties": { "description": "Metric Alert for App Service Plan Http Queue Length", + "evaluationFrequency": "[parameters('evaluationFrequency')]", "parameters": { "evaluationFrequency": { "value": "[parameters('evaluationFrequency')]" @@ -266,7 +266,6 @@ "value": "[parameters('severity')]" } }, - "evaluationFrequency": "[parameters('evaluationFrequency')]", "autoMitigate": "[parameters('autoMitigate')]", "windowSize": "[parameters('windowSize')]", "enabled": "[parameters('enabled')]", @@ -275,12 +274,12 @@ "allOf": [ { "timeAggregation": "Average", - "name": "ServiceApiResult", "failingPeriods": { "numberOfEvaluationPeriods": 2, "minFailingPeriodsToAlert": 2 }, "operator": "GreaterThan", + "name": "ServiceApiResult", "metricNamespace": "Microsoft.Web/serverfarms", "criterionType": "DynamicThresholdCriterion", "metricName": "HttpQueueLength", @@ -294,15 +293,16 @@ ] }, "apiVersion": "2018-03-01", - "name": "[concat(parameters('resourceName'), '-HttpQueueLengthAlert')]", "location": "global", + "name": "[concat(parameters('resourceName'), '-HttpQueueLengthAlert')]", "tags": { "_deployed_by_amba": true } } ], "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#" - } + }, + "mode": "incremental" } } } diff --git a/Definitions/policySetDefinitions/Monitoring/alerting-connectivity.jsonc b/Definitions/policySetDefinitions/Monitoring/alerting-connectivity.jsonc index af40f1a..93cf3a5 100644 --- a/Definitions/policySetDefinitions/Monitoring/alerting-connectivity.jsonc +++ b/Definitions/policySetDefinitions/Monitoring/alerting-connectivity.jsonc @@ -5,10 +5,10 @@ "displayName": "Deploy Azure Monitor Baseline Alerts for Connectivity", "description": "Initiative to deploy AMBA alerts relevant to the ALZ Connectivity management group", "metadata": { - "_deployed_by_amba": true, "alzCloudEnvironments": [ "AzureCloud" ], + "_deployed_by_amba": true, "version": "1.0.3", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" @@ -183,18 +183,6 @@ }, "type": "string" }, - "lbDatapathAvailabilityPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "deployIfNotExists", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "LB Data path Availability Policy Effect" - }, - "type": "string" - }, "lbUsedSNATPortsEvaluationFrequency": { "allowedValues": [ "PT1M", @@ -210,6 +198,18 @@ }, "type": "string" }, + "lbDatapathAvailabilityPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "LB Data path Availability Policy Effect" + }, + "type": "string" + }, "vnetddosAttackEvaluationFrequency": { "allowedValues": [ "PT1M", @@ -240,23 +240,20 @@ }, "type": "string" }, - "lbDatapathAvailabilityWindowSize": { + "lbHealthProbeStatusAlertSeverity": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "PT5M", + "defaultValue": "2", "metadata": { - "description": "Window size for the alert", - "displayName": "LB Data path Availability Window Size" + "description": "Severity of the alert", + "displayName": "LB Health Probe Status Alert Severity" }, - "type": "string" + "type": "String" }, "lbDatapathAvailabilityAlertState": { "defaultValue": "true", @@ -266,20 +263,23 @@ }, "type": "string" }, - "lbHealthProbeStatusAlertSeverity": { + "lbDatapathAvailabilityWindowSize": { "allowedValues": [ - "0", - "1", - "2", - "3", - "4" + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" ], - "defaultValue": "2", + "defaultValue": "PT5M", "metadata": { - "description": "Severity of the alert", - "displayName": "LB Health Probe Status Alert Severity" + "description": "Window size for the alert", + "displayName": "LB Data path Availability Window Size" }, - "type": "String" + "type": "string" }, "pipdDoSAttackEvaluationFrequency": { "allowedValues": [ @@ -335,14 +335,6 @@ }, "type": "string" }, - "lbHealthProbeStatusAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "LB Health Probe Status Alert State" - }, - "type": "string" - }, "pipPacketsInDDoSAlertSeverity": { "allowedValues": [ "0", @@ -358,6 +350,14 @@ }, "type": "String" }, + "lbHealthProbeStatusAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "LB Health Probe Status Alert State" + }, + "type": "string" + }, "lbHealthProbeStatusWindowSize": { "allowedValues": [ "PT1M", @@ -376,18 +376,6 @@ }, "type": "string" }, - "pipPacketsInDDoSPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "disabled", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "PIP Packets In DDoS Policy Effect" - }, - "type": "string" - }, "pipvipAvailabilityWindowSize": { "allowedValues": [ "PT1M", @@ -421,6 +409,18 @@ }, "type": "String" }, + "pipPacketsInDDoSPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "disabled", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "PIP Packets In DDoS Policy Effect" + }, + "type": "string" + }, "pipvipAvailabilityAlertState": { "defaultValue": "true", "metadata": { @@ -429,21 +429,6 @@ }, "type": "string" }, - "pipBytesInDDoSAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "4", - "metadata": { - "description": "Severity of the alert", - "displayName": "PIP Bytes In DDoS Alert Severity" - }, - "type": "String" - }, "lbUsedSNATPortsPolicyEffect": { "allowedValues": [ "deployIfNotExists", @@ -456,13 +441,20 @@ }, "type": "string" }, - "activityUDRUpdateAlertState": { - "defaultValue": "true", + "pipBytesInDDoSAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "4", "metadata": { - "description": "Alert state for the alert", - "displayName": "Activity UDR Update Alert State" + "description": "Severity of the alert", + "displayName": "PIP Bytes In DDoS Alert Severity" }, - "type": "string" + "type": "String" }, "activityNSGDeleteAlertState": { "defaultValue": "true", @@ -495,20 +487,13 @@ }, "type": "string" }, - "pipdDoSAttackAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "1", + "activityUDRUpdateAlertState": { + "defaultValue": "true", "metadata": { - "description": "Severity of the alert", - "displayName": "PIP DDoS Attack Alert Severity" + "description": "Alert state for the alert", + "displayName": "Activity UDR Update Alert State" }, - "type": "String" + "type": "string" }, "vnetddosAttackPolicyEffect": { "allowedValues": [ @@ -522,6 +507,18 @@ }, "type": "string" }, + "pipBytesInDDoSPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "disabled", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "PIP Bytes In DDoS Policy Effect" + }, + "type": "string" + }, "pipPacketsInDDoSAlertState": { "defaultValue": "true", "metadata": { @@ -548,23 +545,44 @@ }, "type": "string" }, - "pipBytesInDDoSPolicyEffect": { + "pipdDoSAttackAlertSeverity": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "disabled", + "defaultValue": "1", "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "PIP Bytes In DDoS Policy Effect" + "description": "Severity of the alert", + "displayName": "PIP DDoS Attack Alert Severity" + }, + "type": "String" + }, + "lbUsedSNATPortsWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "LB Used SNAT Ports Window Size" }, "type": "string" }, - "pipPacketsInDDoSThreshold": { - "defaultValue": "40000", + "lbUsedSNATPortsAlertState": { + "defaultValue": "true", "metadata": { - "description": "Threshold for the alert", - "displayName": "PIP Packets In DDoS Threshold" + "description": "Alert state for the alert", + "displayName": "LB Used SNAT Ports Alert State" }, "type": "string" }, @@ -580,33 +598,23 @@ }, "type": "string" }, - "lbUsedSNATPortsWindowSize": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" - ], - "defaultValue": "PT5M", + "pipPacketsInDDoSThreshold": { + "defaultValue": "40000", "metadata": { - "description": "Window size for the alert", - "displayName": "LB Used SNAT Ports Window Size" + "description": "Threshold for the alert", + "displayName": "PIP Packets In DDoS Threshold" }, "type": "string" }, - "lbUsedSNATPortsAlertState": { + "vnetddosAttackAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "LB Used SNAT Ports Alert State" + "displayName": "VNET DDoS Attack Alert State" }, "type": "string" }, - "vnetddosAttackWindowSize": { + "pipBytesInDDoSWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -620,11 +628,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "VNET DDoS Attack Window Size" + "displayName": "PIP Bytes In DDoS Window Size" }, "type": "string" }, - "pipBytesInDDoSWindowSize": { + "vnetddosAttackWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -638,15 +646,7 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "PIP Bytes In DDoS Window Size" - }, - "type": "string" - }, - "vnetddosAttackAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "VNET DDoS Attack Alert State" + "displayName": "VNET DDoS Attack Window Size" }, "type": "string" }, @@ -666,22 +666,6 @@ }, "type": "string" }, - "pipdDoSAttackAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "PIP DDoS Attack Alert State" - }, - "type": "string" - }, - "vnetddosAttackThreshold": { - "defaultValue": "1", - "metadata": { - "description": "Threshold for the alert", - "displayName": "VNET DDoS Attack Threshold" - }, - "type": "string" - }, "pipdDoSAttackWindowSize": { "allowedValues": [ "PT1M", @@ -700,6 +684,22 @@ }, "type": "string" }, + "pipdDoSAttackAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "PIP DDoS Attack Alert State" + }, + "type": "string" + }, + "vnetddosAttackThreshold": { + "defaultValue": "1", + "metadata": { + "description": "Threshold for the alert", + "displayName": "VNET DDoS Attack Threshold" + }, + "type": "string" + }, "pipdDoSAttackThreshold": { "defaultValue": "0", "metadata": { @@ -1105,7 +1105,7 @@ }, "type": "string" }, - "pdnszQueryVolumeEvaluationFrequency": { + "vnetGwTunnelEgressEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1113,14 +1113,14 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1H", + "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "PDNSZ Query Volume Evaluation Frequency" + "displayName": "Vnet Gw Tunnel Egress Evaluation Frequency" }, "type": "string" }, - "pdnszQueryVolumePolicyEffect": { + "vnetGwTunnelEgressPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -1128,27 +1128,27 @@ "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "PDNSZ Query Volume Policy Effect" + "displayName": "Vnet Gw Tunnel Egress Policy Effect" }, "type": "string" }, - "pdnszQueryVolumeAlertState": { + "vnetGwTunnelEgressAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "PDNSZ Query Volume Alert State" + "displayName": "Vnet Gw Tunnel Egress Alert State" }, "type": "string" }, - "pdnszQueryVolumeThreshold": { - "defaultValue": "500", + "vnetGwTunnelEgressThreshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", - "displayName": "PDNSZ Query Volume Threshold" + "displayName": "Vnet Gw Tunnel Egress Threshold" }, "type": "string" }, - "pdnszRecordSetCapacityAlertSeverity": { + "vnetGwTunnelIngressAlertSeverity": { "allowedValues": [ "0", "1", @@ -1156,14 +1156,14 @@ "3", "4" ], - "defaultValue": "2", + "defaultValue": "0", "metadata": { "description": "Severity of the alert", - "displayName": "PDNSZ Record Set Capacity Alert Severity" + "displayName": "Vnet Gw Tunnel Ingress Alert Severity" }, "type": "String" }, - "pdnszRecordSetCapacityWindowSize": { + "vnetGwTunnelIngressWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -1174,14 +1174,14 @@ "PT12H", "P1D" ], - "defaultValue": "PT1H", + "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "PDNSZ Record Set Capacity Window Size" + "displayName": "Vnet Gw Tunnel Ingress Window Size" }, "type": "string" }, - "pdnszRecordSetCapacityEvaluationFrequency": { + "vnetGwTunnelIngressEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1189,42 +1189,42 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1H", + "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "PDNSZ Record Set Capacity Evaluation Frequency" + "displayName": "Vnet Gw Tunnel Ingress Evaluation Frequency" }, "type": "string" }, - "pdnszRecordSetCapacityPolicyEffect": { + "vnetGwTunnelIngressPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "PDNSZ Record Set Capacity Policy Effect" + "displayName": "Vnet Gw Tunnel Ingress Policy Effect" }, "type": "string" }, - "pdnszRecordSetCapacityAlertState": { + "vnetGwTunnelIngressAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "PDNSZ Record Set Capacity Alert State" + "displayName": "Vnet Gw Tunnel Ingress Alert State" }, "type": "string" }, - "pdnszRecordSetCapacityThreshold": { - "defaultValue": "80", + "vnetGwTunnelIngressThreshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", - "displayName": "PDNSZ Record Set Capacity Threshold" + "displayName": "Vnet Gw Tunnel Ingress Threshold" }, "type": "string" }, - "pdnszRegistrationCapacityUtilAlertSeverity": { + "vpngwBandWidthUtilAlertSeverity": { "allowedValues": [ "0", "1", @@ -1232,14 +1232,14 @@ "3", "4" ], - "defaultValue": "2", + "defaultValue": "0", "metadata": { "description": "Severity of the alert", - "displayName": "PDNSZ Registration Capacity Util Alert Severity" + "displayName": "VPN GW Band Width Util Alert Severity" }, "type": "String" }, - "pdnszRegistrationCapacityUtilWindowSize": { + "vpngwBandWidthUtilWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -1250,14 +1250,14 @@ "PT12H", "P1D" ], - "defaultValue": "PT1H", + "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "PDNSZ Registration Capacity Util Window Size" + "displayName": "VPN GW Band Width Util Window Size" }, "type": "string" }, - "pdnszRegistrationCapacityUtilEvaluationFrequency": { + "vpngwBandWidthUtilEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1265,14 +1265,14 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1H", + "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "PDNSZ Registration Capacity Util Evaluation Frequency" + "displayName": "VPN GW Band Width Util Evaluation Frequency" }, "type": "string" }, - "pdnszRegistrationCapacityUtilPolicyEffect": { + "vpngwBandWidthUtilPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -1280,27 +1280,27 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "PDNSZ Registration Capacity Util Policy Effect" + "displayName": "VPN GW Band Width Util Policy Effect" }, "type": "string" }, - "pdnszRegistrationCapacityUtilAlertState": { + "vpngwBandWidthUtilAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "PDNSZ Registration Capacity Util Alert State" + "displayName": "VPN GW Band Width Util Alert State" }, "type": "string" }, - "pdnszRegistrationCapacityUtilThreshold": { - "defaultValue": "80", + "vpngwBandWidthUtilThreshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", - "displayName": "PDNSZ Registration Capacity Util Threshold" + "displayName": "VPN GW Band Width Util Threshold" }, "type": "string" }, - "pdnszQueryVolumeAlertSeverity": { + "vpngwEgressAlertSeverity": { "allowedValues": [ "0", "1", @@ -1308,75 +1308,75 @@ "3", "4" ], - "defaultValue": "4", + "defaultValue": "0", "metadata": { "description": "Severity of the alert", - "displayName": "PDNSZ Query Volume Alert Severity" + "displayName": "VPN GW Egress Alert Severity" }, "type": "String" }, - "pdnszCapacityUtilThreshold": { - "defaultValue": "80", + "vpngwEgressWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT5M", "metadata": { - "description": "Threshold for the alert", - "displayName": "PDNSZ Capacity Util Threshold" + "description": "Window size for the alert", + "displayName": "VPN GW Egress Window Size" }, "type": "string" }, - "pdnszCapacityUtilAlertState": { - "defaultValue": "true", + "vpngwEgressEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", "metadata": { - "description": "Alert state for the alert", - "displayName": "PDNSZ Capacity Util Alert State" + "description": "Evaluation frequency for the alert", + "displayName": "VPN GW Egress Evaluation Frequency" }, "type": "string" }, - "pdnszCapacityUtilPolicyEffect": { + "vpngwEgressPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "PDNSZ Capacity Util Policy Effect" + "displayName": "VPN GW Egress Policy Effect" }, "type": "string" }, - "pdnszCapacityUtilEvaluationFrequency": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" - ], - "defaultValue": "PT1H", + "vpngwEgressAlertState": { + "defaultValue": "true", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "PDNSZ Capacity Util Evaluation Frequency" + "description": "Alert state for the alert", + "displayName": "VPN GW Egress Alert State" }, "type": "string" }, - "pdnszCapacityUtilWindowSize": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" - ], - "defaultValue": "PT1H", + "vpngwEgressThreshold": { + "defaultValue": "1", "metadata": { - "description": "Window size for the alert", - "displayName": "PDNSZ Capacity Util Window Size" + "description": "Threshold for the alert", + "displayName": "VPN GW Egress Threshold" }, "type": "string" }, - "pdnszCapacityUtilAlertSeverity": { + "vpngwTunnelEgressPacketDropCountAlertSeverity": { "allowedValues": [ "0", "1", @@ -1384,34 +1384,32 @@ "3", "4" ], - "defaultValue": "2", + "defaultValue": "3", "metadata": { "description": "Severity of the alert", - "displayName": "PDNSZ Capacity Util Alert Severity" + "displayName": "VPN GW Tunnel Egress Packet Drop Count Alert Severity" }, "type": "String" }, - "vpngwTunnelIngressPacketDropMismatchAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Alert State" - }, - "type": "string" - }, - "vpngwTunnelIngressPacketDropMismatchPolicyEffect": { + "vpngwTunnelEgressPacketDropCountWindowSize": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "PT5M", "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Policy Effect" + "description": "Window size for the alert", + "displayName": "VPN GW Tunnel Egress Packet Drop Count Window Size" }, "type": "string" }, - "vpngwTunnelIngressPacketDropMismatchFrequency": { + "vpngwTunnelEgressPacketDropCountFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1422,29 +1420,27 @@ "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Frequency" + "displayName": "VPN GW Tunnel Egress Packet Drop Count Frequency" }, "type": "string" }, - "vpngwTunnelIngressPacketDropMismatchWindowSize": { + "vpngwTunnelEgressPacketDropCountPolicyEffect": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" + "deployIfNotExists", + "disabled" ], - "defaultValue": "PT5M", + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Window size for the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Window Size" + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "VPN GW Tunnel Egress Packet Drop Count Policy Effect" }, "type": "string" }, - "vpngwTunnelIngressPacketDropMismatchAlertSeverity": { + "vpngwTunnelEgressPacketDropCountAlertState": { + "defaultValue": "true", + "type": "string" + }, + "vpngwTunnelEgressPacketDropMismatchAlertSeverity": { "allowedValues": [ "0", "1", @@ -1455,19 +1451,44 @@ "defaultValue": "3", "metadata": { "description": "Severity of the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Alert Severity" + "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Alert Severity" }, "type": "String" }, - "vpngwTunnelIngressPacketDropCountAlertState": { - "defaultValue": "true", + "vpngwTunnelEgressPacketDropMismatchWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT5M", "metadata": { - "description": "Alert state for the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Count Alert State" + "description": "Window size for the alert", + "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Window Size" }, "type": "string" }, - "vpngwTunnelIngressPacketDropCountPolicyEffect": { + "vpngwTunnelEgressPacketDropMismatchFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Frequency" + }, + "type": "string" + }, + "vpngwTunnelEgressPacketDropMismatchPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -1475,26 +1496,34 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Count Policy Effect" + "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Policy Effect" }, "type": "string" }, - "vpngwTunnelIngressPacketDropCountFrequency": { + "vpngwTunnelEgressPacketDropMismatchAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Alert State" + }, + "type": "string" + }, + "vpngwIngressAlertSeverity": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "PT5M", + "defaultValue": "0", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Count Frequency" + "description": "Severity of the alert", + "displayName": "VPN GW Ingress Alert Severity" }, "type": "string" }, - "vpngwTunnelIngressPacketDropCountWindowSize": { + "vpngwIngressWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -1508,30 +1537,42 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Count Window Size" + "displayName": "VPN GW Ingress Window Size" }, "type": "string" }, - "vpngwTunnelIngressPacketDropCountAlertSeverity": { + "vpngwIngressEvaluationFrequency": { "allowedValues": [ - "0", - "1", - "2", - "3", - "4" + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" ], - "defaultValue": "3", + "defaultValue": "PT5M", "metadata": { - "description": "Severity of the alert", - "displayName": "VPN GW Tunnel Ingress Packet Drop Count Alert Severity" + "description": "Evaluation frequency for the alert", + "displayName": "VPN GW Ingress Evaluation Frequency" }, - "type": "String" + "type": "string" }, - "vpngwIngressAutoMitigate": { + "vpngwIngressPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "disabled", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "VPN GW Ingress Policy Effect" + }, + "type": "string" + }, + "vpngwIngressAlertState": { "defaultValue": "true", "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "VPN GW Ingress Auto Mitigate" + "description": "Alert state for the alert", + "displayName": "VPN GW Ingress Alert State" }, "type": "string" }, @@ -1543,75 +1584,83 @@ }, "type": "string" }, - "vpngwIngressAlertState": { + "vpngwIngressAutoMitigate": { "defaultValue": "true", "metadata": { - "description": "Alert state for the alert", - "displayName": "VPN GW Ingress Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "VPN GW Ingress Auto Mitigate" }, "type": "string" }, - "vpngwIngressPolicyEffect": { + "vpngwTunnelIngressPacketDropCountAlertSeverity": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "disabled", + "defaultValue": "3", "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "VPN GW Ingress Policy Effect" + "description": "Severity of the alert", + "displayName": "VPN GW Tunnel Ingress Packet Drop Count Alert Severity" }, - "type": "string" + "type": "String" }, - "vpngwIngressEvaluationFrequency": { + "vpngwTunnelIngressPacketDropCountWindowSize": { "allowedValues": [ "PT1M", "PT5M", "PT15M", "PT30M", - "PT1H" + "PT1H", + "PT6H", + "PT12H", + "P1D" ], "defaultValue": "PT5M", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "VPN GW Ingress Evaluation Frequency" + "description": "Window size for the alert", + "displayName": "VPN GW Tunnel Ingress Packet Drop Count Window Size" }, "type": "string" }, - "vpngwIngressWindowSize": { + "vpngwTunnelIngressPacketDropCountFrequency": { "allowedValues": [ "PT1M", "PT5M", "PT15M", "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" + "PT1H" ], "defaultValue": "PT5M", "metadata": { - "description": "Window size for the alert", - "displayName": "VPN GW Ingress Window Size" + "description": "Evaluation frequency for the alert", + "displayName": "VPN GW Tunnel Ingress Packet Drop Count Frequency" }, "type": "string" }, - "vpngwIngressAlertSeverity": { + "vpngwTunnelIngressPacketDropCountPolicyEffect": { "allowedValues": [ - "0", - "1", - "2", - "3", - "4" + "deployIfNotExists", + "disabled" ], - "defaultValue": "0", + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Severity of the alert", - "displayName": "VPN GW Ingress Alert Severity" + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "VPN GW Tunnel Ingress Packet Drop Count Policy Effect" }, "type": "string" }, - "erGwExpressRouteBitsInAlertSeverity": { + "vpngwTunnelIngressPacketDropCountAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "VPN GW Tunnel Ingress Packet Drop Count Alert State" + }, + "type": "string" + }, + "vpngwTunnelIngressPacketDropMismatchAlertSeverity": { "allowedValues": [ "0", "1", @@ -1619,14 +1668,14 @@ "3", "4" ], - "defaultValue": "0", + "defaultValue": "3", "metadata": { "description": "Severity of the alert", - "displayName": "ER Gw Express Route Bits In Alert Severity" + "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Alert Severity" }, "type": "String" }, - "erGwExpressRouteBitsInWindowSize": { + "vpngwTunnelIngressPacketDropMismatchWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -1640,11 +1689,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "ER Gw Express Route Bits In Window Size" + "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Window Size" }, "type": "string" }, - "erGwExpressRouteBitsInEvaluationFrequency": { + "vpngwTunnelIngressPacketDropMismatchFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1655,39 +1704,31 @@ "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "ER Gw Express Route Bits In Evaluation Frequency" + "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Frequency" }, "type": "string" }, - "erGwExpressRouteBitsInPolicyEffect": { + "vpngwTunnelIngressPacketDropMismatchPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "disabled", + "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "ER Gw Express Route Bits In Policy Effect" + "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Policy Effect" }, "type": "string" }, - "erGwExpressRouteBitsInAlertState": { + "vpngwTunnelIngressPacketDropMismatchAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "ER Gw Express Route Bits In Alert State" - }, - "type": "string" - }, - "erGwExpressRouteBitsInThreshold": { - "defaultValue": "1", - "metadata": { - "description": "Threshold for the alert", - "displayName": "ER Gw Express Route Bits In Threshold" + "displayName": "VPN GW Tunnel Ingress Packet Drop Mismatch Alert State" }, "type": "string" }, - "erGwExpressRouteBitsOutAlertSeverity": { + "pdnszCapacityUtilAlertSeverity": { "allowedValues": [ "0", "1", @@ -1695,14 +1736,14 @@ "3", "4" ], - "defaultValue": "0", + "defaultValue": "2", "metadata": { "description": "Severity of the alert", - "displayName": "ER Gw Express Route Bits Out Alert Severity" + "displayName": "PDNSZ Capacity Util Alert Severity" }, "type": "String" }, - "erGwExpressRouteBitsOutWindowSize": { + "pdnszCapacityUtilWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -1713,14 +1754,14 @@ "PT12H", "P1D" ], - "defaultValue": "PT5M", + "defaultValue": "PT1H", "metadata": { "description": "Window size for the alert", - "displayName": "ER Gw Express Route Bits Out Window Size" + "displayName": "PDNSZ Capacity Util Window Size" }, "type": "string" }, - "erGwExpressRouteBitsOutEvaluationFrequency": { + "pdnszCapacityUtilEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1728,42 +1769,42 @@ "PT30M", "PT1H" ], - "defaultValue": "PT5M", + "defaultValue": "PT1H", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "ER Gw Express Route Bits Out Evaluation Frequency" + "displayName": "PDNSZ Capacity Util Evaluation Frequency" }, "type": "string" }, - "erGwExpressRouteBitsOutPolicyEffect": { + "pdnszCapacityUtilPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "disabled", + "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "ER Gw Express Route Bits Out Policy Effect" + "displayName": "PDNSZ Capacity Util Policy Effect" }, "type": "string" }, - "erGwExpressRouteBitsOutAlertState": { + "pdnszCapacityUtilAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "ER Gw Express Route Bits Out Alert State" + "displayName": "PDNSZ Capacity Util Alert State" }, "type": "string" }, - "erGwExpressRouteBitsOutThreshold": { - "defaultValue": "1", + "pdnszCapacityUtilThreshold": { + "defaultValue": "80", "metadata": { "description": "Threshold for the alert", - "displayName": "ER Gw Express Route Bits Out Threshold" + "displayName": "PDNSZ Capacity Util Threshold" }, "type": "string" }, - "erGwExpressRouteCpuUtilAlertSeverity": { + "pdnszQueryVolumeAlertSeverity": { "allowedValues": [ "0", "1", @@ -1771,14 +1812,14 @@ "3", "4" ], - "defaultValue": "1", + "defaultValue": "4", "metadata": { "description": "Severity of the alert", - "displayName": "ER Gw Express Route Cpu Util Alert Severity" + "displayName": "PDNSZ Query Volume Alert Severity" }, "type": "String" }, - "erGwExpressRouteCpuUtilWindowSize": { + "pdnszQueryVolumeWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -1789,14 +1830,14 @@ "PT12H", "P1D" ], - "defaultValue": "PT5M", + "defaultValue": "PT1H", "metadata": { "description": "Window size for the alert", - "displayName": "ER Gw Express Route Cpu Util Window Size" + "displayName": "PDNSZ Query Volume Window Size" }, "type": "string" }, - "erGwExpressRouteCpuUtilEvaluationFrequency": { + "pdnszQueryVolumeEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1804,114 +1845,118 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1M", + "defaultValue": "PT1H", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "ER Gw Express Route Cpu Util Evaluation Frequency" + "displayName": "PDNSZ Query Volume Evaluation Frequency" }, "type": "string" }, - "erGwExpressRouteCpuUtilPolicyEffect": { + "pdnszQueryVolumePolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "ER Gw Express Route Cpu Util Policy Effect" + "displayName": "PDNSZ Query Volume Policy Effect" }, "type": "string" }, - "erGwExpressRouteCpuUtilAlertState": { + "pdnszQueryVolumeAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "ER Gw Express Route Cpu Util Alert State" + "displayName": "PDNSZ Query Volume Alert State" }, "type": "string" }, - "erGwExpressRouteCpuUtilThreshold": { - "defaultValue": "80", + "pdnszQueryVolumeThreshold": { + "defaultValue": "500", "metadata": { "description": "Threshold for the alert", - "displayName": "ER Gw Express Route Cpu Util Threshold" - }, - "type": "string" - }, - "vpngwTunnelEgressPacketDropMismatchAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Alert State" + "displayName": "PDNSZ Query Volume Threshold" }, "type": "string" }, - "vpngwTunnelEgressPacketDropMismatchPolicyEffect": { + "pdnszRecordSetCapacityAlertSeverity": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "2", "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Policy Effect" + "description": "Severity of the alert", + "displayName": "PDNSZ Record Set Capacity Alert Severity" }, - "type": "string" + "type": "String" }, - "vpngwTunnelEgressPacketDropMismatchFrequency": { + "pdnszRecordSetCapacityWindowSize": { "allowedValues": [ "PT1M", "PT5M", "PT15M", "PT30M", - "PT1H" + "PT1H", + "PT6H", + "PT12H", + "P1D" ], - "defaultValue": "PT5M", + "defaultValue": "PT1H", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Frequency" + "description": "Window size for the alert", + "displayName": "PDNSZ Record Set Capacity Window Size" }, "type": "string" }, - "vpngwTunnelEgressPacketDropMismatchWindowSize": { + "pdnszRecordSetCapacityEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", "PT15M", "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" + "PT1H" ], - "defaultValue": "PT5M", + "defaultValue": "PT1H", "metadata": { - "description": "Window size for the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Window Size" + "description": "Evaluation frequency for the alert", + "displayName": "PDNSZ Record Set Capacity Evaluation Frequency" }, "type": "string" }, - "vpngwTunnelEgressPacketDropMismatchAlertSeverity": { + "pdnszRecordSetCapacityPolicyEffect": { "allowedValues": [ - "0", - "1", - "2", - "3", - "4" + "deployIfNotExists", + "disabled" ], - "defaultValue": "3", + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Severity of the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Mismatch Alert Severity" + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "PDNSZ Record Set Capacity Policy Effect" }, - "type": "String" + "type": "string" }, - "vpngwTunnelEgressPacketDropCountAlertState": { + "pdnszRecordSetCapacityAlertState": { "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "PDNSZ Record Set Capacity Alert State" + }, "type": "string" }, - "vnetGwTunnelEgressPacketDropCountAlertSeverity": { + "pdnszRecordSetCapacityThreshold": { + "defaultValue": "80", + "metadata": { + "description": "Threshold for the alert", + "displayName": "PDNSZ Record Set Capacity Threshold" + }, + "type": "string" + }, + "pdnszRegistrationCapacityUtilAlertSeverity": { "allowedValues": [ "0", "1", @@ -1919,14 +1964,14 @@ "3", "4" ], - "defaultValue": "1", + "defaultValue": "2", "metadata": { "description": "Severity of the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Alert Severity" + "displayName": "PDNSZ Registration Capacity Util Alert Severity" }, "type": "String" }, - "vnetGwTunnelEgressPacketDropCountWindowSize": { + "pdnszRegistrationCapacityUtilWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -1937,14 +1982,14 @@ "PT12H", "P1D" ], - "defaultValue": "PT5M", + "defaultValue": "PT1H", "metadata": { "description": "Window size for the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Window Size" + "displayName": "PDNSZ Registration Capacity Util Window Size" }, "type": "string" }, - "vnetGwTunnelEgressPacketDropCountEvaluationFrequency": { + "pdnszRegistrationCapacityUtilEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -1952,14 +1997,14 @@ "PT30M", "PT1H" ], - "defaultValue": "PT5M", + "defaultValue": "PT1H", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Evaluation Frequency" + "displayName": "PDNSZ Registration Capacity Util Evaluation Frequency" }, "type": "string" }, - "vnetGwTunnelEgressPacketDropCountPolicyEffect": { + "pdnszRegistrationCapacityUtilPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -1967,19 +2012,27 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Policy Effect" + "displayName": "PDNSZ Registration Capacity Util Policy Effect" }, "type": "string" }, - "vnetGwTunnelEgressPacketDropCountAlertState": { + "pdnszRegistrationCapacityUtilAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Alert State" + "displayName": "PDNSZ Registration Capacity Util Alert State" }, "type": "string" }, - "vnetGwTunnelEgressPacketDropMismatchAlertSeverity": { + "pdnszRegistrationCapacityUtilThreshold": { + "defaultValue": "80", + "metadata": { + "description": "Threshold for the alert", + "displayName": "PDNSZ Registration Capacity Util Threshold" + }, + "type": "string" + }, + "erGwExpressRouteBitsInAlertSeverity": { "allowedValues": [ "0", "1", @@ -1987,14 +2040,14 @@ "3", "4" ], - "defaultValue": "3", + "defaultValue": "0", "metadata": { "description": "Severity of the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Alert Severity" + "displayName": "ER Gw Express Route Bits In Alert Severity" }, "type": "String" }, - "vnetGwTunnelEgressPacketDropMismatchWindowSize": { + "erGwExpressRouteBitsInWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2008,11 +2061,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Window Size" + "displayName": "ER Gw Express Route Bits In Window Size" }, "type": "string" }, - "vnetGwTunnelEgressPacketDropMismatchEvaluationFrequency": { + "erGwExpressRouteBitsInEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2023,31 +2076,39 @@ "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Evaluation Frequency" + "displayName": "ER Gw Express Route Bits In Evaluation Frequency" }, "type": "string" }, - "vnetGwTunnelEgressPacketDropMismatchPolicyEffect": { + "erGwExpressRouteBitsInPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Policy Effect" + "displayName": "ER Gw Express Route Bits In Policy Effect" }, "type": "string" }, - "vnetGwTunnelEgressPacketDropMismatchAlertState": { + "erGwExpressRouteBitsInAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Alert State" + "displayName": "ER Gw Express Route Bits In Alert State" }, "type": "string" }, - "vnetGwExpressRouteBitsPerSecondAlertSeverity": { + "erGwExpressRouteBitsInThreshold": { + "defaultValue": "1", + "metadata": { + "description": "Threshold for the alert", + "displayName": "ER Gw Express Route Bits In Threshold" + }, + "type": "string" + }, + "erGwExpressRouteBitsOutAlertSeverity": { "allowedValues": [ "0", "1", @@ -2058,11 +2119,11 @@ "defaultValue": "0", "metadata": { "description": "Severity of the alert", - "displayName": "Vnet Gw Express Route Bits Per Second Alert Severity" + "displayName": "ER Gw Express Route Bits Out Alert Severity" }, "type": "String" }, - "vnetGwExpressRouteBitsPerSecondWindowSize": { + "erGwExpressRouteBitsOutWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2076,11 +2137,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "Vnet Gw Express Route Bits Per Second Window Size" + "displayName": "ER Gw Express Route Bits Out Window Size" }, "type": "string" }, - "vnetGwExpressRouteBitsPerSecondEvaluationFrequency": { + "erGwExpressRouteBitsOutEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2088,42 +2149,42 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1M", + "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "Vnet Gw Express Route Bits Per Second Evaluation Frequency" + "displayName": "ER Gw Express Route Bits Out Evaluation Frequency" }, "type": "string" }, - "vnetGwExpressRouteBitsPerSecondPolicyEffect": { + "erGwExpressRouteBitsOutPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Vnet Gw Express Route Bits Per Second Policy Effect" + "displayName": "ER Gw Express Route Bits Out Policy Effect" }, "type": "string" }, - "vnetGwExpressRouteBitsPerSecondAlertState": { + "erGwExpressRouteBitsOutAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Vnet Gw Express Route Bits Per Second Alert State" + "displayName": "ER Gw Express Route Bits Out Alert State" }, "type": "string" }, - "vnetGwExpressRouteBitsPerSecondThreshold": { + "erGwExpressRouteBitsOutThreshold": { "defaultValue": "1", "metadata": { "description": "Threshold for the alert", - "displayName": "Vnet Gw Express Route Bits Per Second Threshold" + "displayName": "ER Gw Express Route Bits Out Threshold" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropMismatchAlertSeverity": { + "erGwExpressRouteCpuUtilAlertSeverity": { "allowedValues": [ "0", "1", @@ -2131,14 +2192,14 @@ "3", "4" ], - "defaultValue": "3", + "defaultValue": "1", "metadata": { "description": "Severity of the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Alert Severity" + "displayName": "ER Gw Express Route Cpu Util Alert Severity" }, "type": "String" }, - "vnetGwTunnelIngressPacketDropMismatchWindowSize": { + "erGwExpressRouteCpuUtilWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2152,11 +2213,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Window Size" + "displayName": "ER Gw Express Route Cpu Util Window Size" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropMismatchEvaluationFrequency": { + "erGwExpressRouteCpuUtilEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2164,14 +2225,14 @@ "PT30M", "PT1H" ], - "defaultValue": "PT5M", + "defaultValue": "PT1M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Evaluation Frequency" + "displayName": "ER Gw Express Route Cpu Util Evaluation Frequency" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropMismatchPolicyEffect": { + "erGwExpressRouteCpuUtilPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -2179,19 +2240,27 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Policy Effect" + "displayName": "ER Gw Express Route Cpu Util Policy Effect" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropMismatchAlertState": { + "erGwExpressRouteCpuUtilAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Alert State" + "displayName": "ER Gw Express Route Cpu Util Alert State" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropCountAlertSeverity": { + "erGwExpressRouteCpuUtilThreshold": { + "defaultValue": "80", + "metadata": { + "description": "Threshold for the alert", + "displayName": "ER Gw Express Route Cpu Util Threshold" + }, + "type": "string" + }, + "vnetGwTunnelEgressPacketDropCountAlertSeverity": { "allowedValues": [ "0", "1", @@ -2199,14 +2268,14 @@ "3", "4" ], - "defaultValue": "3", + "defaultValue": "1", "metadata": { "description": "Severity of the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Alert Severity" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Alert Severity" }, "type": "String" }, - "vnetGwTunnelIngressPacketDropCountWindowSize": { + "vnetGwTunnelEgressPacketDropCountWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2220,11 +2289,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Window Size" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Window Size" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropCountEvaluationFrequency": { + "vnetGwTunnelEgressPacketDropCountEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2235,11 +2304,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Evaluation Frequency" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Evaluation Frequency" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropCountPolicyEffect": { + "vnetGwTunnelEgressPacketDropCountPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -2247,19 +2316,19 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Policy Effect" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Policy Effect" }, "type": "string" }, - "vnetGwTunnelIngressPacketDropCountAlertState": { + "vnetGwTunnelEgressPacketDropCountAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Alert State" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Count Alert State" }, "type": "string" }, - "ercirBgpAvailabilityAlertSeverity": { + "vnetGwTunnelEgressPacketDropMismatchAlertSeverity": { "allowedValues": [ "0", "1", @@ -2267,14 +2336,14 @@ "3", "4" ], - "defaultValue": "0", + "defaultValue": "3", "metadata": { "description": "Severity of the alert", - "displayName": "ERCIR Bgp Availability Alert Severity" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Alert Severity" }, "type": "String" }, - "ercirBgpAvailabilityWindowSize": { + "vnetGwTunnelEgressPacketDropMismatchWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2288,11 +2357,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "ERCIR Bgp Availability Window Size" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Window Size" }, "type": "string" }, - "ercirBgpAvailabilityEvaluationFrequency": { + "vnetGwTunnelEgressPacketDropMismatchEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2300,14 +2369,14 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1M", + "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "ERCIR Bgp Availability Evaluation Frequency" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Evaluation Frequency" }, "type": "string" }, - "ercirBgpAvailabilityPolicyEffect": { + "vnetGwTunnelEgressPacketDropMismatchPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -2315,27 +2384,19 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "ERCIR Bgp Availability Policy Effect" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Policy Effect" }, "type": "string" }, - "ercirBgpAvailabilityAlertState": { + "vnetGwTunnelEgressPacketDropMismatchAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "ERCIR Bgp Availability Alert State" - }, - "type": "string" - }, - "ercirBgpAvailabilityThreshold": { - "defaultValue": "90", - "metadata": { - "description": "Threshold for the alert", - "displayName": "ERCIR Bgp Availability Threshold" + "displayName": "Vnet Gw Tunnel Egress Packet Drop Mismatch Alert State" }, "type": "string" }, - "ercirArpAvailabilityAlertSeverity": { + "vnetGwExpressRouteBitsPerSecondAlertSeverity": { "allowedValues": [ "0", "1", @@ -2346,11 +2407,11 @@ "defaultValue": "0", "metadata": { "description": "Severity of the alert", - "displayName": "ERCIR Arp Availability Alert Severity" + "displayName": "Vnet Gw Express Route Bits Per Second Alert Severity" }, "type": "String" }, - "ercirArpAvailabilityWindowSize": { + "vnetGwExpressRouteBitsPerSecondWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2364,11 +2425,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "ERCIR Arp Availability Window Size" + "displayName": "Vnet Gw Express Route Bits Per Second Window Size" }, "type": "string" }, - "ercirArpAvailabilityFrequency": { + "vnetGwExpressRouteBitsPerSecondEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2379,11 +2440,11 @@ "defaultValue": "PT1M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "ERCIR Arp Availability Frequency" + "displayName": "Vnet Gw Express Route Bits Per Second Evaluation Frequency" }, "type": "string" }, - "ercirArpAvailabilityPolicyEffect": { + "vnetGwExpressRouteBitsPerSecondPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -2391,27 +2452,27 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "ERCIR ARP Availability Policy Effect" + "displayName": "Vnet Gw Express Route Bits Per Second Policy Effect" }, "type": "string" }, - "ercirArpAvailabilityAlertState": { + "vnetGwExpressRouteBitsPerSecondAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "ERCIR Arp Availability Alert State" + "displayName": "Vnet Gw Express Route Bits Per Second Alert State" }, "type": "string" }, - "ercirArpAvailabilityThreshold": { - "defaultValue": "90", + "vnetGwExpressRouteBitsPerSecondThreshold": { + "defaultValue": "1", "metadata": { "description": "Threshold for the alert", - "displayName": "ERCIR Arp Availability Threshold" + "displayName": "Vnet Gw Express Route Bits Per Second Threshold" }, "type": "string" }, - "afwsnatPortUtilizationAlertSeverity": { + "vnetGwTunnelIngressPacketDropMismatchAlertSeverity": { "allowedValues": [ "0", "1", @@ -2419,14 +2480,14 @@ "3", "4" ], - "defaultValue": "1", + "defaultValue": "3", "metadata": { "description": "Severity of the alert", - "displayName": "AFW SNAT Port Utilization Alert Severity" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Alert Severity" }, "type": "String" }, - "afwsnatPortUtilizationWindowSize": { + "vnetGwTunnelIngressPacketDropMismatchWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2440,11 +2501,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "AFW SNAT Port Utilization Window Size" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Window Size" }, "type": "string" }, - "afwsnatPortUtilizationFrequency": { + "vnetGwTunnelIngressPacketDropMismatchEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2452,14 +2513,14 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1M", + "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "AFW SNAT Port Utilization Frequency" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Evaluation Frequency" }, "type": "string" }, - "afwsnatPortUtilizationPolicyEffect": { + "vnetGwTunnelIngressPacketDropMismatchPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -2467,27 +2528,19 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "AFW SNAT Port Utilization Policy Effect" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Policy Effect" }, "type": "string" }, - "afwsnatPortUtilizationAlertState": { + "vnetGwTunnelIngressPacketDropMismatchAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "AFW SNAT Port Utilization Alert State" - }, - "type": "string" - }, - "afwsnatPortUtilizationThreshold": { - "defaultValue": "80", - "metadata": { - "description": "Threshold for the alert", - "displayName": "AFW SNAT Port Utilization Threshold" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Mismatch Alert State" }, "type": "string" }, - "firewallHealthAlertSeverity": { + "vnetGwTunnelIngressPacketDropCountAlertSeverity": { "allowedValues": [ "0", "1", @@ -2495,14 +2548,14 @@ "3", "4" ], - "defaultValue": "0", + "defaultValue": "3", "metadata": { "description": "Severity of the alert", - "displayName": "Firewall Health Alert Severity" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Alert Severity" }, "type": "String" }, - "firewallHealthWindowSize": { + "vnetGwTunnelIngressPacketDropCountWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2516,11 +2569,11 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "Firewall Health Window Size" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Window Size" }, "type": "string" }, - "firewallHealthEvaluationFrequency": { + "vnetGwTunnelIngressPacketDropCountEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2528,14 +2581,14 @@ "PT30M", "PT1H" ], - "defaultValue": "PT1M", + "defaultValue": "PT5M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "Firewall Health Evaluation Frequency" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Evaluation Frequency" }, "type": "string" }, - "firewallHealthPolicyEffect": { + "vnetGwTunnelIngressPacketDropCountPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" @@ -2543,47 +2596,34 @@ "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Firewall Health Policy Effect" - }, - "type": "string" - }, - "firewallHealthAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "Firewall Health Alert State" - }, - "type": "string" - }, - "firewallHealthThreshold": { - "defaultValue": "90", - "metadata": { - "description": "Threshold for the alert", - "displayName": "Firewall Health Threshold" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Policy Effect" }, "type": "string" }, - "activityFWDeleteAlertState": { + "vnetGwTunnelIngressPacketDropCountAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Activity FW Delete Alert State" + "displayName": "Vnet Gw Tunnel Ingress Packet Drop Count Alert State" }, "type": "string" }, - "vpngwTunnelEgressPacketDropCountPolicyEffect": { + "ercirBgpAvailabilityAlertSeverity": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "0", "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Count Policy Effect" + "description": "Severity of the alert", + "displayName": "ERCIR Bgp Availability Alert Severity" }, - "type": "string" + "type": "String" }, - "pdnszQueryVolumeWindowSize": { + "ercirBgpAvailabilityWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2594,22 +2634,14 @@ "PT12H", "P1D" ], - "defaultValue": "PT1H", + "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "PDNSZ Query Volume Window Size" - }, - "type": "string" - }, - "activityVPNGWDeleteAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "Activity VPN GW Delete Alert State" + "displayName": "ERCIR Bgp Availability Window Size" }, "type": "string" }, - "vpngwTunnelEgressPacketDropCountFrequency": { + "ercirBgpAvailabilityEvaluationFrequency": { "allowedValues": [ "PT1M", "PT5M", @@ -2617,32 +2649,42 @@ "PT30M", "PT1H" ], - "defaultValue": "PT5M", + "defaultValue": "PT1M", "metadata": { "description": "Evaluation frequency for the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Count Frequency" + "displayName": "ERCIR Bgp Availability Evaluation Frequency" }, "type": "string" }, - "vpngwTunnelEgressPacketDropCountWindowSize": { + "ercirBgpAvailabilityPolicyEffect": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" + "deployIfNotExists", + "disabled" ], - "defaultValue": "PT5M", + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Window size for the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Count Window Size" + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "ERCIR Bgp Availability Policy Effect" }, "type": "string" }, - "vpngwTunnelEgressPacketDropCountAlertSeverity": { + "ercirBgpAvailabilityAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "ERCIR Bgp Availability Alert State" + }, + "type": "string" + }, + "ercirBgpAvailabilityThreshold": { + "defaultValue": "90", + "metadata": { + "description": "Threshold for the alert", + "displayName": "ERCIR Bgp Availability Threshold" + }, + "type": "string" + }, + "ercirArpAvailabilityAlertSeverity": { "allowedValues": [ "0", "1", @@ -2650,57 +2692,90 @@ "3", "4" ], - "defaultValue": "3", + "defaultValue": "0", "metadata": { "description": "Severity of the alert", - "displayName": "VPN GW Tunnel Egress Packet Drop Count Alert Severity" + "displayName": "ERCIR Arp Availability Alert Severity" }, "type": "String" }, - "vpngwEgressThreshold": { - "defaultValue": "1", + "ercirArpAvailabilityWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT5M", "metadata": { - "description": "Threshold for the alert", - "displayName": "VPN GW Egress Threshold" + "description": "Window size for the alert", + "displayName": "ERCIR Arp Availability Window Size" }, "type": "string" }, - "vpngwEgressAlertState": { - "defaultValue": "true", + "ercirArpAvailabilityFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT1M", "metadata": { - "description": "Alert state for the alert", - "displayName": "VPN GW Egress Alert State" + "description": "Evaluation frequency for the alert", + "displayName": "ERCIR Arp Availability Frequency" }, "type": "string" }, - "vpngwEgressPolicyEffect": { + "ercirArpAvailabilityPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "disabled", + "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "VPN GW Egress Policy Effect" + "displayName": "ERCIR ARP Availability Policy Effect" }, "type": "string" }, - "vpngwEgressEvaluationFrequency": { + "ercirArpAvailabilityAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "ERCIR Arp Availability Alert State" + }, + "type": "string" + }, + "ercirArpAvailabilityThreshold": { + "defaultValue": "90", + "metadata": { + "description": "Threshold for the alert", + "displayName": "ERCIR Arp Availability Threshold" + }, + "type": "string" + }, + "afwsnatPortUtilizationAlertSeverity": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "PT5M", + "defaultValue": "1", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "VPN GW Egress Evaluation Frequency" + "description": "Severity of the alert", + "displayName": "AFW SNAT Port Utilization Alert Severity" }, - "type": "string" + "type": "String" }, - "vpngwEgressWindowSize": { + "afwsnatPortUtilizationWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2714,69 +2789,69 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "VPN GW Egress Window Size" + "displayName": "AFW SNAT Port Utilization Window Size" }, "type": "string" }, - "vpngwEgressAlertSeverity": { + "afwsnatPortUtilizationFrequency": { "allowedValues": [ - "0", - "1", - "2", - "3", - "4" + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" ], - "defaultValue": "0", + "defaultValue": "PT1M", "metadata": { - "description": "Severity of the alert", - "displayName": "VPN GW Egress Alert Severity" + "description": "Evaluation frequency for the alert", + "displayName": "AFW SNAT Port Utilization Frequency" }, - "type": "String" + "type": "string" }, - "vpngwBandWidthUtilThreshold": { - "defaultValue": "1", + "afwsnatPortUtilizationPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Threshold for the alert", - "displayName": "VPN GW Band Width Util Threshold" + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "AFW SNAT Port Utilization Policy Effect" }, "type": "string" }, - "vpngwBandWidthUtilAlertState": { + "afwsnatPortUtilizationAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "VPN GW Band Width Util Alert State" + "displayName": "AFW SNAT Port Utilization Alert State" }, "type": "string" }, - "vpngwBandWidthUtilPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "deployIfNotExists", + "afwsnatPortUtilizationThreshold": { + "defaultValue": "80", "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "VPN GW Band Width Util Policy Effect" + "description": "Threshold for the alert", + "displayName": "AFW SNAT Port Utilization Threshold" }, "type": "string" }, - "vpngwBandWidthUtilEvaluationFrequency": { + "firewallHealthAlertSeverity": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "PT5M", + "defaultValue": "0", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "VPN GW Band Width Util Evaluation Frequency" + "description": "Severity of the alert", + "displayName": "Firewall Health Alert Severity" }, - "type": "string" + "type": "String" }, - "vpngwBandWidthUtilWindowSize": { + "firewallHealthWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -2790,83 +2865,66 @@ "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "VPN GW Band Width Util Window Size" + "displayName": "Firewall Health Window Size" }, "type": "string" }, - "vpngwBandWidthUtilAlertSeverity": { + "firewallHealthEvaluationFrequency": { "allowedValues": [ - "0", - "1", - "2", - "3", - "4" + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" ], - "defaultValue": "0", + "defaultValue": "PT1M", "metadata": { - "description": "Severity of the alert", - "displayName": "VPN GW Band Width Util Alert Severity" + "description": "Evaluation frequency for the alert", + "displayName": "Firewall Health Evaluation Frequency" }, - "type": "String" + "type": "string" }, - "vnetGwTunnelIngressThreshold": { - "defaultValue": "1", + "firewallHealthPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Threshold for the alert", - "displayName": "Vnet Gw Tunnel Ingress Threshold" + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "Firewall Health Policy Effect" }, "type": "string" }, - "vnetGwTunnelIngressAlertState": { + "firewallHealthAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Vnet Gw Tunnel Ingress Alert State" + "displayName": "Firewall Health Alert State" }, "type": "string" }, - "vnetGwTunnelIngressPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "disabled", + "firewallHealthThreshold": { + "defaultValue": "90", "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Vnet Gw Tunnel Ingress Policy Effect" + "description": "Threshold for the alert", + "displayName": "Firewall Health Threshold" }, "type": "string" }, - "vnetGwTunnelIngressEvaluationFrequency": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" - ], - "defaultValue": "PT5M", + "activityFWDeleteAlertState": { + "defaultValue": "true", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Vnet Gw Tunnel Ingress Evaluation Frequency" + "description": "Alert state for the alert", + "displayName": "Activity FW Delete Alert State" }, "type": "string" }, - "vnetGwTunnelIngressWindowSize": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" - ], - "defaultValue": "PT5M", + "activityVPNGWDeleteAlertState": { + "defaultValue": "true", "metadata": { - "description": "Window size for the alert", - "displayName": "Vnet Gw Tunnel Ingress Window Size" + "description": "Alert state for the alert", + "displayName": "Activity VPN GW Delete Alert State" }, "type": "string" }, @@ -3345,64 +3403,6 @@ "displayName": "ERP Tx Light Level Low Alert State" }, "type": "string" - }, - "vnetGwTunnelIngressAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "0", - "metadata": { - "description": "Severity of the alert", - "displayName": "Vnet Gw Tunnel Ingress Alert Severity" - }, - "type": "String" - }, - "vnetGwTunnelEgressThreshold": { - "defaultValue": "1", - "metadata": { - "description": "Threshold for the alert", - "displayName": "Vnet Gw Tunnel Egress Threshold" - }, - "type": "string" - }, - "vnetGwTunnelEgressAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "Vnet Gw Tunnel Egress Alert State" - }, - "type": "string" - }, - "vnetGwTunnelEgressPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "disabled", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "Vnet Gw Tunnel Egress Policy Effect" - }, - "type": "string" - }, - "vnetGwTunnelEgressEvaluationFrequency": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" - ], - "defaultValue": "PT5M", - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Vnet Gw Tunnel Egress Evaluation Frequency" - }, - "type": "string" } }, "policyDefinitions": [ @@ -3464,11 +3464,11 @@ "severity": { "value": "[parameters('VPNGwBGPPeerStatusAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VPNGwBGPPeerStatusThreshold')]" - }, "effect": { "value": "[parameters('VPNGwBGPPeerStatusPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VPNGwBGPPeerStatusThreshold')]" } } }, @@ -3488,11 +3488,11 @@ "severity": { "value": "[parameters('VnetGwERCpuUtilAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VnetGwERCpuUtilThreshold')]" - }, "effect": { "value": "[parameters('VnetGwERCpuUtilPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VnetGwERCpuUtilThreshold')]" } } }, @@ -3512,11 +3512,11 @@ "severity": { "value": "[parameters('VnetGwTunnelBWAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VnetGwTunnelBWThreshold')]" - }, "effect": { "value": "[parameters('VnetGwTunnelBWPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VnetGwTunnelBWThreshold')]" } } }, @@ -3536,11 +3536,11 @@ "severity": { "value": "[parameters('VnetGwTunnelEgressAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VnetGwTunnelEgressThreshold')]" - }, "effect": { "value": "[parameters('VnetGwTunnelEgressPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VnetGwTunnelEgressThreshold')]" } } }, @@ -3560,11 +3560,11 @@ "severity": { "value": "[parameters('VnetGwTunnelIngressAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VnetGwTunnelIngressThreshold')]" - }, "effect": { "value": "[parameters('VnetGwTunnelIngressPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VnetGwTunnelIngressThreshold')]" } } }, @@ -3584,11 +3584,11 @@ "severity": { "value": "[parameters('VPNGWBandWidthUtilAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VPNGWBandWidthUtilThreshold')]" - }, "effect": { "value": "[parameters('VPNGWBandWidthUtilPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VPNGWBandWidthUtilThreshold')]" } } }, @@ -3608,11 +3608,11 @@ "severity": { "value": "[parameters('VPNGWEgressAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VPNGWEgressThreshold')]" - }, "effect": { "value": "[parameters('VPNGWEgressPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VPNGWEgressThreshold')]" } } }, @@ -3671,17 +3671,17 @@ "enabled": { "value": "[parameters('VPNGWIngressAlertState')]" }, - "autoMitigate": { - "value": "[parameters('VPNGWIngressAutoMitigate')]" - }, "severity": { "value": "[parameters('VPNGWIngressAlertSeverity')]" }, + "effect": { + "value": "[parameters('VPNGWIngressPolicyEffect')]" + }, "threshold": { "value": "[parameters('VPNGWIngressThreshold')]" }, - "effect": { - "value": "[parameters('VPNGWIngressPolicyEffect')]" + "autoMitigate": { + "value": "[parameters('VPNGWIngressAutoMitigate')]" } } }, @@ -3743,11 +3743,11 @@ "severity": { "value": "[parameters('PDNSZCapacityUtilAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PDNSZCapacityUtilThreshold')]" - }, "effect": { "value": "[parameters('PDNSZCapacityUtilPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PDNSZCapacityUtilThreshold')]" } } }, @@ -3767,11 +3767,11 @@ "severity": { "value": "[parameters('PDNSZQueryVolumeAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PDNSZQueryVolumeThreshold')]" - }, "effect": { "value": "[parameters('PDNSZQueryVolumePolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PDNSZQueryVolumeThreshold')]" } } }, @@ -3791,11 +3791,11 @@ "severity": { "value": "[parameters('PDNSZRecordSetCapacityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PDNSZRecordSetCapacityThreshold')]" - }, "effect": { "value": "[parameters('PDNSZRecordSetCapacityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PDNSZRecordSetCapacityThreshold')]" } } }, @@ -3815,11 +3815,11 @@ "severity": { "value": "[parameters('PDNSZRegistrationCapacityUtilAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PDNSZRegistrationCapacityUtilThreshold')]" - }, "effect": { "value": "[parameters('PDNSZRegistrationCapacityUtilPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PDNSZRegistrationCapacityUtilThreshold')]" } } }, @@ -3839,11 +3839,11 @@ "severity": { "value": "[parameters('ERGwExpressRouteBitsInAlertSeverity')]" }, - "threshold": { - "value": "[parameters('ERGwExpressRouteBitsInThreshold')]" - }, "effect": { "value": "[parameters('ERGwExpressRouteBitsInPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('ERGwExpressRouteBitsInThreshold')]" } } }, @@ -3863,11 +3863,11 @@ "severity": { "value": "[parameters('ERGwExpressRouteBitsOutAlertSeverity')]" }, - "threshold": { - "value": "[parameters('ERGwExpressRouteBitsOutThreshold')]" - }, "effect": { "value": "[parameters('ERGwExpressRouteBitsOutPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('ERGwExpressRouteBitsOutThreshold')]" } } }, @@ -3887,11 +3887,11 @@ "severity": { "value": "[parameters('ERGwExpressRouteCpuUtilAlertSeverity')]" }, - "threshold": { - "value": "[parameters('ERGwExpressRouteCpuUtilThreshold')]" - }, "effect": { "value": "[parameters('ERGwExpressRouteCpuUtilPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('ERGwExpressRouteCpuUtilThreshold')]" } } }, @@ -3953,11 +3953,11 @@ "severity": { "value": "[parameters('VnetGwExpressRouteBitsPerSecondAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VnetGwExpressRouteBitsPerSecondThreshold')]" - }, "effect": { "value": "[parameters('VnetGwExpressRouteBitsPerSecondPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VnetGwExpressRouteBitsPerSecondThreshold')]" } } }, @@ -4019,11 +4019,11 @@ "severity": { "value": "[parameters('ERCIRBgpAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('ERCIRBgpAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('ERCIRBgpAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('ERCIRBgpAvailabilityThreshold')]" } } }, @@ -4043,11 +4043,11 @@ "severity": { "value": "[parameters('ERCIRArpAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('ERCIRArpAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('ERCIRArpAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('ERCIRArpAvailabilityThreshold')]" } } }, @@ -4067,11 +4067,11 @@ "severity": { "value": "[parameters('AFWSNATPortUtilizationAlertSeverity')]" }, - "threshold": { - "value": "[parameters('AFWSNATPortUtilizationThreshold')]" - }, "effect": { "value": "[parameters('AFWSNATPortUtilizationPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('AFWSNATPortUtilizationThreshold')]" } } }, @@ -4091,11 +4091,11 @@ "severity": { "value": "[parameters('PIPBytesInDDoSAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPBytesInDDoSThreshold')]" - }, "effect": { "value": "[parameters('PIPBytesInDDoSPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPBytesInDDoSThreshold')]" } } }, @@ -4115,11 +4115,11 @@ "severity": { "value": "[parameters('PIPDDoSAttackAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPDDoSAttackThreshold')]" - }, "effect": { "value": "[parameters('PIPDDoSAttackPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPDDoSAttackThreshold')]" } } }, @@ -4139,11 +4139,11 @@ "severity": { "value": "[parameters('PIPPacketsInDDoSAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPPacketsInDDoSThreshold')]" - }, "effect": { "value": "[parameters('PIPPacketsInDDoSPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPPacketsInDDoSThreshold')]" } } }, @@ -4163,11 +4163,11 @@ "severity": { "value": "[parameters('PIPVIPAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPVIPAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('PIPVIPAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPVIPAvailabilityThreshold')]" } } }, @@ -4187,11 +4187,11 @@ "severity": { "value": "[parameters('VNETDDOSAttackAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VNETDDOSAttackThreshold')]" - }, "effect": { "value": "[parameters('VNETDDOSAttackPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VNETDDOSAttackThreshold')]" } } }, @@ -4211,11 +4211,11 @@ "severity": { "value": "[parameters('FirewallHealthAlertSeverity')]" }, - "threshold": { - "value": "[parameters('FirewallHealthThreshold')]" - }, "effect": { "value": "[parameters('FirewallHealthPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('FirewallHealthThreshold')]" } } }, @@ -4223,12 +4223,12 @@ "policyDefinitionReferenceId": "ALZ_activityFWDelete", "policyDefinitionName": "Deploy_activitylog_Firewall_Delete", "parameters": { - "enabled": { - "value": "[parameters('activityFWDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityFWDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -4241,12 +4241,12 @@ "policyDefinitionReferenceId": "ALZ_activityNSGDelete", "policyDefinitionName": "Deploy_activitylog_NSG_Delete", "parameters": { - "enabled": { - "value": "[parameters('activityNSGDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityNSGDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -4259,12 +4259,12 @@ "policyDefinitionReferenceId": "ALZ_activityUDRUpdate", "policyDefinitionName": "Deploy_activitylog_RouteTable_Update", "parameters": { - "enabled": { - "value": "[parameters('activityUDRUpdateAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityUDRUpdateAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -4277,12 +4277,12 @@ "policyDefinitionReferenceId": "ALZ_activityVPNGWDelete", "policyDefinitionName": "Deploy_activitylog_VPNGateway_Delete", "parameters": { - "enabled": { - "value": "[parameters('activityVPNGWDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityVPNGWDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, diff --git a/Definitions/policySetDefinitions/Monitoring/alerting-hybridvm.jsonc b/Definitions/policySetDefinitions/Monitoring/alerting-hybridvm.jsonc new file mode 100644 index 0000000..f81c5e8 --- /dev/null +++ b/Definitions/policySetDefinitions/Monitoring/alerting-hybridvm.jsonc @@ -0,0 +1,2577 @@ +{ + "$schema": "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-set-definition-schema.json", + "name": "Alerting-HybridVM", + "properties": { + "displayName": "Deploy Azure Monitor Baseline Alerts for Hybrid VMs", + "description": "Initiative to deploy AMBA Hybrid VM alerts", + "metadata": { + "alzCloudEnvironments": [ + "AzureCloud" + ], + "_deployed_by_amba": true, + "version": "1.0.0", + "category": "Monitoring", + "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" + }, + "parameters": { + "alzMonitorResourceGroupLocation": { + "defaultValue": "centralus", + "metadata": { + "description": "Location of the resource group where the ALZ Monitor resources will be deployed", + "displayName": "ALZ Monitor Resource Group Location" + }, + "type": "String" + }, + "alzMonitorResourceGroupTags": { + "defaultValue": { + "_deployed_by_alz_monitor": true + }, + "metadata": { + "description": "Tags for the resource group where the ALZ Monitor resources will be deployed", + "displayName": "ALZ Monitor Resource Group Tags" + }, + "type": "Object" + }, + "alzMonitorResourceGroupName": { + "defaultValue": "ALZ-Monitoring-RG", + "metadata": { + "description": "Name of the resource group where the ALZ Monitor resources will be deployed", + "displayName": "ALZ Monitor Resource Group Name" + }, + "type": "String" + }, + "byoUserAssignedManagedIdentityResourceId": { + "defaultValue": "", + "metadata": { + "description": "The resource Id of the user assigned managed identity provided by the customer.", + "displayName": "Customer defined User Assigned managed Identity resource Id." + }, + "type": "string" + }, + "alzUserAssignedManagedIdentityName": { + "defaultValue": "id-AMBA-ARG-Reader-001", + "metadata": { + "description": "The name of the user assigned managed identity to be created for monitoring purpose.", + "displayName": "Name of the user assigned managed identity to be created." + }, + "type": "string" + }, + "alzManagementSubscriptionId": { + "defaultValue": "", + "metadata": { + "description": "The subscription ID of the management subscription where the user assigned managed identity will be created." + }, + "type": "string" + }, + "hybridVMHeartBeatRGAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "1", + "metadata": { + "description": "Severity of the alert for VM Heart Beat RG", + "displayName": "Hybrid VM Heart Beat RG Alert Severity" + }, + "type": "String" + }, + "hybridVMHeartBeatRGWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Heart Beat RG Window Size" + }, + "type": "string" + }, + "hybridVMHeartBeatRGEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Heart Beat RG Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMHeartBeatRGAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Heart Beat RG Auto Mitigate" + }, + "type": "string" + }, + "hybridVMHeartBeatRGAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Heart Beat RG Auto Resolve" + }, + "type": "string" + }, + "hybridVMHeartBeatRGAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Heart Beat RG Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMHeartBeatRGPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Heart Beat RG Policy Effect" + }, + "type": "string" + }, + "hybridVMHeartBeatRGAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Hybrid VM Heart Beat RG Alert State" + }, + "type": "string" + }, + "hybridVMHeartBeatRGThreshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Heart Beat RG Threshold" + }, + "type": "string" + }, + "hybridVMHeartBeatRGOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Heart Beat RG Operator" + }, + "type": "string" + }, + "hybridVMHeartBeatRGTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Heart Beat RG Time Aggregation" + }, + "type": "string" + }, + "hybridVMNetworkInAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Network In", + "displayName": "Hybrid VM Network In Alert Severity" + }, + "type": "String" + }, + "hybridVMNetworkInWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Network In Window Size" + }, + "type": "string" + }, + "hybridVMNetworkInEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Network In Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMNetworkInAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Network In Auto Mitigate" + }, + "type": "string" + }, + "hybridVMNetworkInAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Network In Auto Resolve" + }, + "type": "string" + }, + "hybridVMNetworkInAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Network In Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMNetworkInPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Network In Policy Effect" + }, + "type": "string" + }, + "hybridVMNetworkInAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Hybrid VM Network In Alert State" + }, + "type": "string" + }, + "hybridVMNetworkInThreshold": { + "defaultValue": "10000000", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Network In Threshold" + }, + "type": "string" + }, + "hybridVMNetworkInOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Network In Operator" + }, + "type": "string" + }, + "hybridVMNetworkInTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Network In Time Aggregation" + }, + "type": "string" + }, + "hybridVMNetworkInEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM Network In Evaluation Periods" + }, + "type": "string" + }, + "hybridVMNetworkInFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM Network In Failing Periods" + }, + "type": "string" + }, + "hybridVMNetworkInComputersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Computers To Include for the alert", + "displayName": "Hybrid VM Network In Computers To Include" + }, + "type": "array" + }, + "hybridVMNetworkInNetworkInterfaceToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Network Interface To Include for the alert", + "displayName": "Hybrid VM Network In Network Interface To Include" + }, + "type": "array" + }, + "hybridVMNetworkOutAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Network Out", + "displayName": "Hybrid VM Network Out Alert Severity" + }, + "type": "String" + }, + "hybridVMNetworkOutWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Network Out Window Size" + }, + "type": "string" + }, + "hybridVMNetworkOutEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Network Out Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMNetworkOutAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Network Out Auto Mitigate" + }, + "type": "string" + }, + "hybridVMNetworkOutAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Network Out Auto Resolve" + }, + "type": "string" + }, + "hybridVMNetworkOutAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Network Out Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMNetworkOutPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Network Out Policy Effect" + }, + "type": "string" + }, + "hybridVMNetworkOutAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM Network Out Alert State" + }, + "type": "string" + }, + "hybridVMNetworkOutThreshold": { + "defaultValue": "10000000", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Network Out Threshold" + }, + "type": "string" + }, + "hybridVMNetworkOutOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Network Out Operator" + }, + "type": "string" + }, + "hybridVMNetworkOutTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Network Out Time Aggregation" + }, + "type": "string" + }, + "hybridVMNetworkOutEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM Network Out Evaluation Periods" + }, + "type": "string" + }, + "hybridVMNetworkOutFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM Network Out Failing Periods" + }, + "type": "string" + }, + "hybridVMNetworkOutComputersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Computers To Include for the alert", + "displayName": "Hybrid VM Network Out Computers To Include" + }, + "type": "array" + }, + "hybridVMNetworkOutNetworkInterfaceToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Network Interface To Include for the alert", + "displayName": "Hybrid VM Network Out Network Interface To Include" + }, + "type": "array" + }, + "hybridVMOSDiskReadLatencyAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM OS Disk Read Latency", + "displayName": "Hybrid VM OS Disk Read Latency Alert Severity" + }, + "type": "String" + }, + "hybridVMOSDiskReadLatencyWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Window Size" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Auto Mitigate" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Auto Resolve" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM OS Disk Read Latency Policy Effect" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM OS Disk Read Latency Alert State" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyThreshold": { + "defaultValue": "30", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Threshold" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Operator" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Time Aggregation" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Evaluation Periods" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Failing Periods" + }, + "type": "string" + }, + "hybridVMOSDiskReadLatencyComputersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Computers To Include for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Computers To Include" + }, + "type": "array" + }, + "hybridVMOSDiskReadLatencyDisksToInclude": { + "defaultValue": [ + "C:", + "/" + ], + "metadata": { + "description": "Disks To Include for the alert", + "displayName": "Hybrid VM OS Disk Read Latency Disks To Include" + }, + "type": "array" + }, + "hybridVMOSDiskWriteLatencyAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM OS Disk Write Latency", + "displayName": "Hybrid VM OS Disk Write Latency Alert Severity" + }, + "type": "String" + }, + "hybridVMOSDiskWriteLatencyWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Window Size" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Auto Mitigate" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Auto Resolve" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM OS Disk Write Latency Policy Effect" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM OS Disk Write Latency Alert State" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyThreshold": { + "defaultValue": "50", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Threshold" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Operator" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Time Aggregation" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Evaluation Periods" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Failing Periods" + }, + "type": "string" + }, + "hybridVMOSDiskWriteLatencyComputersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Computers To Include for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Computers To Include" + }, + "type": "array" + }, + "hybridVMOSDiskWriteLatencyDisksToInclude": { + "defaultValue": [ + "C:", + "/" + ], + "metadata": { + "description": "Disks To Include for the alert", + "displayName": "Hybrid VM OS Disk Write Latency Disks To Include" + }, + "type": "array" + }, + "hybridVMOSDiskSpaceAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM OS Disk Space", + "displayName": "Hybrid VM OS Disk Space Alert Severity" + }, + "type": "String" + }, + "hybridVMOSDiskSpaceWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM OS Disk Space Window Size" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM OS Disk Space Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM OS Disk Space Auto Mitigate" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM OS Disk Space Auto Resolve" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM OS Disk Space Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMOSDiskSpacePolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM OS Disk Space Policy Effect" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM OS Disk Space Alert State" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceThreshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM OS Disk Space Threshold" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM OS Disk Space Operator" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM OS Disk Space Time Aggregation" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM OS Disk Space Evaluation Periods" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM OS Disk Space Failing Periods" + }, + "type": "string" + }, + "hybridVMOSDiskSpaceComputersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Computers To Include for the alert", + "displayName": "Hybrid VM OS Disk Space Computers To Include" + }, + "type": "array" + }, + "hybridVMOSDiskSpaceDisksToInclude": { + "defaultValue": [ + "C:", + "/" + ], + "metadata": { + "description": "Disks To Include for the alert", + "displayName": "Hybrid VM OS Disk Space Disks To Include" + }, + "type": "array" + }, + "hybridVMPercentCPUAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Percent CPU", + "displayName": "Hybrid VM Percent CPU Alert Severity" + }, + "type": "String" + }, + "hybridVMPercentCPUWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Percent CPU Window Size" + }, + "type": "string" + }, + "hybridVMPercentCPUEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Percent CPU Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMPercentCPUAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Percent CPU Auto Mitigate" + }, + "type": "string" + }, + "hybridVMPercentCPUAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Percent CPU Auto Resolve" + }, + "type": "string" + }, + "hybridVMPercentCPUAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Percent CPU Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMPercentCPUPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Percent CPU Policy Effect" + }, + "type": "string" + }, + "hybridVMPercentCPUAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM Percent CPU Alert State" + }, + "type": "string" + }, + "hybridVMPercentCPUThreshold": { + "defaultValue": "85", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Percent CPU Threshold" + }, + "type": "string" + }, + "hybridVMPercentCPUOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Percent CPU Operator" + }, + "type": "string" + }, + "hybridVMPercentCPUTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Percent CPU Time Aggregation" + }, + "type": "string" + }, + "hybridVMPercentMemoryAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Percent Memory", + "displayName": "Hybrid VM Percent Memory Alert Severity" + }, + "type": "String" + }, + "hybridVMPercentMemoryWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Percent Memory Window Size" + }, + "type": "string" + }, + "hybridVMPercentMemoryEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Percent Memory Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMPercentMemoryAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Percent Memory Auto Mitigate" + }, + "type": "string" + }, + "hybridVMPercentMemoryAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Percent Memory Auto Resolve" + }, + "type": "string" + }, + "hybridVMPercentMemoryAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Percent Memory Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMPercentMemoryPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Percent Memory Policy Effect" + }, + "type": "string" + }, + "hybridVMPercentMemoryAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM Percent Memory Alert State" + }, + "type": "string" + }, + "hybridVMPercentMemoryThreshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Percent Memory Threshold" + }, + "type": "string" + }, + "hybridVMPercentMemoryOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Percent Memory Operator" + }, + "type": "string" + }, + "hybridVMPercentMemoryTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Percent Memory Time Aggregation" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Data Disk Space", + "displayName": "Hybrid VM Data Disk Space Alert Severity" + }, + "type": "String" + }, + "hybridVMDataDiskSpaceWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Data Disk Space Window Size" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Data Disk Space Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Data Disk Space Auto Mitigate" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Data Disk Space Auto Resolve" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Data Disk Space Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMDataDiskSpacePolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Data Disk Space Policy Effect" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM Data Disk Space Alert State" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceThreshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Data Disk Space Threshold" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Data Disk Space Operator" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Data Disk Space Time Aggregation" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM Data Disk Space Evaluation Periods" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM Data Disk Space Failing Periods" + }, + "type": "string" + }, + "hybridVMDataDiskSpaceDisksToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Disks To Include for the alert", + "displayName": "Hybrid VM Data Disk Space Disks To Include" + }, + "type": "array" + }, + "hybridVMDataDiskReadLatencyAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Data Disk Read Latency", + "displayName": "Hybrid VM Data Disk Read Latency Alert Severity" + }, + "type": "String" + }, + "hybridVMDataDiskReadLatencyWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Window Size" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Auto Mitigate" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Auto Resolve" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Data Disk Read Latency Policy Effect" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM Data Disk Read Latency Alert State" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyThreshold": { + "defaultValue": "30", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Threshold" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Operator" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Time Aggregation" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Evaluation Periods" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Failing Periods" + }, + "type": "string" + }, + "hybridVMDataDiskReadLatencyComputersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Computers To Include for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Computers To Include" + }, + "type": "array" + }, + "hybridVMDataDiskReadLatencyDisksToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Disks To Include for the alert", + "displayName": "Hybrid VM Data Disk Read Latency Disks To Include" + }, + "type": "array" + }, + "hybridVMDataDiskWriteLatencyAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Data Disk Write Latency", + "displayName": "Hybrid VM Data Disk Write Latency Alert Severity" + }, + "type": "String" + }, + "hybridVMDataDiskWriteLatencyWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Window Size" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Auto Mitigate" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Auto Resolve" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Auto Resolve Time" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Data Disk Write Latency Policy Effect" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM Data Disk Write Latency Alert State" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyThreshold": { + "defaultValue": "30", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Threshold" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "LessThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Operator" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Time Aggregation" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Evaluation Periods" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Failing Periods" + }, + "type": "string" + }, + "hybridVMDataDiskWriteLatencyComputersToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Computers To Include for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Computers To Include" + }, + "type": "array" + }, + "hybridVMDataDiskWriteLatencyDisksToInclude": { + "defaultValue": [ + "*" + ], + "metadata": { + "description": "Disks To Include for the alert", + "displayName": "Hybrid VM Data Disk Write Latency Disks To Include" + }, + "type": "array" + }, + "hybridVMDisconnectedAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "1", + "metadata": { + "description": "Severity of the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Alert Severity" + }, + "type": "String" + }, + "hybridVMDisconnectedAlertWindowSize": { + "allowedValues": [ + "PT12H", + "P1D" + ], + "defaultValue": "P1D", + "metadata": { + "description": "Window size for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Window Size" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertEvaluationFrequency": { + "allowedValues": [ + "PT12H", + "P1D" + ], + "defaultValue": "P1D", + "metadata": { + "description": "Evaluation frequency for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Evaluation Frequency" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Auto Mitigate" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Hybrid VM Disconnected Policy Effect" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert, true will enable the alert, false will disable the alert", + "displayName": "Hybrid VM Disconnected Alert State" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertDaysThreshold": { + "defaultValue": "45", + "metadata": { + "description": "Threshold in days for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Days Threshold" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertOperator": { + "allowedValues": [ + "GreaterThan", + "GreaterThanOrEqual" + ], + "defaultValue": "GreaterThanOrEqual", + "metadata": { + "description": "Operator for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Operator" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertTimeAggregation": { + "allowedValues": [ + "Average", + "Maximum", + "Minimum", + "Total", + "Count" + ], + "defaultValue": "Minimum", + "metadata": { + "description": "Time Aggregation for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Time Aggregation" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertEvaluationPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Evaluation Periods for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Evaluation Periods" + }, + "type": "string" + }, + "hybridVMDisconnectedAlertFailingPeriods": { + "defaultValue": "1", + "metadata": { + "description": "Failing Periods for the Hybrid VM Disconnected alert", + "displayName": "Hybrid VM Disconnected Failing Periods" + }, + "type": "string" + } + }, + "policyDefinitions": [ + { + "policyDefinitionReferenceId": "ALZ_HybridVMHeartBeatRG", + "policyDefinitionName": "Deploy_Hybrid_VM_HeartBeat_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMHeartBeatRGEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMHeartBeatRGWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMHeartBeatRGAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMHeartBeatRGAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMHeartBeatRGPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMHeartBeatRGThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMHeartBeatRGTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMHeartBeatRGAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMHeartBeatRGAutoMitigate')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMHeartBeatRGAutoResolve')]" + }, + "operator": { + "value": "[parameters('HybridVMHeartBeatRGOperator')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMNetworkIn", + "policyDefinitionName": "Deploy_Hybrid_VM_NetworkIn_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMNetworkInEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMNetworkInWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMNetworkInAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMNetworkInAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMNetworkInPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMNetworkInThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMNetworkInTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMNetworkInAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMNetworkInAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMNetworkInEvaluationPeriods')]" + }, + "computersToInclude": { + "value": "[parameters('HybridVMNetworkInComputersToInclude')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMNetworkInAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMNetworkInFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMNetworkInOperator')]" + }, + "networkInterfacesToInclude": { + "value": "[parameters('HybridVMNetworkInNetworkInterfaceToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMNetworkOut", + "policyDefinitionName": "Deploy_Hybrid_VM_NetworkOut_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMNetworkOutEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMNetworkOutWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMNetworkOutAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMNetworkOutAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMNetworkOutPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMNetworkOutThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMNetworkOutTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMNetworkOutAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMNetworkOutAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMNetworkOutEvaluationPeriods')]" + }, + "computersToInclude": { + "value": "[parameters('HybridVMNetworkOutComputersToInclude')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMNetworkOutAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMNetworkOutFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMNetworkOutOperator')]" + }, + "networkInterfacesToInclude": { + "value": "[parameters('HybridVMNetworkOutNetworkInterfaceToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMOSDiskReadLatency", + "policyDefinitionName": "Deploy_Hybrid_VM_OSDiskreadLatency_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMOSDiskReadLatencyEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMOSDiskReadLatencyWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMOSDiskReadLatencyAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMOSDiskReadLatencyAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMOSDiskReadLatencyPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMOSDiskReadLatencyThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMOSDiskReadLatencyTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMOSDiskReadLatencyAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMOSDiskReadLatencyAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMOSDiskReadLatencyEvaluationPeriods')]" + }, + "computersToInclude": { + "value": "[parameters('HybridVMOSDiskReadLatencyComputersToInclude')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMOSDiskReadLatencyAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMOSDiskReadLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMOSDiskReadLatencyOperator')]" + }, + "disksToInclude": { + "value": "[parameters('HybridVMOSDiskReadLatencyDisksToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMOSDiskWriteLatency", + "policyDefinitionName": "Deploy_Hybrid_VM_OSDiskwriteLatency_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMOSDiskWriteLatencyEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMOSDiskWriteLatencyWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMOSDiskWriteLatencyAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMOSDiskWriteLatencyAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMOSDiskWriteLatencyPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMOSDiskWriteLatencyThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMOSDiskWriteLatencyTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMOSDiskWriteLatencyAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMOSDiskWriteLatencyAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMOSDiskWriteLatencyEvaluationPeriods')]" + }, + "computersToInclude": { + "value": "[parameters('HybridVMOSDiskWriteLatencyComputersToInclude')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMOSDiskWriteLatencyAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMOSDiskWriteLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMOSDiskWriteLatencyOperator')]" + }, + "disksToInclude": { + "value": "[parameters('HybridVMOSDiskWriteLatencyDisksToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMOSDiskSpace", + "policyDefinitionName": "Deploy_Hybrid_VM_OSDiskSpace_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMOSDiskSpaceEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMOSDiskSpaceWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMOSDiskSpaceAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMOSDiskSpaceAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMOSDiskSpacePolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMOSDiskSpaceThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMOSDiskSpaceTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMOSDiskSpaceAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMOSDiskSpaceAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMOSDiskSpaceEvaluationPeriods')]" + }, + "computersToInclude": { + "value": "[parameters('HybridVMOSDiskSpaceComputersToInclude')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMOSDiskSpaceAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMOSDiskSpaceFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMOSDiskSpaceOperator')]" + }, + "disksToInclude": { + "value": "[parameters('HybridVMOSDiskSpaceDisksToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMPercentCPU", + "policyDefinitionName": "Deploy_Hybrid_VM_CPU_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMPercentCPUEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMPercentCPUWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMPercentCPUAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMPercentCPUAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMPercentCPUPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMPercentCPUThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMPercentCPUTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMPercentCPUAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMPercentCPUAutoMitigate')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMPercentCPUAutoResolve')]" + }, + "operator": { + "value": "[parameters('HybridVMPercentCPUOperator')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMPercentMemory", + "policyDefinitionName": "Deploy_Hybrid_VM_Memory_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMPercentMemoryEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMPercentMemoryWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMPercentMemoryAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMPercentMemoryAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMPercentMemoryPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMPercentMemoryThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMPercentMemoryTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMPercentMemoryAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMPercentMemoryAutoMitigate')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMPercentMemoryAutoResolve')]" + }, + "operator": { + "value": "[parameters('HybridVMPercentMemoryOperator')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMDataDiskSpace", + "policyDefinitionName": "Deploy_Hybrid_VM_dataDiskSpace_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMDataDiskSpaceEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMDataDiskSpaceWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMDataDiskSpaceAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMDataDiskSpaceAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMDataDiskSpacePolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMDataDiskSpaceThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMDataDiskSpaceTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMDataDiskSpaceAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMDataDiskSpaceAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMDataDiskSpaceEvaluationPeriods')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMDataDiskSpaceAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMDataDiskSpaceFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMDataDiskSpaceOperator')]" + }, + "disksToInclude": { + "value": "[parameters('HybridVMDataDiskSpaceDisksToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMDataDiskReadLatency", + "policyDefinitionName": "Deploy_Hybrid_VM_dataDiskReadLatency_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMDataDiskReadLatencyEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMDataDiskReadLatencyWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMDataDiskReadLatencyAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMDataDiskReadLatencyAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMDataDiskReadLatencyPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMDataDiskReadLatencyThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMDataDiskReadLatencyTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMDataDiskReadLatencyAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMDataDiskReadLatencyAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMDataDiskReadLatencyEvaluationPeriods')]" + }, + "computersToInclude": { + "value": "[parameters('HybridVMDataDiskReadLatencyComputersToInclude')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMDataDiskReadLatencyAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMDataDiskReadLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMDataDiskReadLatencyOperator')]" + }, + "disksToInclude": { + "value": "[parameters('HybridVMDataDiskReadLatencyDisksToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMDataDiskWriteLatency", + "policyDefinitionName": "Deploy_Hybrid_VM_dataDiskWriteLatency_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMDataDiskWriteLatencyEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMDataDiskWriteLatencyWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMDataDiskWriteLatencyAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMDataDiskWriteLatencyAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMDataDiskWriteLatencyPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMDataDiskWriteLatencyThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMDataDiskWriteLatencyTimeAggregation')]" + }, + "autoResolveTime": { + "value": "[parameters('HybridVMDataDiskWriteLatencyAutoResolveTime')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMDataDiskWriteLatencyAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMDataDiskWriteLatencyEvaluationPeriods')]" + }, + "computersToInclude": { + "value": "[parameters('HybridVMDataDiskWriteLatencyComputersToInclude')]" + }, + "autoResolve": { + "value": "[parameters('HybridVMDataDiskWriteLatencyAutoResolve')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMDataDiskWriteLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMDataDiskWriteLatencyOperator')]" + }, + "disksToInclude": { + "value": "[parameters('HybridVMDataDiskWriteLatencyDisksToInclude')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_HybridVMDisconnected", + "policyDefinitionName": "Deploy_Hybrid_VM_Disconnected_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('HybridVMDisconnectedAlertEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('HybridVMDisconnectedAlertWindowSize')]" + }, + "alertResourceGroupLocation": { + "value": "[parameters('ALZMonitorResourceGroupLocation')]" + }, + "enabled": { + "value": "[parameters('HybridVMDisconnectedAlertState')]" + }, + "alertResourceGroupName": { + "value": "[parameters('ALZMonitorResourceGroupName')]" + }, + "alertResourceGroupTags": { + "value": "[parameters('ALZMonitorResourceGroupTags')]" + }, + "severity": { + "value": "[parameters('HybridVMDisconnectedAlertSeverity')]" + }, + "effect": { + "value": "[parameters('HybridVMDisconnectedAlertPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('HybridVMDisconnectedAlertDaysThreshold')]" + }, + "timeAggregation": { + "value": "[parameters('HybridVMDisconnectedAlertTimeAggregation')]" + }, + "autoMitigate": { + "value": "[parameters('HybridVMDisconnectedAlertAutoMitigate')]" + }, + "evaluationPeriods": { + "value": "[parameters('HybridVMDisconnectedAlertEvaluationPeriods')]" + }, + "failingPeriods": { + "value": "[parameters('HybridVMDisconnectedAlertFailingPeriods')]" + }, + "operator": { + "value": "[parameters('HybridVMDisconnectedAlertOperator')]" + }, + "byoUserAssignedManagedIdentityResourceId": { + "value": "[parameters('BYOUserAssignedManagedIdentityResourceId')]" + }, + "userAssignedManagedIdentityName": { + "value": "[parameters('ALZUserAssignedManagedIdentityName')]" + }, + "managementSubscriptionId": { + "value": "[parameters('ALZManagementSubscriptionId')]" + } + } + } + ] + } +} \ No newline at end of file diff --git a/Definitions/policySetDefinitions/Monitoring/alerting-identity.jsonc b/Definitions/policySetDefinitions/Monitoring/alerting-identity.jsonc index bf70eac..46d14e2 100644 --- a/Definitions/policySetDefinitions/Monitoring/alerting-identity.jsonc +++ b/Definitions/policySetDefinitions/Monitoring/alerting-identity.jsonc @@ -5,10 +5,10 @@ "displayName": "Deploy Azure Monitor Baseline Alerts for Identity", "description": "Initiative to deploy AMBA alerts relevant to the ALZ Identity management group", "metadata": { - "_deployed_by_amba": true, "alzCloudEnvironments": [ "AzureCloud" ], + "_deployed_by_amba": true, "version": "1.0.3", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" @@ -245,6 +245,18 @@ }, "type": "String" }, + "kvCapacityPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "disabled", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", + "displayName": "KeyVault Capacity Alert Policy Effect" + }, + "type": "string" + }, "kvRequestAlertSeverity": { "allowedValues": [ "0", @@ -260,18 +272,6 @@ }, "type": "String" }, - "kvCapacityPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "disabled", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist, disabled will not deploy the alert", - "displayName": "KeyVault Capacity Alert Policy Effect" - }, - "type": "string" - }, "kvRequestPolicyEffect": { "allowedValues": [ "deployIfNotExists", @@ -310,6 +310,22 @@ }, "type": "string" }, + "kvCapacityThreshold": { + "defaultValue": "75", + "metadata": { + "description": "Threshold for the alert", + "displayName": "KeyVault Capacity Alert Threshold" + }, + "type": "string" + }, + "kvRequestAlertState": { + "defaultValue": "true", + "metadata": { + "description": "State of the alert, true will enable the alert, false will disable the alert", + "displayName": "KeyVault Request Alert State" + }, + "type": "string" + }, "kvRequestWindowSize": { "allowedValues": [ "PT1M", @@ -327,22 +343,6 @@ "displayName": "KeyVault Request Alert Window Size" }, "type": "string" - }, - "kvRequestAlertState": { - "defaultValue": "true", - "metadata": { - "description": "State of the alert, true will enable the alert, false will disable the alert", - "displayName": "KeyVault Request Alert State" - }, - "type": "string" - }, - "kvCapacityThreshold": { - "defaultValue": "75", - "metadata": { - "description": "Threshold for the alert", - "displayName": "KeyVault Capacity Alert Threshold" - }, - "type": "string" } }, "policyDefinitions": [ @@ -383,11 +383,11 @@ "severity": { "value": "[parameters('KvAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('KVAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('KvAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('KVAvailabilityThreshold')]" } } }, @@ -407,11 +407,11 @@ "severity": { "value": "[parameters('KvLatencyAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('KvLatencyAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('KvLatencyAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('KvLatencyAvailabilityThreshold')]" } } }, @@ -431,11 +431,11 @@ "severity": { "value": "[parameters('KVCapacityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('KVCapacityThreshold')]" - }, "effect": { "value": "[parameters('KVCapacityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('KVCapacityThreshold')]" } } }, @@ -443,12 +443,12 @@ "policyDefinitionReferenceId": "ALZ_activityKVDelete", "policyDefinitionName": "Deploy_activitylog_KeyVault_Delete", "parameters": { - "enabled": { - "value": "[parameters('activityKVDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityKVDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, diff --git a/Definitions/policySetDefinitions/Monitoring/alerting-landingzone.jsonc b/Definitions/policySetDefinitions/Monitoring/alerting-landingzone.jsonc index 11885ce..573d097 100644 --- a/Definitions/policySetDefinitions/Monitoring/alerting-landingzone.jsonc +++ b/Definitions/policySetDefinitions/Monitoring/alerting-landingzone.jsonc @@ -5,10 +5,10 @@ "displayName": "Deploy Azure Monitor Baseline Alerts for Landing Zone", "description": "Initiative to deploy AMBA alerts relevant to the ALZ LandingZone management group", "metadata": { - "_deployed_by_amba": true, "alzCloudEnvironments": [ "AzureCloud" ], + "_deployed_by_amba": true, "version": "1.0.5", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" @@ -70,21 +70,6 @@ }, "type": "string" }, - "kvLatencyAvailabilityEvaluationFrequency": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" - ], - "defaultValue": "PT5M", - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Key Vault Latency Availability Evaluation Frequency" - }, - "type": "string" - }, "lbGlobalBackendAvailabilityAlertSeverity": { "allowedValues": [ "0", @@ -100,6 +85,21 @@ }, "type": "String" }, + "kvLatencyAvailabilityEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "Key Vault Latency Availability Evaluation Frequency" + }, + "type": "string" + }, "lbGlobalBackendAvailabilityPolicyEffect": { "allowedValues": [ "deployIfNotExists", @@ -127,6 +127,18 @@ }, "type": "String" }, + "storageAccountAvailabilityPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Storage Account Availability Policy Effect" + }, + "type": "string" + }, "lbHealthProbeStatusEvaluationFrequency": { "allowedValues": [ "PT1M", @@ -142,18 +154,6 @@ }, "type": "string" }, - "storageAccountAvailabilityPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "deployIfNotExists", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "Storage Account Availability Policy Effect" - }, - "type": "string" - }, "pipvipAvailabilityEvaluationFrequency": { "allowedValues": [ "PT1M", @@ -236,6 +236,14 @@ }, "type": "String" }, + "storageAccountAvailabilityThreshold": { + "defaultValue": "90", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Storage Account Availability Threshold" + }, + "type": "string" + }, "pipPacketsInDDoSEvaluationFrequency": { "allowedValues": [ "PT1M", @@ -266,11 +274,18 @@ }, "type": "string" }, - "storageAccountAvailabilityThreshold": { - "defaultValue": "90", + "lbUsedSNATPortsEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT1M", "metadata": { - "description": "Threshold for the alert", - "displayName": "Storage Account Availability Threshold" + "description": "Evaluation frequency for the alert", + "displayName": "LB Used SNAT Ports Evaluation Frequency" }, "type": "string" }, @@ -301,18 +316,16 @@ }, "type": "String" }, - "lbUsedSNATPortsEvaluationFrequency": { + "rvBackupHealthMonitorPolicyEffect": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" + "modify", + "audit", + "disabled" ], - "defaultValue": "PT1M", + "defaultValue": "modify", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "LB Used SNAT Ports Evaluation Frequency" + "description": "Policy effect for the alert, modify will modify the alert if it exists, or audit if it does not exist", + "displayName": "Recovery Vault Backup Health Monitor Policy Effect" }, "type": "string" }, @@ -343,16 +356,18 @@ }, "type": "string" }, - "rvBackupHealthMonitorPolicyEffect": { + "pipBytesInDDoSEvaluationFrequency": { "allowedValues": [ - "modify", - "audit", - "disabled" + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" ], - "defaultValue": "modify", + "defaultValue": "PT5M", "metadata": { - "description": "Policy effect for the alert, modify will modify the alert if it exists, or audit if it does not exist", - "displayName": "Recovery Vault Backup Health Monitor Policy Effect" + "description": "Evaluation frequency for the alert", + "displayName": "PIP Bytes In DDoS Evaluation Frequency" }, "type": "string" }, @@ -371,18 +386,26 @@ }, "type": "string" }, - "pipBytesInDDoSEvaluationFrequency": { + "lbHealthProbeStatusAlertSeverity": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "PT5M", + "defaultValue": "2", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "PIP Bytes In DDoS Evaluation Frequency" + "description": "Severity of the alert", + "displayName": "LB Health Probe Status Alert Severity" + }, + "type": "String" + }, + "lbDatapathAvailabilityAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "LB Data path Availability Alert State" }, "type": "string" }, @@ -404,29 +427,6 @@ }, "type": "string" }, - "lbDatapathAvailabilityAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "LB Data path Availability Alert State" - }, - "type": "string" - }, - "lbHealthProbeStatusAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "2", - "metadata": { - "description": "Severity of the alert", - "displayName": "LB Health Probe Status Alert Severity" - }, - "type": "String" - }, "pipdDoSAttackEvaluationFrequency": { "allowedValues": [ "PT1M", @@ -507,6 +507,18 @@ }, "type": "string" }, + "pipvipAvailabilityPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "PIP VIP Availability Policy Effect" + }, + "type": "string" + }, "storageAccountDeleteAlertState": { "defaultValue": "true", "metadata": { @@ -523,23 +535,18 @@ }, "type": "string" }, - "pipvipAvailabilityPolicyEffect": { + "kvCapacityEvaluationFrequency": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" ], - "defaultValue": "deployIfNotExists", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "PIP VIP Availability Policy Effect" - }, - "type": "string" - }, - "lbHealthProbeStatusAlertState": { - "defaultValue": "true", + "defaultValue": "PT1M", "metadata": { - "description": "Alert state for the alert", - "displayName": "LB Health Probe Status Alert State" + "description": "Evaluation frequency for the alert", + "displayName": "Key Vault Capacity Evaluation Frequency" }, "type": "string" }, @@ -558,18 +565,11 @@ }, "type": "String" }, - "kvCapacityEvaluationFrequency": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" - ], - "defaultValue": "PT1M", + "lbHealthProbeStatusAlertState": { + "defaultValue": "true", "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "Key Vault Capacity Evaluation Frequency" + "description": "Alert state for the alert", + "displayName": "LB Health Probe Status Alert State" }, "type": "string" }, @@ -591,18 +591,6 @@ }, "type": "string" }, - "pipPacketsInDDoSPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "disabled", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "PIP Packets In DDoS Policy Effect" - }, - "type": "string" - }, "pipvipAvailabilityWindowSize": { "allowedValues": [ "PT1M", @@ -651,6 +639,18 @@ }, "type": "String" }, + "pipPacketsInDDoSPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "disabled", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "PIP Packets In DDoS Policy Effect" + }, + "type": "string" + }, "pipvipAvailabilityAlertState": { "defaultValue": "true", "metadata": { @@ -659,7 +659,7 @@ }, "type": "string" }, - "pipBytesInDDoSAlertSeverity": { + "kvAvailabilityAlertSeverity": { "allowedValues": [ "0", "1", @@ -667,10 +667,10 @@ "3", "4" ], - "defaultValue": "4", + "defaultValue": "1", "metadata": { - "description": "Severity of the alert for PIP Bytes In DDoS", - "displayName": "PIP Bytes In DDoS Alert Severity" + "description": "Severity of the alert for Key Vault Availability", + "displayName": "Key Vault Availability Alert Severity" }, "type": "String" }, @@ -686,13 +686,20 @@ }, "type": "string" }, - "activityUDRUpdateAlertState": { - "defaultValue": "true", + "pipBytesInDDoSAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "4", "metadata": { - "description": "Alert state for the alert", - "displayName": "Activity UDR Update Alert State" - }, - "type": "string" + "description": "Severity of the alert for PIP Bytes In DDoS", + "displayName": "PIP Bytes In DDoS Alert Severity" + }, + "type": "String" }, "activityNSGDeleteAlertState": { "defaultValue": "true", @@ -717,21 +724,6 @@ }, "type": "String" }, - "kvAvailabilityAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "1", - "metadata": { - "description": "Severity of the alert for Key Vault Availability", - "displayName": "Key Vault Availability Alert Severity" - }, - "type": "String" - }, "pipvipAvailabilityThreshold": { "defaultValue": "1", "metadata": { @@ -740,50 +732,43 @@ }, "type": "string" }, - "pipdDoSAttackAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "1", - "metadata": { - "description": "Severity of the alert for PIP DDoS Attack", - "displayName": "PIP DDoS Attack Alert Severity" - }, - "type": "String" - }, - "activityKVDeleteAlertState": { + "activityUDRUpdateAlertState": { "defaultValue": "true", "metadata": { "description": "Alert state for the alert", - "displayName": "Activity Key Vault Delete Alert State" + "displayName": "Activity UDR Update Alert State" }, "type": "string" }, - "kvAvailabilityPolicyEffect": { + "vnetddosAttackPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "disabled", + "defaultValue": "deployIfNotExists", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "Key Vault Availability Policy Effect" + "displayName": "VNET DDoS Attack Policy Effect" }, "type": "string" }, - "vnetddosAttackPolicyEffect": { + "pipBytesInDDoSPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "VNET DDoS Attack Policy Effect" + "displayName": "PIP Bytes In DDoS Policy Effect" + }, + "type": "string" + }, + "activityKVDeleteAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Activity Key Vault Delete Alert State" }, "type": "string" }, @@ -813,35 +798,30 @@ }, "type": "string" }, - "pipBytesInDDoSPolicyEffect": { + "pipdDoSAttackAlertSeverity": { "allowedValues": [ - "deployIfNotExists", - "disabled" + "0", + "1", + "2", + "3", + "4" ], - "defaultValue": "disabled", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "PIP Bytes In DDoS Policy Effect" - }, - "type": "string" - }, - "pipPacketsInDDoSThreshold": { - "defaultValue": "40000", + "defaultValue": "1", "metadata": { - "description": "Threshold for the alert", - "displayName": "PIP Packets In DDoS Threshold" + "description": "Severity of the alert for PIP DDoS Attack", + "displayName": "PIP DDoS Attack Alert Severity" }, - "type": "string" + "type": "String" }, - "pipdDoSAttackPolicyEffect": { + "kvAvailabilityPolicyEffect": { "allowedValues": [ "deployIfNotExists", "disabled" ], - "defaultValue": "deployIfNotExists", + "defaultValue": "disabled", "metadata": { "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "PIP DDoS Attack Policy Effect" + "displayName": "Key Vault Availability Policy Effect" }, "type": "string" }, @@ -871,25 +851,35 @@ }, "type": "string" }, - "vnetddosAttackWindowSize": { + "pipdDoSAttackPolicyEffect": { "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" + "deployIfNotExists", + "disabled" ], - "defaultValue": "PT5M", + "defaultValue": "deployIfNotExists", "metadata": { - "description": "Window size for the alert", - "displayName": "VNET DDoS Attack Window Size" + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "PIP DDoS Attack Policy Effect" }, "type": "string" }, - "pipBytesInDDoSWindowSize": { + "pipPacketsInDDoSThreshold": { + "defaultValue": "40000", + "metadata": { + "description": "Threshold for the alert", + "displayName": "PIP Packets In DDoS Threshold" + }, + "type": "string" + }, + "kvAvailabilityAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Key Vault Availability Alert State" + }, + "type": "string" + }, + "kvAvailabilityWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -900,10 +890,10 @@ "PT12H", "P1D" ], - "defaultValue": "PT5M", + "defaultValue": "PT1M", "metadata": { "description": "Window size for the alert", - "displayName": "PIP Bytes In DDoS Window Size" + "displayName": "Key Vault Availability Window Size" }, "type": "string" }, @@ -915,15 +905,25 @@ }, "type": "string" }, - "kvAvailabilityAlertState": { - "defaultValue": "true", + "pipBytesInDDoSWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT5M", "metadata": { - "description": "Alert state for the alert", - "displayName": "Key Vault Availability Alert State" + "description": "Window size for the alert", + "displayName": "PIP Bytes In DDoS Window Size" }, "type": "string" }, - "kvAvailabilityWindowSize": { + "vnetddosAttackWindowSize": { "allowedValues": [ "PT1M", "PT5M", @@ -934,10 +934,10 @@ "PT12H", "P1D" ], - "defaultValue": "PT1M", + "defaultValue": "PT5M", "metadata": { "description": "Window size for the alert", - "displayName": "Key Vault Availability Window Size" + "displayName": "VNET DDoS Attack Window Size" }, "type": "string" }, @@ -965,22 +965,6 @@ }, "type": "string" }, - "pipdDoSAttackAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "PIP DDoS Attack Alert State" - }, - "type": "string" - }, - "vnetddosAttackThreshold": { - "defaultValue": "1", - "metadata": { - "description": "Threshold for the alert", - "displayName": "VNET DDoS Attack Threshold" - }, - "type": "string" - }, "pipdDoSAttackWindowSize": { "allowedValues": [ "PT1M", @@ -999,6 +983,22 @@ }, "type": "string" }, + "pipdDoSAttackAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "PIP DDoS Attack Alert State" + }, + "type": "string" + }, + "vnetddosAttackThreshold": { + "defaultValue": "1", + "metadata": { + "description": "Threshold for the alert", + "displayName": "VNET DDoS Attack Threshold" + }, + "type": "string" + }, "kvCapacityAlertSeverity": { "allowedValues": [ "0", @@ -1014,6 +1014,18 @@ }, "type": "String" }, + "kvCapacityPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "disabled", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Key Vault Capacity Policy Effect" + }, + "type": "string" + }, "pipdDoSAttackThreshold": { "defaultValue": "0", "metadata": { @@ -1037,18 +1049,6 @@ }, "type": "String" }, - "kvCapacityPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "disabled", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "Key Vault Capacity Policy Effect" - }, - "type": "string" - }, "kvRequestPolicyEffect": { "allowedValues": [ "deployIfNotExists", @@ -1087,6 +1087,22 @@ }, "type": "string" }, + "kvCapacityThreshold": { + "defaultValue": "75", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Key Vault Capacity Threshold" + }, + "type": "string" + }, + "kvRequestAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "Key Vault Request Alert State" + }, + "type": "string" + }, "kvRequestWindowSize": { "allowedValues": [ "PT1M", @@ -1105,213 +1121,34 @@ }, "type": "string" }, - "kvRequestAlertState": { + "vmNetworkInEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "VM Network In Evaluation Frequency" + }, + "type": "string" + }, + "vmNetworkInAutoMitigate": { "defaultValue": "true", "metadata": { - "description": "Alert state for the alert", - "displayName": "Key Vault Request Alert State" + "description": "Auto Mitigate for the alert", + "displayName": "VM Network In Auto Mitigate" }, "type": "string" }, - "kvCapacityThreshold": { - "defaultValue": "75", + "vmNetworkInAutoResolve": { + "defaultValue": "true", "metadata": { - "description": "Threshold for the alert", - "displayName": "Key Vault Capacity Threshold" - }, - "type": "string" - }, - "vmHeartBeatRGAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "1", - "metadata": { - "description": "Severity of the alert for VM Heart Beat RG", - "displayName": "VM Heart Beat RG Alert Severity" - }, - "type": "String" - }, - "vmHeartBeatRGWindowSize": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" - ], - "defaultValue": "PT15M", - "metadata": { - "description": "Window size for the alert", - "displayName": "VM Heart Beat RG Window Size" - }, - "type": "string" - }, - "vmHeartBeatRGEvaluationFrequency": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" - ], - "defaultValue": "PT5M", - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "VM Heart Beat RG Evaluation Frequency" - }, - "type": "string" - }, - "vmHeartBeatRGAutoMitigate": { - "defaultValue": "true", - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "VM Heart Beat RG Auto Mitigate" - }, - "type": "string" - }, - "vmHeartBeatRGAutoResolve": { - "defaultValue": "true", - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "VM Heart Beat RG Auto Resolve" - }, - "type": "string" - }, - "vmHeartBeatRGAutoResolveTime": { - "defaultValue": "00:10:00", - "metadata": { - "description": "Auto Resolve Time for the alert", - "displayName": "VM Heart Beat RG Auto Resolve Time" - }, - "type": "string" - }, - "vmHeartBeatRGPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "deployIfNotExists", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "VM Heart Beat RG Policy Effect" - }, - "type": "string" - }, - "vmHeartBeatRGAlertState": { - "defaultValue": "true", - "metadata": { - "description": "Alert state for the alert", - "displayName": "VM Heart Beat RG Alert State" - }, - "type": "string" - }, - "vmHeartBeatRGThreshold": { - "defaultValue": "10", - "metadata": { - "description": "Threshold for the alert", - "displayName": "VM Heart Beat RG Threshold" - }, - "type": "string" - }, - "vmHeartBeatRGOperator": { - "allowedValues": [ - "Equals", - "GreaterThan", - "GreaterThanOrEqual", - "LessThan", - "LessThanOrEqual" - ], - "defaultValue": "GreaterThan", - "metadata": { - "description": "Operator for the alert", - "displayName": "VM Heart Beat RG Operator" - }, - "type": "string" - }, - "vmHeartBeatRGTimeAggregation": { - "allowedValues": [ - "Average", - "Count", - "Maximum", - "Minimum", - "Total" - ], - "defaultValue": "Average", - "metadata": { - "description": "Time Aggregation for the alert", - "displayName": "VM Heart Beat RG Time Aggregation" - }, - "type": "string" - }, - "vmNetworkInAlertSeverity": { - "allowedValues": [ - "0", - "1", - "2", - "3", - "4" - ], - "defaultValue": "2", - "metadata": { - "description": "Severity of the alert for VM Network In", - "displayName": "VM Network In Alert Severity" - }, - "type": "String" - }, - "vmNetworkInWindowSize": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" - ], - "defaultValue": "PT15M", - "metadata": { - "description": "Window size for the alert", - "displayName": "VM Network In Window Size" - }, - "type": "string" - }, - "vmNetworkInEvaluationFrequency": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H" - ], - "defaultValue": "PT5M", - "metadata": { - "description": "Evaluation frequency for the alert", - "displayName": "VM Network In Evaluation Frequency" - }, - "type": "string" - }, - "vmNetworkInAutoMitigate": { - "defaultValue": "true", - "metadata": { - "description": "Auto Mitigate for the alert", - "displayName": "VM Network In Auto Mitigate" - }, - "type": "string" - }, - "vmNetworkInAutoResolve": { - "defaultValue": "true", - "metadata": { - "description": "Auto Resolve for the alert", - "displayName": "VM Network In Auto Resolve" + "description": "Auto Resolve for the alert", + "displayName": "VM Network In Auto Resolve" }, "type": "string" }, @@ -2847,24 +2684,6 @@ }, "type": "String" }, - "agwApplicationGatewayTotalTimeWindowSize": { - "allowedValues": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT1H", - "PT6H", - "PT12H", - "P1D" - ], - "defaultValue": "PT5M", - "metadata": { - "description": "Window size for the alert", - "displayName": "AGW Total Time Window Size" - }, - "type": "string" - }, "agwApplicationGatewayTotalTimeEvaluationFrequency": { "allowedValues": [ "PT1M", @@ -4123,52 +3942,233 @@ "displayName": "FD Backend Request Latency Alert State" }, "type": "string" - } - }, - "policyDefinitions": [ - { - "policyDefinitionReferenceId": "ALZ_KVRequest", - "policyDefinitionName": "Deploy_KeyVault_Requests_Alert", - "parameters": { - "evaluationFrequency": { - "value": "[parameters('KVRequestEvaluationFrequency')]" - }, - "windowSize": { - "value": "[parameters('KVRequestWindowSize')]" - }, - "enabled": { - "value": "[parameters('KVRequestAlertState')]" - }, - "severity": { - "value": "[parameters('KVRequestAlertSeverity')]" - }, - "effect": { - "value": "[parameters('KVRequestPolicyEffect')]" - } - } }, - { - "policyDefinitionReferenceId": "ALZ_KvAvailability", - "policyDefinitionName": "Deploy_KeyVault_Availability_Alert", - "parameters": { - "evaluationFrequency": { - "value": "[parameters('KvAvailabilityEvaluationFrequency')]" - }, - "windowSize": { - "value": "[parameters('KvAvailabilityWindowSize')]" - }, - "enabled": { - "value": "[parameters('KvAvailabilityAlertState')]" - }, - "severity": { - "value": "[parameters('KvAvailabilityAlertSeverity')]" - }, - "threshold": { - "value": "[parameters('KVAvailabilityThreshold')]" - }, - "effect": { - "value": "[parameters('KvAvailabilityPolicyEffect')]" - } + "agwApplicationGatewayTotalTimeWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Window size for the alert", + "displayName": "AGW Total Time Window Size" + }, + "type": "string" + }, + "vmHeartBeatRGAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "1", + "metadata": { + "description": "Severity of the alert for VM Heart Beat RG", + "displayName": "VM Heart Beat RG Alert Severity" + }, + "type": "String" + }, + "vmHeartBeatRGWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "VM Heart Beat RG Window Size" + }, + "type": "string" + }, + "vmHeartBeatRGEvaluationFrequency": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H" + ], + "defaultValue": "PT5M", + "metadata": { + "description": "Evaluation frequency for the alert", + "displayName": "VM Heart Beat RG Evaluation Frequency" + }, + "type": "string" + }, + "vmHeartBeatRGAutoMitigate": { + "defaultValue": "true", + "metadata": { + "description": "Auto Mitigate for the alert", + "displayName": "VM Heart Beat RG Auto Mitigate" + }, + "type": "string" + }, + "vmHeartBeatRGAutoResolve": { + "defaultValue": "true", + "metadata": { + "description": "Auto Resolve for the alert", + "displayName": "VM Heart Beat RG Auto Resolve" + }, + "type": "string" + }, + "vmHeartBeatRGAutoResolveTime": { + "defaultValue": "00:10:00", + "metadata": { + "description": "Auto Resolve Time for the alert", + "displayName": "VM Heart Beat RG Auto Resolve Time" + }, + "type": "string" + }, + "vmHeartBeatRGPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "VM Heart Beat RG Policy Effect" + }, + "type": "string" + }, + "vmHeartBeatRGAlertState": { + "defaultValue": "true", + "metadata": { + "description": "Alert state for the alert", + "displayName": "VM Heart Beat RG Alert State" + }, + "type": "string" + }, + "vmHeartBeatRGThreshold": { + "defaultValue": "10", + "metadata": { + "description": "Threshold for the alert", + "displayName": "VM Heart Beat RG Threshold" + }, + "type": "string" + }, + "vmHeartBeatRGOperator": { + "allowedValues": [ + "Equals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "defaultValue": "GreaterThan", + "metadata": { + "description": "Operator for the alert", + "displayName": "VM Heart Beat RG Operator" + }, + "type": "string" + }, + "vmHeartBeatRGTimeAggregation": { + "allowedValues": [ + "Average", + "Count", + "Maximum", + "Minimum", + "Total" + ], + "defaultValue": "Average", + "metadata": { + "description": "Time Aggregation for the alert", + "displayName": "VM Heart Beat RG Time Aggregation" + }, + "type": "string" + }, + "vmNetworkInAlertSeverity": { + "allowedValues": [ + "0", + "1", + "2", + "3", + "4" + ], + "defaultValue": "2", + "metadata": { + "description": "Severity of the alert for VM Network In", + "displayName": "VM Network In Alert Severity" + }, + "type": "String" + }, + "vmNetworkInWindowSize": { + "allowedValues": [ + "PT1M", + "PT5M", + "PT15M", + "PT30M", + "PT1H", + "PT6H", + "PT12H", + "P1D" + ], + "defaultValue": "PT15M", + "metadata": { + "description": "Window size for the alert", + "displayName": "VM Network In Window Size" + }, + "type": "string" + } + }, + "policyDefinitions": [ + { + "policyDefinitionReferenceId": "ALZ_KVRequest", + "policyDefinitionName": "Deploy_KeyVault_Requests_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('KVRequestEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('KVRequestWindowSize')]" + }, + "enabled": { + "value": "[parameters('KVRequestAlertState')]" + }, + "severity": { + "value": "[parameters('KVRequestAlertSeverity')]" + }, + "effect": { + "value": "[parameters('KVRequestPolicyEffect')]" + } + } + }, + { + "policyDefinitionReferenceId": "ALZ_KvAvailability", + "policyDefinitionName": "Deploy_KeyVault_Availability_Alert", + "parameters": { + "evaluationFrequency": { + "value": "[parameters('KvAvailabilityEvaluationFrequency')]" + }, + "windowSize": { + "value": "[parameters('KvAvailabilityWindowSize')]" + }, + "enabled": { + "value": "[parameters('KvAvailabilityAlertState')]" + }, + "severity": { + "value": "[parameters('KvAvailabilityAlertSeverity')]" + }, + "effect": { + "value": "[parameters('KvAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('KVAvailabilityThreshold')]" + } } }, { @@ -4187,11 +4187,11 @@ "severity": { "value": "[parameters('KvLatencyAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('KvLatencyAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('KvLatencyAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('KvLatencyAvailabilityThreshold')]" } } }, @@ -4211,11 +4211,11 @@ "severity": { "value": "[parameters('KVCapacityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('KVCapacityThreshold')]" - }, "effect": { "value": "[parameters('KVCapacityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('KVCapacityThreshold')]" } } }, @@ -4223,12 +4223,12 @@ "policyDefinitionReferenceId": "ALZ_activityKVDelete", "policyDefinitionName": "Deploy_activitylog_KeyVault_Delete", "parameters": { - "enabled": { - "value": "[parameters('activityKVDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityKVDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -4253,11 +4253,11 @@ "severity": { "value": "[parameters('StorageAccountAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('StorageAccountAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('StorageAccountAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('StorageAccountAvailabilityThreshold')]" } } }, @@ -4265,12 +4265,12 @@ "policyDefinitionReferenceId": "ALZ_activitySADelete", "policyDefinitionName": "Deploy_activitylog_StorageAccount_Delete", "parameters": { - "enabled": { - "value": "[parameters('StorageAccountDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('StorageAccountDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -4298,11 +4298,11 @@ "severity": { "value": "[parameters('PIPBytesInDDoSAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPBytesInDDoSThreshold')]" - }, "effect": { "value": "[parameters('PIPBytesInDDoSPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPBytesInDDoSThreshold')]" } } }, @@ -4322,11 +4322,11 @@ "severity": { "value": "[parameters('PIPDDoSAttackAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPDDoSAttackThreshold')]" - }, "effect": { "value": "[parameters('PIPDDoSAttackPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPDDoSAttackThreshold')]" } } }, @@ -4346,11 +4346,11 @@ "severity": { "value": "[parameters('PIPPacketsInDDoSAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPPacketsInDDoSThreshold')]" - }, "effect": { "value": "[parameters('PIPPacketsInDDoSPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPPacketsInDDoSThreshold')]" } } }, @@ -4370,11 +4370,11 @@ "severity": { "value": "[parameters('PIPVIPAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('PIPVIPAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('PIPVIPAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('PIPVIPAvailabilityThreshold')]" } } }, @@ -4382,12 +4382,12 @@ "policyDefinitionReferenceId": "ALZ_activityNSGDelete", "policyDefinitionName": "Deploy_activitylog_NSG_Delete", "parameters": { - "enabled": { - "value": "[parameters('activityNSGDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityNSGDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -4400,12 +4400,12 @@ "policyDefinitionReferenceId": "ALZ_activityUDRUpdate", "policyDefinitionName": "Deploy_activitylog_RouteTable_Update", "parameters": { - "enabled": { - "value": "[parameters('activityUDRUpdateAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityUDRUpdateAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -4439,11 +4439,11 @@ "severity": { "value": "[parameters('VNETDDOSAttackAlertSeverity')]" }, - "threshold": { - "value": "[parameters('VNETDDOSAttackThreshold')]" - }, "effect": { "value": "[parameters('VNETDDOSAttackPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('VNETDDOSAttackThreshold')]" } } }, @@ -4457,20 +4457,11 @@ "windowSize": { "value": "[parameters('VMHeartBeatRGWindowSize')]" }, - "enabled": { - "value": "[parameters('VMHeartBeatRGAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMHeartBeatRGAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMHeartBeatRGAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMHeartBeatRGThreshold')]" + "enabled": { + "value": "[parameters('VMHeartBeatRGAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4478,20 +4469,29 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMHeartBeatRGAlertSeverity')]" + }, "effect": { "value": "[parameters('VMHeartBeatRGPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMHeartBeatRGThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMHeartBeatRGTimeAggregation')]" }, - "operator": { - "value": "[parameters('VMHeartBeatRGOperator')]" - }, "autoResolveTime": { "value": "[parameters('VMHeartBeatRGAutoResolveTime')]" }, + "autoMitigate": { + "value": "[parameters('VMHeartBeatRGAutoMitigate')]" + }, "autoResolve": { "value": "[parameters('VMHeartBeatRGAutoResolve')]" + }, + "operator": { + "value": "[parameters('VMHeartBeatRGOperator')]" } } }, @@ -4505,20 +4505,11 @@ "windowSize": { "value": "[parameters('VMNetworkInWindowSize')]" }, - "enabled": { - "value": "[parameters('VMNetworkInAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMNetworkInAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMNetworkInAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMNetworkInThreshold')]" + "enabled": { + "value": "[parameters('VMNetworkInAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4526,29 +4517,38 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMNetworkInAlertSeverity')]" + }, "effect": { "value": "[parameters('VMNetworkInPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMNetworkInThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMNetworkInTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMNetworkInFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMNetworkInAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMNetworkInOperator')]" + "autoMitigate": { + "value": "[parameters('VMNetworkInAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMNetworkInEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMNetworkInAutoResolveTime')]" + "computersToInclude": { + "value": "[parameters('VMNetworkInComputersToInclude')]" }, "autoResolve": { "value": "[parameters('VMNetworkInAutoResolve')]" }, - "computersToInclude": { - "value": "[parameters('VMNetworkInComputersToInclude')]" + "failingPeriods": { + "value": "[parameters('VMNetworkInFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMNetworkInOperator')]" }, "networkInterfacesToInclude": { "value": "[parameters('VMNetworkInNetworkInterfaceToInclude')]" @@ -4565,20 +4565,11 @@ "windowSize": { "value": "[parameters('VMNetworkOutWindowSize')]" }, - "enabled": { - "value": "[parameters('VMNetworkOutAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMNetworkOutAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMNetworkOutAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMNetworkOutThreshold')]" + "enabled": { + "value": "[parameters('VMNetworkOutAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4586,29 +4577,38 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMNetworkOutAlertSeverity')]" + }, "effect": { "value": "[parameters('VMNetworkOutPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMNetworkOutThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMNetworkOutTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMNetworkOutFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMNetworkOutAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMNetworkOutOperator')]" + "autoMitigate": { + "value": "[parameters('VMNetworkOutAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMNetworkOutEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMNetworkOutAutoResolveTime')]" + "computersToInclude": { + "value": "[parameters('VMNetworkOutComputersToInclude')]" }, "autoResolve": { "value": "[parameters('VMNetworkOutAutoResolve')]" }, - "computersToInclude": { - "value": "[parameters('VMNetworkOutComputersToInclude')]" + "failingPeriods": { + "value": "[parameters('VMNetworkOutFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMNetworkOutOperator')]" }, "networkInterfacesToInclude": { "value": "[parameters('VMNetworkOutNetworkInterfaceToInclude')]" @@ -4625,20 +4625,11 @@ "windowSize": { "value": "[parameters('VMOSDiskReadLatencyWindowSize')]" }, - "enabled": { - "value": "[parameters('VMOSDiskReadLatencyAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMOSDiskReadLatencyAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMOSDiskReadLatencyAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMOSDiskReadLatencyThreshold')]" + "enabled": { + "value": "[parameters('VMOSDiskReadLatencyAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4646,29 +4637,38 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMOSDiskReadLatencyAlertSeverity')]" + }, "effect": { "value": "[parameters('VMOSDiskReadLatencyPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMOSDiskReadLatencyThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMOSDiskReadLatencyTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMOSDiskReadLatencyFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMOSDiskReadLatencyAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMOSDiskReadLatencyOperator')]" + "autoMitigate": { + "value": "[parameters('VMOSDiskReadLatencyAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMOSDiskReadLatencyEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMOSDiskReadLatencyAutoResolveTime')]" + "computersToInclude": { + "value": "[parameters('VMOSDiskReadLatencyComputersToInclude')]" }, "autoResolve": { "value": "[parameters('VMOSDiskReadLatencyAutoResolve')]" }, - "computersToInclude": { - "value": "[parameters('VMOSDiskReadLatencyComputersToInclude')]" + "failingPeriods": { + "value": "[parameters('VMOSDiskReadLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMOSDiskReadLatencyOperator')]" }, "disksToInclude": { "value": "[parameters('VMOSDiskReadLatencyDisksToInclude')]" @@ -4685,20 +4685,11 @@ "windowSize": { "value": "[parameters('VMOSDiskWriteLatencyWindowSize')]" }, - "enabled": { - "value": "[parameters('VMOSDiskWriteLatencyAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMOSDiskWriteLatencyAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMOSDiskWriteLatencyAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMOSDiskWriteLatencyThreshold')]" + "enabled": { + "value": "[parameters('VMOSDiskWriteLatencyAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4706,29 +4697,38 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMOSDiskWriteLatencyAlertSeverity')]" + }, "effect": { "value": "[parameters('VMOSDiskWriteLatencyPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMOSDiskWriteLatencyThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMOSDiskWriteLatencyTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMOSDiskWriteLatencyFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMOSDiskWriteLatencyAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMOSDiskWriteLatencyOperator')]" + "autoMitigate": { + "value": "[parameters('VMOSDiskWriteLatencyAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMOSDiskWriteLatencyEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMOSDiskWriteLatencyAutoResolveTime')]" + "computersToInclude": { + "value": "[parameters('VMOSDiskWriteLatencyComputersToInclude')]" }, "autoResolve": { "value": "[parameters('VMOSDiskWriteLatencyAutoResolve')]" }, - "computersToInclude": { - "value": "[parameters('VMOSDiskWriteLatencyComputersToInclude')]" + "failingPeriods": { + "value": "[parameters('VMOSDiskWriteLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMOSDiskWriteLatencyOperator')]" }, "disksToInclude": { "value": "[parameters('VMOSDiskWriteLatencyDisksToInclude')]" @@ -4745,20 +4745,11 @@ "windowSize": { "value": "[parameters('VMOSDiskSpaceWindowSize')]" }, - "enabled": { - "value": "[parameters('VMOSDiskSpaceAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMOSDiskSpaceAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMOSDiskSpaceAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMOSDiskSpaceThreshold')]" + "enabled": { + "value": "[parameters('VMOSDiskSpaceAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4766,29 +4757,38 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMOSDiskSpaceAlertSeverity')]" + }, "effect": { "value": "[parameters('VMOSDiskSpacePolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMOSDiskSpaceThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMOSDiskSpaceTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMOSDiskSpaceFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMOSDiskSpaceAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMOSDiskSpaceOperator')]" + "autoMitigate": { + "value": "[parameters('VMOSDiskSpaceAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMOSDiskSpaceEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMOSDiskSpaceAutoResolveTime')]" + "computersToInclude": { + "value": "[parameters('VMOSDiskSpaceComputersToInclude')]" }, "autoResolve": { "value": "[parameters('VMOSDiskSpaceAutoResolve')]" }, - "computersToInclude": { - "value": "[parameters('VMOSDiskSpaceComputersToInclude')]" + "failingPeriods": { + "value": "[parameters('VMOSDiskSpaceFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMOSDiskSpaceOperator')]" }, "disksToInclude": { "value": "[parameters('VMOSDiskSpaceDisksToInclude')]" @@ -4805,20 +4805,11 @@ "windowSize": { "value": "[parameters('VMPercentCPUWindowSize')]" }, - "enabled": { - "value": "[parameters('VMPercentCPUAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMPercentCPUAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMPercentCPUAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMPercentCPUThreshold')]" + "enabled": { + "value": "[parameters('VMPercentCPUAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4826,20 +4817,29 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMPercentCPUAlertSeverity')]" + }, "effect": { "value": "[parameters('VMPercentCPUPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMPercentCPUThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMPercentCPUTimeAggregation')]" }, - "operator": { - "value": "[parameters('VMPercentCPUOperator')]" - }, "autoResolveTime": { "value": "[parameters('VMPercentCPUAutoResolveTime')]" }, + "autoMitigate": { + "value": "[parameters('VMPercentCPUAutoMitigate')]" + }, "autoResolve": { "value": "[parameters('VMPercentCPUAutoResolve')]" + }, + "operator": { + "value": "[parameters('VMPercentCPUOperator')]" } } }, @@ -4853,20 +4853,11 @@ "windowSize": { "value": "[parameters('VMPercentMemoryWindowSize')]" }, - "enabled": { - "value": "[parameters('VMPercentMemoryAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMPercentMemoryAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMPercentMemoryAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMPercentMemoryThreshold')]" + "enabled": { + "value": "[parameters('VMPercentMemoryAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4874,20 +4865,29 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMPercentMemoryAlertSeverity')]" + }, "effect": { "value": "[parameters('VMPercentMemoryPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMPercentMemoryThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMPercentMemoryTimeAggregation')]" }, - "operator": { - "value": "[parameters('VMPercentMemoryOperator')]" - }, "autoResolveTime": { "value": "[parameters('VMPercentMemoryAutoResolveTime')]" }, + "autoMitigate": { + "value": "[parameters('VMPercentMemoryAutoMitigate')]" + }, "autoResolve": { "value": "[parameters('VMPercentMemoryAutoResolve')]" + }, + "operator": { + "value": "[parameters('VMPercentMemoryOperator')]" } } }, @@ -4901,20 +4901,11 @@ "windowSize": { "value": "[parameters('VMDataDiskSpaceWindowSize')]" }, - "enabled": { - "value": "[parameters('VMDataDiskSpaceAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMDataDiskSpaceAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMDataDiskSpaceAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMDataDiskSpaceThreshold')]" + "enabled": { + "value": "[parameters('VMDataDiskSpaceAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4922,27 +4913,36 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMDataDiskSpaceAlertSeverity')]" + }, "effect": { "value": "[parameters('VMDataDiskSpacePolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMDataDiskSpaceThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMDataDiskSpaceTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMDataDiskSpaceFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMDataDiskSpaceAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMDataDiskSpaceOperator')]" + "autoMitigate": { + "value": "[parameters('VMDataDiskSpaceAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMDataDiskSpaceEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMDataDiskSpaceAutoResolveTime')]" - }, "autoResolve": { "value": "[parameters('VMDataDiskSpaceAutoResolve')]" }, + "failingPeriods": { + "value": "[parameters('VMDataDiskSpaceFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMDataDiskSpaceOperator')]" + }, "disksToInclude": { "value": "[parameters('VMDataDiskSpaceDisksToInclude')]" } @@ -4958,20 +4958,11 @@ "windowSize": { "value": "[parameters('VMDataDiskReadLatencyWindowSize')]" }, - "enabled": { - "value": "[parameters('VMDataDiskReadLatencyAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMDataDiskReadLatencyAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMDataDiskReadLatencyAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMDataDiskReadLatencyThreshold')]" + "enabled": { + "value": "[parameters('VMDataDiskReadLatencyAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -4979,29 +4970,38 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMDataDiskReadLatencyAlertSeverity')]" + }, "effect": { "value": "[parameters('VMDataDiskReadLatencyPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMDataDiskReadLatencyThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMDataDiskReadLatencyTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMDataDiskReadLatencyFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMDataDiskReadLatencyAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMDataDiskReadLatencyOperator')]" + "autoMitigate": { + "value": "[parameters('VMDataDiskReadLatencyAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMDataDiskReadLatencyEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMDataDiskReadLatencyAutoResolveTime')]" + "computersToInclude": { + "value": "[parameters('VMDataDiskReadLatencyComputersToInclude')]" }, "autoResolve": { "value": "[parameters('VMDataDiskReadLatencyAutoResolve')]" }, - "computersToInclude": { - "value": "[parameters('VMDataDiskReadLatencyComputersToInclude')]" + "failingPeriods": { + "value": "[parameters('VMDataDiskReadLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMDataDiskReadLatencyOperator')]" }, "disksToInclude": { "value": "[parameters('VMDataDiskReadLatencyDisksToInclude')]" @@ -5018,20 +5018,11 @@ "windowSize": { "value": "[parameters('VMDataDiskWriteLatencyWindowSize')]" }, - "enabled": { - "value": "[parameters('VMDataDiskWriteLatencyAlertState')]" - }, - "autoMitigate": { - "value": "[parameters('VMDataDiskWriteLatencyAutoMitigate')]" - }, - "severity": { - "value": "[parameters('VMDataDiskWriteLatencyAlertSeverity')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "threshold": { - "value": "[parameters('VMDataDiskWriteLatencyThreshold')]" + "enabled": { + "value": "[parameters('VMDataDiskWriteLatencyAlertState')]" }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" @@ -5039,29 +5030,38 @@ "alertResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, + "severity": { + "value": "[parameters('VMDataDiskWriteLatencyAlertSeverity')]" + }, "effect": { "value": "[parameters('VMDataDiskWriteLatencyPolicyEffect')]" }, + "threshold": { + "value": "[parameters('VMDataDiskWriteLatencyThreshold')]" + }, "timeAggregation": { "value": "[parameters('VMDataDiskWriteLatencyTimeAggregation')]" }, - "failingPeriods": { - "value": "[parameters('VMDataDiskWriteLatencyFailingPeriods')]" + "autoResolveTime": { + "value": "[parameters('VMDataDiskWriteLatencyAutoResolveTime')]" }, - "operator": { - "value": "[parameters('VMDataDiskWriteLatencyOperator')]" + "autoMitigate": { + "value": "[parameters('VMDataDiskWriteLatencyAutoMitigate')]" }, "evaluationPeriods": { "value": "[parameters('VMDataDiskWriteLatencyEvaluationPeriods')]" }, - "autoResolveTime": { - "value": "[parameters('VMDataDiskWriteLatencyAutoResolveTime')]" + "computersToInclude": { + "value": "[parameters('VMDataDiskWriteLatencyComputersToInclude')]" }, "autoResolve": { "value": "[parameters('VMDataDiskWriteLatencyAutoResolve')]" }, - "computersToInclude": { - "value": "[parameters('VMDataDiskWriteLatencyComputersToInclude')]" + "failingPeriods": { + "value": "[parameters('VMDataDiskWriteLatencyFailingPeriods')]" + }, + "operator": { + "value": "[parameters('VMDataDiskWriteLatencyOperator')]" }, "disksToInclude": { "value": "[parameters('VMDataDiskWriteLatencyDisksToInclude')]" diff --git a/Definitions/policySetDefinitions/Monitoring/alerting-management.jsonc b/Definitions/policySetDefinitions/Monitoring/alerting-management.jsonc index cc3f8aa..a3d9537 100644 --- a/Definitions/policySetDefinitions/Monitoring/alerting-management.jsonc +++ b/Definitions/policySetDefinitions/Monitoring/alerting-management.jsonc @@ -5,10 +5,10 @@ "displayName": "Deploy Azure Monitor Baseline Alerts for Management", "description": "Initiative to deploy AMBA alerts relevant to the ALZ Management management group", "metadata": { - "_deployed_by_amba": true, "alzCloudEnvironments": [ "AzureCloud" ], + "_deployed_by_amba": true, "version": "1.0.3", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" @@ -93,6 +93,14 @@ }, "type": "string" }, + "storageAccountAvailabilityThreshold": { + "defaultValue": "90", + "metadata": { + "description": "Threshold for the alert", + "displayName": "Storage Account Availability Alert Threshold" + }, + "type": "string" + }, "storageAccountAvailabilityFrequency": { "allowedValues": [ "PT1M", @@ -108,14 +116,6 @@ }, "type": "string" }, - "storageAccountAvailabilityThreshold": { - "defaultValue": "90", - "metadata": { - "description": "Threshold for the alert", - "displayName": "Storage Account Availability Alert Threshold" - }, - "type": "string" - }, "rvBackupHealthMonitorPolicyEffect": { "allowedValues": [ "modify", @@ -247,12 +247,12 @@ "policyDefinitionReferenceId": "ALZ_activityLAWDelete", "policyDefinitionName": "Deploy_activitylog_LAWorkspace_Delete", "parameters": { - "enabled": { - "value": "[parameters('activityLAWDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityLAWDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -265,12 +265,12 @@ "policyDefinitionReferenceId": "ALZ_activityLAWKeyRegen", "policyDefinitionName": "Deploy_activitylog_LAWorkspace_KeyRegen", "parameters": { - "enabled": { - "value": "[parameters('activityLAWKeyRegenAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('activityLAWKeyRegenAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -295,11 +295,11 @@ "severity": { "value": "[parameters('AATotalJobAlertSeverity')]" }, - "threshold": { - "value": "[parameters('AATotalJobAlertThreshold')]" - }, "effect": { "value": "[parameters('AATotalJobAlertPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('AATotalJobAlertThreshold')]" } } }, @@ -328,11 +328,11 @@ "severity": { "value": "[parameters('StorageAccountAvailabilityAlertSeverity')]" }, - "threshold": { - "value": "[parameters('StorageAccountAvailabilityThreshold')]" - }, "effect": { "value": "[parameters('StorageAccountAvailabilityPolicyEffect')]" + }, + "threshold": { + "value": "[parameters('StorageAccountAvailabilityThreshold')]" } } }, @@ -340,12 +340,12 @@ "policyDefinitionReferenceId": "ALZ_activitySADelete", "policyDefinitionName": "Deploy_activitylog_StorageAccount_Delete", "parameters": { - "enabled": { - "value": "[parameters('StorageAccountDeleteAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('StorageAccountDeleteAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, diff --git a/Definitions/policySetDefinitions/Monitoring/alerting-servicehealth.jsonc b/Definitions/policySetDefinitions/Monitoring/alerting-servicehealth.jsonc index 8a0df5b..805a15d 100644 --- a/Definitions/policySetDefinitions/Monitoring/alerting-servicehealth.jsonc +++ b/Definitions/policySetDefinitions/Monitoring/alerting-servicehealth.jsonc @@ -5,23 +5,15 @@ "displayName": "Deploy Azure Monitor Baseline Alerts for Service Health", "description": "Initiative to deploy AMBA Service Health alerts to Azure services", "metadata": { - "_deployed_by_amba": true, "alzCloudEnvironments": [ "AzureCloud" ], + "_deployed_by_amba": true, "version": "1.4.0", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" }, "parameters": { - "monitorDisable": { - "defaultValue": "MonitorDisable", - "metadata": { - "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", - "displayName": "Monitoring disabled" - }, - "type": "string" - }, "alzMonitorResourceGroupLocation": { "defaultValue": "centralus", "metadata": { @@ -30,14 +22,6 @@ }, "type": "String" }, - "alzMonitorActionGroupEmail": { - "defaultValue": "", - "metadata": { - "description": "Email addresses to send alerts to", - "displayName": "Action Group Email Addresses" - }, - "type": "string" - }, "alzMonitorResourceGroupTags": { "defaultValue": { "_deployed_by_alz_monitor": true @@ -56,6 +40,14 @@ }, "type": "String" }, + "alzMonitorActionGroupEmail": { + "defaultValue": "", + "metadata": { + "description": "Email addresses to send alerts to", + "displayName": "Action Group Email Addresses" + }, + "type": "string" + }, "byoActionGroup": { "defaultValue": "", "metadata": { @@ -64,6 +56,14 @@ }, "type": "String" }, + "monitorDisable": { + "defaultValue": "MonitorDisable", + "metadata": { + "description": "Tag name to disable monitoring. Set to true if monitoring should be disabled", + "displayName": "Monitoring disabled" + }, + "type": "string" + }, "alzLogicappCallbackUrl": { "defaultValue": "", "metadata": { @@ -80,11 +80,11 @@ }, "type": "String" }, - "alzFunctionResourceId": { + "alzEventHubResourceId": { "defaultValue": "", "metadata": { - "description": "Function Resource Id for Action Group to send alerts to", - "displayName": "Function Resource Id" + "description": "Event Hub resource id for action group to send alerts to", + "displayName": "Event Hub resource id" }, "type": "String" }, @@ -96,19 +96,19 @@ }, "type": "String" }, - "alzEventHubResourceId": { + "alzLogicappResourceId": { "defaultValue": "", "metadata": { - "description": "Event Hub resource id for action group to send alerts to", - "displayName": "Event Hub resource id" + "description": "Logic App Resource Id for Action Group to send alerts to", + "displayName": "Logic App Resource Id" }, "type": "String" }, - "alzLogicappResourceId": { + "alzFunctionResourceId": { "defaultValue": "", "metadata": { - "description": "Logic App Resource Id for Action Group to send alerts to", - "displayName": "Logic App Resource Id" + "description": "Function Resource Id for Action Group to send alerts to", + "displayName": "Function Resource Id" }, "type": "String" }, @@ -128,34 +128,6 @@ }, "type": "String" }, - "resHlthUnhealthyAlertState": { - "defaultValue": "true", - "metadata": { - "description": "State of the Resource Health Unhealthy alert", - "displayName": "Resource Health Unhealthy Alert State" - }, - "type": "string" - }, - "resHlthUnhealthyPolicyEffect": { - "allowedValues": [ - "deployIfNotExists", - "disabled" - ], - "defaultValue": "deployIfNotExists", - "metadata": { - "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", - "displayName": "Resource Health Unhealthy Alert Policy Effect" - }, - "type": "string" - }, - "svcHlthAdvisoryAlertState": { - "defaultValue": "true", - "metadata": { - "description": "State of the Service Health Advisory alert", - "displayName": "Service Health Advisory Alert State" - }, - "type": "string" - }, "serviceHealthAdvisoryPolicyEffect": { "allowedValues": [ "deployIfNotExists", @@ -227,6 +199,34 @@ "displayName": "Service Health Security Advisory Alert Policy Effect" }, "type": "string" + }, + "resHlthUnhealthyAlertState": { + "defaultValue": "true", + "metadata": { + "description": "State of the Resource Health Unhealthy alert", + "displayName": "Resource Health Unhealthy Alert State" + }, + "type": "string" + }, + "resHlthUnhealthyPolicyEffect": { + "allowedValues": [ + "deployIfNotExists", + "disabled" + ], + "defaultValue": "deployIfNotExists", + "metadata": { + "description": "Policy effect for the alert, deployIfNotExists will deploy the alert if it does not exist", + "displayName": "Resource Health Unhealthy Alert Policy Effect" + }, + "type": "string" + }, + "svcHlthAdvisoryAlertState": { + "defaultValue": "true", + "metadata": { + "description": "State of the Service Health Advisory alert", + "displayName": "Service Health Advisory Alert State" + }, + "type": "string" } }, "policyDefinitions": [ @@ -237,15 +237,15 @@ "alzMonitorResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "alzMonitorActionGroupEmail": { - "value": "[parameters('ALZMonitorActionGroupEmail')]" - }, "alzMonitorResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, "alzMonitorResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, + "alzMonitorActionGroupEmail": { + "value": "[parameters('ALZMonitorActionGroupEmail')]" + }, "byoActionGroup": { "value": "[parameters('BYOActionGroup')]" }, @@ -255,18 +255,18 @@ "byoAlertProcessingRule": { "value": "[parameters('BYOAlertProcessingRule')]" }, - "alzFunctionResourceId": { - "value": "[parameters('ALZFunctionResourceId')]" + "alzEventHubResourceId": { + "value": "[parameters('ALZEventHubResourceId')]" }, "alzFunctionTriggerUrl": { "value": "[parameters('ALZFunctionTriggerUrl')]" }, - "alzEventHubResourceId": { - "value": "[parameters('ALZEventHubResourceId')]" - }, "alzLogicappResourceId": { "value": "[parameters('ALZLogicappResourceId')]" }, + "alzFunctionResourceId": { + "value": "[parameters('ALZFunctionResourceId')]" + }, "alzWebhookServiceUri": { "value": "[parameters('ALZWebhookServiceUri')]" }, @@ -279,12 +279,12 @@ "policyDefinitionReferenceId": "ALZ_ResHlthUnhealthy", "policyDefinitionName": "Deploy_activitylog_ResourceHealth_Unhealthy_Alert", "parameters": { - "enabled": { - "value": "[parameters('ResHlthUnhealthyAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('ResHlthUnhealthyAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -294,11 +294,11 @@ "effect": { "value": "[parameters('ResHlthUnhealthyPolicyEffect')]" }, - "monitorDisable": { - "value": "[parameters('MonitorDisable')]" - }, "byoActionGroup": { "value": "[parameters('BYOActionGroup')]" + }, + "monitorDisable": { + "value": "[parameters('MonitorDisable')]" } } }, @@ -306,12 +306,12 @@ "policyDefinitionReferenceId": "ALZ_SvcHlthAdvisory", "policyDefinitionName": "Deploy_activitylog_ServiceHealth_HealthAdvisory", "parameters": { - "enabled": { - "value": "[parameters('SvcHlthAdvisoryAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('SvcHlthAdvisoryAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -321,14 +321,14 @@ "effect": { "value": "[parameters('serviceHealthAdvisoryPolicyEffect')]" }, - "monitorDisable": { - "value": "[parameters('MonitorDisable')]" - }, "alzMonitorActionGroupEmail": { "value": "[parameters('ALZMonitorActionGroupEmail')]" }, "byoActionGroup": { "value": "[parameters('BYOActionGroup')]" + }, + "monitorDisable": { + "value": "[parameters('MonitorDisable')]" } } }, @@ -336,12 +336,12 @@ "policyDefinitionReferenceId": "ALZ_SvcHlthIncident", "policyDefinitionName": "Deploy_activitylog_ServiceHealth_Incident", "parameters": { - "enabled": { - "value": "[parameters('SvcHlthIncidentAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('SvcHlthIncidentAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -351,14 +351,14 @@ "effect": { "value": "[parameters('serviceHealthIncidentPolicyEffect')]" }, - "monitorDisable": { - "value": "[parameters('MonitorDisable')]" - }, "alzMonitorActionGroupEmail": { "value": "[parameters('ALZMonitorActionGroupEmail')]" }, "byoActionGroup": { "value": "[parameters('BYOActionGroup')]" + }, + "monitorDisable": { + "value": "[parameters('MonitorDisable')]" } } }, @@ -366,12 +366,12 @@ "policyDefinitionReferenceId": "ALZ_SvcHlthMaintenance", "policyDefinitionName": "Deploy_activitylog_ServiceHealth_Maintenance", "parameters": { - "enabled": { - "value": "[parameters('SvcHlthMaintenanceAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('SvcHlthMaintenanceAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -381,14 +381,14 @@ "effect": { "value": "[parameters('serviceHealthMaintenancePolicyEffect')]" }, - "monitorDisable": { - "value": "[parameters('MonitorDisable')]" - }, "alzMonitorActionGroupEmail": { "value": "[parameters('ALZMonitorActionGroupEmail')]" }, "byoActionGroup": { "value": "[parameters('BYOActionGroup')]" + }, + "monitorDisable": { + "value": "[parameters('MonitorDisable')]" } } }, @@ -396,12 +396,12 @@ "policyDefinitionReferenceId": "ALZ_svcHlthSecAdvisory", "policyDefinitionName": "Deploy_activitylog_ServiceHealth_SecurityAdvisory", "parameters": { - "enabled": { - "value": "[parameters('svcHlthSecAdvisoryAlertState')]" - }, "alertResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, + "enabled": { + "value": "[parameters('svcHlthSecAdvisoryAlertState')]" + }, "alertResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, @@ -411,14 +411,14 @@ "effect": { "value": "[parameters('serviceHealthSecurityPolicyEffect')]" }, - "monitorDisable": { - "value": "[parameters('MonitorDisable')]" - }, "alzMonitorActionGroupEmail": { "value": "[parameters('ALZMonitorActionGroupEmail')]" }, "byoActionGroup": { "value": "[parameters('BYOActionGroup')]" + }, + "monitorDisable": { + "value": "[parameters('MonitorDisable')]" } } } diff --git a/Definitions/policySetDefinitions/Monitoring/notification-assets.jsonc b/Definitions/policySetDefinitions/Monitoring/notification-assets.jsonc index c64d9d8..f182b7b 100644 --- a/Definitions/policySetDefinitions/Monitoring/notification-assets.jsonc +++ b/Definitions/policySetDefinitions/Monitoring/notification-assets.jsonc @@ -5,10 +5,10 @@ "displayName": "Deploy Azure Monitor Baseline Alerts - Notification Assets", "description": "Initiative to deploy AMBA Notification Assets", "metadata": { - "_deployed_by_amba": true, "alzCloudEnvironments": [ "AzureCloud" ], + "_deployed_by_amba": true, "version": "1.2.0", "category": "Monitoring", "source": "https://github.com/Azure/azure-monitor-baseline-alerts/" @@ -22,14 +22,6 @@ }, "type": "String" }, - "alzMonitorActionGroupEmail": { - "defaultValue": "", - "metadata": { - "description": "Email addresses to send alerts to", - "displayName": "Action Group Email Addresses" - }, - "type": "String" - }, "alzMonitorResourceGroupTags": { "defaultValue": { "_deployed_by_alz_monitor": true @@ -48,6 +40,14 @@ }, "type": "String" }, + "alzMonitorActionGroupEmail": { + "defaultValue": "", + "metadata": { + "description": "Email addresses to send alerts to", + "displayName": "Action Group Email Addresses" + }, + "type": "String" + }, "byoActionGroup": { "defaultValue": "", "metadata": { @@ -72,11 +72,11 @@ }, "type": "String" }, - "alzFunctionResourceId": { + "alzEventHubResourceId": { "defaultValue": "", "metadata": { - "description": "Function Resource Id for Action Group to send alerts to", - "displayName": "Function Resource Id" + "description": "Event Hub resource id for action group to send alerts to", + "displayName": "Event Hub resource id" }, "type": "String" }, @@ -88,19 +88,19 @@ }, "type": "String" }, - "alzEventHubResourceId": { + "alzLogicappResourceId": { "defaultValue": "", "metadata": { - "description": "Event Hub resource id for action group to send alerts to", - "displayName": "Event Hub resource id" + "description": "Logic App Resource Id for Action Group to send alerts to", + "displayName": "Logic App Resource Id" }, "type": "String" }, - "alzLogicappResourceId": { + "alzFunctionResourceId": { "defaultValue": "", "metadata": { - "description": "Logic App Resource Id for Action Group to send alerts to", - "displayName": "Logic App Resource Id" + "description": "Function Resource Id for Action Group to send alerts to", + "displayName": "Function Resource Id" }, "type": "String" }, @@ -129,15 +129,15 @@ "alzMonitorResourceGroupLocation": { "value": "[parameters('ALZMonitorResourceGroupLocation')]" }, - "alzMonitorActionGroupEmail": { - "value": "[parameters('ALZMonitorActionGroupEmail')]" - }, "alzMonitorResourceGroupTags": { "value": "[parameters('ALZMonitorResourceGroupTags')]" }, "alzMonitorResourceGroupName": { "value": "[parameters('ALZMonitorResourceGroupName')]" }, + "alzMonitorActionGroupEmail": { + "value": "[parameters('ALZMonitorActionGroupEmail')]" + }, "byoActionGroup": { "value": "[parameters('BYOActionGroup')]" }, @@ -147,18 +147,18 @@ "byoAlertProcessingRule": { "value": "[parameters('BYOAlertProcessingRule')]" }, - "alzFunctionResourceId": { - "value": "[parameters('ALZFunctionResourceId')]" + "alzEventHubResourceId": { + "value": "[parameters('ALZEventHubResourceId')]" }, "alzFunctionTriggerUrl": { "value": "[parameters('ALZFunctionTriggerUrl')]" }, - "alzEventHubResourceId": { - "value": "[parameters('ALZEventHubResourceId')]" - }, "alzLogicappResourceId": { "value": "[parameters('ALZLogicappResourceId')]" }, + "alzFunctionResourceId": { + "value": "[parameters('ALZFunctionResourceId')]" + }, "alzWebhookServiceUri": { "value": "[parameters('ALZWebhookServiceUri')]" }, diff --git a/assets/alzArm.param.json b/assets/alzArm.param.json index 529fb18..f85b63d 100644 --- a/assets/alzArm.param.json +++ b/assets/alzArm.param.json @@ -35,43 +35,99 @@ "enableAMBAServiceHealth": { "value": "Yes" }, + "enableAMBANotificationAssets": { + "value": "Yes" + }, + "enableAMBAHybridVM": { + "value": "Yes" + }, "telemetryOptOut": { "value": "No" }, - "policyAssignmentParametersCommon": { + "bringYourOwnUserAssignedManagedIdentity": { + "value": "No" + }, + "bringYourOwnUserAssignedManagedIdentityResourceId": { + "value": "" + }, + "userAssignedManagedIdentityName": { + "value": "id-amba-prod-001" + }, + "managementSubscriptionId": { + "value": "8cfb2a5f-85a5-48ae-88fe-e11d149f9874" + }, + "ALZMonitorResourceGroupName": { + "value": "rg-amba-monitoring-001" + }, + "ALZMonitorResourceGroupLocation": { + "value": "australiaeast" + }, + "ALZMonitorResourceGroupTags": { "value": { - "ALZMonitorResourceGroupName": { - "value": "rg-amba-monitor" - }, - "ALZMonitorResourceGroupTags": { - "value": { - "Project": "alz-monitor" - } - }, - "ALZMonitorResourceGroupLocation": { - "value": "eastus" - } + "Project": "amba-monitoring" } }, + "ALZMonitorActionGroupEmail": { + "value": "action@mail.com" + }, + "ALZLogicappResourceId": { + "value": "" + }, + "ALZLogicappCallbackUrl": { + "value": "" + }, + "ALZArmRoleId": { + "value": "" + }, + "ALZEventHubResourceId": { + "value": "" + }, + "ALZWebhookServiceUri": { + "value": "" + }, + "ALZFunctionResourceId": { + "value": "" + }, + "ALZFunctionTriggerUrl": { + "value": "" + }, + "BYOActionGroup": { + "value": "" + }, + "BYOAlertProcessingRule": { + "value": "" + }, "policyAssignmentParametersServiceHealth": { "value": { - "ALZMonitorActionGroupEmail": { - "value": "action@mail.com" - }, "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" } } }, @@ -1027,6 +1083,12 @@ "StorageAccountAvailabilityThreshold": { "value": "90" }, + "StorageAccountDeletePolicyEffect": { + "value": "deployIfNotExists" + }, + "StorageAccountDeleteAlertState": { + "value": "true" + }, "PIPDDoSAttackAlertSeverity": { "value": "1" }, @@ -1794,6 +1856,697 @@ }, "LBUsedSNATPortsAlertState": { "value": "true" + }, + "TMEndpointHealthAlertSeverity": { + "value": "2" + }, + "TMEndpointHealthWindowSize": { + "value": "PT5M" + }, + "TMEndpointHealthEvaluationFrequency": { + "value": "PT1M" + }, + "TMEndpointHealthPolicyEffect": { + "value": "deployIfNotExists" + }, + "TMEndpointHealthAlertState": { + "value": "true" + }, + "WSFCPUPercentageAlertSeverity": { + "value": "2" + }, + "WSFCPUPercentageWindowSize": { + "value": "PT5M" + }, + "WSFCPUPercentageEvaluationFrequency": { + "value": "PT1M" + }, + "WSFCPUPercentagePolicyEffect": { + "value": "deployIfNotExists" + }, + "WSFCPUPercentageAlertState": { + "value": "true" + }, + "WSFMemoryPercentageAlertSeverity": { + "value": "2" + }, + "WSFMemoryPercentageWindowSize": { + "value": "PT5M" + }, + "WSFMemoryPercentageEvaluationFrequency": { + "value": "PT1M" + }, + "WSFMemoryPercentagePolicyEffect": { + "value": "deployIfNotExists" + }, + "WSFMemoryPercentageAlertState": { + "value": "true" + }, + "WSFDiskQueueLengthAlertSeverity": { + "value": "2" + }, + "WSFDiskQueueLengthWindowSize": { + "value": "PT5M" + }, + "WSFDiskQueueLengthEvaluationFrequency": { + "value": "PT1M" + }, + "WSFDiskQueueLengthPolicyEffect": { + "value": "deployIfNotExists" + }, + "WSFDiskQueueLengthAlertState": { + "value": "true" + }, + "WSFHttpQueueLengthAlertSeverity": { + "value": "2" + }, + "WSFHttpQueueLengthWindowSize": { + "value": "PT5M" + }, + "WSFHttpQueueLengthEvaluationFrequency": { + "value": "PT1M" + }, + "WSFHttpQueueLengthPolicyEffect": { + "value": "deployIfNotExists" + }, + "WSFHttpQueueLengthAlertState": { + "value": "true" + }, + "CDNPOriginHealthPercentageAlertSeverity": { + "value": "2" + }, + "CDNPOriginHealthPercentageWindowSize": { + "value": "PT5M" + }, + "CDNPOriginHealthPercentageEvaluationFrequency": { + "value": "PT1M" + }, + "CDNPOriginHealthPercentagePolicyEffect": { + "value": "deployIfNotExists" + }, + "CDNPOriginHealthPercentageAlertState": { + "value": "true" + }, + "CDNPOriginLatencyAlertSeverity": { + "value": "2" + }, + "CDNPOriginLatencyWindowSize": { + "value": "PT5M" + }, + "CDNPOriginLatencyEvaluationFrequency": { + "value": "PT1M" + }, + "CDNPOriginLatencyPolicyEffect": { + "value": "disabled" + }, + "CDNPOriginLatencyAlertState": { + "value": "true" + }, + "CDNPPercentage4XXAlertSeverity": { + "value": "2" + }, + "CDNPPercentage4XXWindowSize": { + "value": "PT5M" + }, + "CDNPPercentage4XXEvaluationFrequency": { + "value": "PT1M" + }, + "CDNPPercentage4XXPolicyEffect": { + "value": "deployIfNotExists" + }, + "CDNPPercentage4XXAlertState": { + "value": "true" + }, + "CDNPPercentage5XXAlertSeverity": { + "value": "2" + }, + "CDNPPercentage5XXWindowSize": { + "value": "PT5M" + }, + "CDNPPercentage5XXEvaluationFrequency": { + "value": "PT1M" + }, + "CDNPPercentage5XXPolicyEffect": { + "value": "deployIfNotExists" + }, + "CDNPPercentage5XXAlertState": { + "value": "true" + }, + "FDBackendHealthAlertSeverity": { + "value": "2" + }, + "FDBackendHealthWindowSize": { + "value": "PT5M" + }, + "FDBackendHealthEvaluationFrequency": { + "value": "PT1M" + }, + "FDBackendHealthPolicyEffect": { + "value": "deployIfNotExists" + }, + "FDBackendHealthAlertState": { + "value": "true" + }, + "FDBackendRequestLatencyAlertSeverity": { + "value": "2" + }, + "FDBackendRequestLatencyWindowSize": { + "value": "PT5M" + }, + "FDBackendRequestLatencyEvaluationFrequency": { + "value": "PT1M" + }, + "FDBackendRequestLatencyPolicyEffect": { + "value": "deployIfNotExists" + }, + "FDBackendRequestLatencyAlertState": { + "value": "true" + } + } + }, + "policyAssignmentParametersHybridVM": { + "value": { + "HybridVMHeartBeatRGAlertSeverity": { + "value": "1" + }, + "HybridVMHeartBeatRGWindowSize": { + "value": "PT15M" + }, + "HybridVMHeartBeatRGEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMHeartBeatRGAutoMitigate": { + "value": "true" + }, + "HybridVMHeartBeatRGAutoResolve": { + "value": "true" + }, + "HybridVMHeartBeatRGAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMHeartBeatRGPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMHeartBeatRGAlertState": { + "value": "true" + }, + "HybridVMHeartBeatRGThreshold": { + "value": "10" + }, + "HybridVMHeartBeatRGOperator": { + "value": "GreaterThan" + }, + "HybridVMHeartBeatRGTimeAggregation": { + "value": "Average" + }, + "HybridVMNetworkInAlertSeverity": { + "value": "2" + }, + "HybridVMNetworkInWindowSize": { + "value": "PT15M" + }, + "HybridVMNetworkInEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMNetworkInAutoMitigate": { + "value": "true" + }, + "HybridVMNetworkInAutoResolve": { + "value": "true" + }, + "HybridVMNetworkInAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMNetworkInPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMNetworkInAlertState": { + "value": "true" + }, + "HybridVMNetworkInThreshold": { + "value": "10000000" + }, + "HybridVMNetworkInOperator": { + "value": "GreaterThan" + }, + "HybridVMNetworkInTimeAggregation": { + "value": "Average" + }, + "HybridVMNetworkInEvaluationPeriods": { + "value": "1" + }, + "HybridVMNetworkInFailingPeriods": { + "value": "1" + }, + "HybridVMNetworkInComputersToInclude": { + "value": [ + "*" + ] + }, + "HybridVMNetworkInNetworkInterfaceToInclude": { + "value": [ + "*" + ] + }, + "HybridVMNetworkOutAlertSeverity": { + "value": "2" + }, + "HybridVMNetworkOutWindowSize": { + "value": "PT15M" + }, + "HybridVMNetworkOutEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMNetworkOutAutoMitigate": { + "value": "true" + }, + "HybridVMNetworkOutAutoResolve": { + "value": "true" + }, + "HybridVMNetworkOutAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMNetworkOutPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMNetworkOutAlertState": { + "value": "true" + }, + "HybridVMNetworkOutThreshold": { + "value": "10000000" + }, + "HybridVMNetworkOutOperator": { + "value": "GreaterThan" + }, + "HybridVMNetworkOutTimeAggregation": { + "value": "Average" + }, + "HybridVMNetworkOutEvaluationPeriods": { + "value": "1" + }, + "HybridVMNetworkOutFailingPeriods": { + "value": "1" + }, + "HybridVMNetworkOutComputersToInclude": { + "value": [ + "*" + ] + }, + "HybridVMNetworkOutNetworkInterfaceToInclude": { + "value": [ + "*" + ] + }, + "HybridVMOSDiskReadLatencyAlertSeverity": { + "value": "2" + }, + "HybridVMOSDiskReadLatencyWindowSize": { + "value": "PT15M" + }, + "HybridVMOSDiskReadLatencyEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMOSDiskReadLatencyAutoMitigate": { + "value": "true" + }, + "HybridVMOSDiskReadLatencyAutoResolve": { + "value": "true" + }, + "HybridVMOSDiskReadLatencyAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMOSDiskReadLatencyPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMOSDiskReadLatencyAlertState": { + "value": "true" + }, + "HybridVMOSDiskReadLatencyThreshold": { + "value": "30" + }, + "HybridVMOSDiskReadLatencyOperator": { + "value": "LessThan" + }, + "HybridVMOSDiskReadLatencyTimeAggregation": { + "value": "Average" + }, + "HybridVMOSDiskReadLatencyEvaluationPeriods": { + "value": "1" + }, + "HybridVMOSDiskReadLatencyFailingPeriods": { + "value": "1" + }, + "HybridVMOSDiskReadLatencyComputersToInclude": { + "value": [ + "*" + ] + }, + "HybridVMOSDiskReadLatencyDisksToInclude": { + "value": [ + "C:", + "/" + ] + }, + "HybridVMOSDiskWriteLatencyAlertSeverity": { + "value": "2" + }, + "HybridVMOSDiskWriteLatencyWindowSize": { + "value": "PT15M" + }, + "HybridVMOSDiskWriteLatencyEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMOSDiskWriteLatencyAutoMitigate": { + "value": "true" + }, + "HybridVMOSDiskWriteLatencyAutoResolve": { + "value": "true" + }, + "HybridVMOSDiskWriteLatencyAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMOSDiskWriteLatencyPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMOSDiskWriteLatencyAlertState": { + "value": "true" + }, + "HybridVMOSDiskWriteLatencyThreshold": { + "value": "50" + }, + "HybridVMOSDiskWriteLatencyOperator": { + "value": "LessThan" + }, + "HybridVMOSDiskWriteLatencyTimeAggregation": { + "value": "Average" + }, + "HybridVMOSDiskWriteLatencyEvaluationPeriods": { + "value": "1" + }, + "HybridVMOSDiskWriteLatencyFailingPeriods": { + "value": "1" + }, + "HybridVMOSDiskWriteLatencyComputersToInclude": { + "value": [ + "*" + ] + }, + "HybridVMOSDiskWriteLatencyDisksToInclude": { + "value": [ + "C:", + "/" + ] + }, + "HybridVMOSDiskSpaceAlertSeverity": { + "value": "2" + }, + "HybridVMOSDiskSpaceWindowSize": { + "value": "PT15M" + }, + "HybridVMOSDiskSpaceEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMOSDiskSpaceAutoMitigate": { + "value": "true" + }, + "HybridVMOSDiskSpaceAutoResolve": { + "value": "true" + }, + "HybridVMOSDiskSpaceAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMOSDiskSpacePolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMOSDiskSpaceAlertState": { + "value": "true" + }, + "HybridVMOSDiskSpaceThreshold": { + "value": "10" + }, + "HybridVMOSDiskSpaceOperator": { + "value": "LessThan" + }, + "HybridVMOSDiskSpaceTimeAggregation": { + "value": "Average" + }, + "HybridVMOSDiskSpaceEvaluationPeriods": { + "value": "1" + }, + "HybridVMOSDiskSpaceFailingPeriods": { + "value": "1" + }, + "HybridVMOSDiskSpaceComputersToInclude": { + "value": [ + "*" + ] + }, + "HybridVMOSDiskSpaceDisksToInclude": { + "value": [ + "C:", + "/" + ] + }, + "HybridVMPercentCPUAlertSeverity": { + "value": "2" + }, + "HybridVMPercentCPUWindowSize": { + "value": "PT15M" + }, + "HybridVMPercentCPUEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMPercentCPUAutoMitigate": { + "value": "true" + }, + "HybridVMPercentCPUAutoResolve": { + "value": "true" + }, + "HybridVMPercentCPUAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMPercentCPUPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMPercentCPUAlertState": { + "value": "true" + }, + "HybridVMPercentCPUThreshold": { + "value": "85" + }, + "HybridVMPercentCPUOperator": { + "value": "GreaterThan" + }, + "HybridVMPercentCPUTimeAggregation": { + "value": "Average" + }, + "HybridVMPercentMemoryAlertSeverity": { + "value": "2" + }, + "HybridVMPercentMemoryWindowSize": { + "value": "PT15M" + }, + "HybridVMPercentMemoryEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMPercentMemoryAutoMitigate": { + "value": "true" + }, + "HybridVMPercentMemoryAutoResolve": { + "value": "true" + }, + "HybridVMPercentMemoryAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMPercentMemoryPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMPercentMemoryAlertState": { + "value": "true" + }, + "HybridVMPercentMemoryThreshold": { + "value": "10" + }, + "HybridVMPercentMemoryOperator": { + "value": "LessThan" + }, + "HybridVMPercentMemoryTimeAggregation": { + "value": "Average" + }, + "HybridVMDataDiskSpaceAlertSeverity": { + "value": "2" + }, + "HybridVMDataDiskSpaceWindowSize": { + "value": "PT15M" + }, + "HybridVMDataDiskSpaceEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMDataDiskSpaceAutoMitigate": { + "value": "true" + }, + "HybridVMDataDiskSpaceAutoResolve": { + "value": "true" + }, + "HybridVMDataDiskSpaceAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMDataDiskSpacePolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMDataDiskSpaceAlertState": { + "value": "true" + }, + "HybridVMDataDiskSpaceThreshold": { + "value": "10" + }, + "HybridVMDataDiskSpaceOperator": { + "value": "LessThan" + }, + "HybridVMDataDiskSpaceTimeAggregation": { + "value": "Average" + }, + "HybridVMDataDiskSpaceEvaluationPeriods": { + "value": "1" + }, + "HybridVMDataDiskSpaceFailingPeriods": { + "value": "1" + }, + "HybridVMDataDiskSpaceDisksToInclude": { + "value": [ + "*" + ] + }, + "HybridVMDataDiskReadLatencyAlertSeverity": { + "value": "2" + }, + "HybridVMDataDiskReadLatencyWindowSize": { + "value": "PT15M" + }, + "HybridVMDataDiskReadLatencyEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMDataDiskReadLatencyAutoMitigate": { + "value": "true" + }, + "HybridVMDataDiskReadLatencyAutoResolve": { + "value": "true" + }, + "HybridVMDataDiskReadLatencyAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMDataDiskReadLatencyPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMDataDiskReadLatencyAlertState": { + "value": "true" + }, + "HybridVMDataDiskReadLatencyThreshold": { + "value": "30" + }, + "HybridVMDataDiskReadLatencyOperator": { + "value": "LessThan" + }, + "HybridVMDataDiskReadLatencyTimeAggregation": { + "value": "Average" + }, + "HybridVMDataDiskReadLatencyEvaluationPeriods": { + "value": "1" + }, + "HybridVMDataDiskReadLatencyFailingPeriods": { + "value": "1" + }, + "HybridVMDataDiskReadLatencyComputersToInclude": { + "value": [ + "*" + ] + }, + "HybridVMDataDiskReadLatencyDisksToInclude": { + "value": [ + "*" + ] + }, + "HybridVMDataDiskWriteLatencyAlertSeverity": { + "value": "2" + }, + "HybridVMDataDiskWriteLatencyWindowSize": { + "value": "PT15M" + }, + "HybridVMDataDiskWriteLatencyEvaluationFrequency": { + "value": "PT5M" + }, + "HybridVMDataDiskWriteLatencyAutoMitigate": { + "value": "true" + }, + "HybridVMDataDiskWriteLatencyAutoResolve": { + "value": "true" + }, + "HybridVMDataDiskWriteLatencyAutoResolveTime": { + "value": "00:10:00" + }, + "HybridVMDataDiskWriteLatencyPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMDataDiskWriteLatencyAlertState": { + "value": "true" + }, + "HybridVMDataDiskWriteLatencyThreshold": { + "value": "30" + }, + "HybridVMDataDiskWriteLatencyOperator": { + "value": "LessThan" + }, + "HybridVMDataDiskWriteLatencyTimeAggregation": { + "value": "Average" + }, + "HybridVMDataDiskWriteLatencyEvaluationPeriods": { + "value": "1" + }, + "HybridVMDataDiskWriteLatencyFailingPeriods": { + "value": "1" + }, + "HybridVMDataDiskWriteLatencyComputersToInclude": { + "value": [ + "*" + ] + }, + "HybridVMDataDiskWriteLatencyDisksToInclude": { + "value": [ + "*" + ] + }, + "HybridVMDisconnectedAlertSeverity": { + "value": "1" + }, + "HybridVMDisconnectedAlertWindowSize": { + "value": "P1D" + }, + "HybridVMDisconnectedAlertEvaluationFrequency": { + "value": "P1D" + }, + "HybridVMDisconnectedAlertAutoMitigate": { + "value": "false" + }, + "HybridVMDisconnectedAlertPolicyEffect": { + "value": "deployIfNotExists" + }, + "HybridVMDisconnectedAlertState": { + "value": "true" + }, + "HybridVMDisconnectedAlertDaysThreshold": { + "value": "45" + }, + "HybridVMDisconnectedAlertOperator": { + "value": "GreaterThan" + }, + "HybridVMDisconnectedAlertTimeAggregation": { + "value": "Count" + }, + "HybridVMDisconnectedAlertEvaluationPeriods": { + "value": "1" + }, + "HybridVMDisconnectedAlertFailingPeriods": { + "value": "1" } } }, @@ -1838,6 +2591,12 @@ "StorageAccountAvailabilityThreshold": { "value": "90" }, + "StorageAccountDeletePolicyEffect": { + "value": "deployIfNotExists" + }, + "StorageAccountDeleteAlertState": { + "value": "true" + }, "activityLAWDeleteAlertState": { "value": "true" },