refactor: Adjust recommendationControl fields to match Azure Advisor (#…

…524) Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Azure · Nov 26, 2024 · 71ff8cd · 71ff8cd
1 parent 00725bc
commit 71ff8cd
Show file tree

Hide file tree

Showing 83 changed files with 671 additions and 639 deletions.
diff --git a/.github/policies/resource-management.yml b/.github/policies/resource-management.yml
@@ -23,7 +23,7 @@ configuration:
       actions:
       - closeIssue
 
-    - description: 'If open issue and label is Needs: Author Feedback :ear: is applied with no update after 3 days, then apply label "Status: No Recent Activity :desert:'
+    - description: 'If open issue and label is Needs: Author Feedback :ear: is applied with no update after 4 days, then apply label "Status: No Recent Activity :desert:'
       frequencies:
       - hourly:
           hour: 3
@@ -33,7 +33,7 @@ configuration:
       - hasLabel:
           label: 'Needs: Author Feedback :ear:'
       - noActivitySince:
-          days: 3
+          days: 4
       - isNotLabeledWith:
           label: 'Status: No Recent Activity :desert:'
       actions:
@@ -58,7 +58,7 @@ configuration:
           reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
       - closeIssue
 
-    - description: 'If open pr and label includes Needs: Author Feedback :ear: and Status: No Recent Activity :desert: with no update after 7 days, then close the issue.'
+    - description: 'If open pr and label includes Needs: Author Feedback :ear: and Status: No Recent Activity :desert: with no update after 3 days, then close the issue.'
       frequencies:
       - hourly:
           hour: 3
@@ -70,11 +70,11 @@ configuration:
       - hasLabel:
           label: 'Status: No Recent Activity :desert:'
       - noActivitySince:
-          days: 7
+          days: 3
       actions:
       - closePullRequest
 
-    - description: 'If open pull request and label includes Needs: Author Feedback :ear: and has not been updated in 7 days, then add label and request update.'
+    - description: 'If open pull request and label includes Needs: Author Feedback :ear: and has not been updated in 4 days, then add label and request update.'
       frequencies:
       - hourly:
           hour: 3
@@ -84,14 +84,14 @@ configuration:
       - hasLabel:
           label: 'Needs: Author Feedback :ear:'
       - noActivitySince:
-          days: 7
+          days: 4
       - isNotLabeledWith:
           label: 'Status: No Recent Activity :desert:'
       actions:
       - addLabel:
           label: 'Status: No Recent Activity :desert:'
       - addReply:
-          reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
+          reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
 
     eventResponderTasks:
     - if:

diff --git a/.github/scripts/schemas/aprl-schema.yaml b/.github/scripts/schemas/aprl-schema.yaml
@@ -5,7 +5,7 @@ recommendation:
   description: str(max=100)
   aprlGuid: regex('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$')
   recommendationTypeId: any(regex('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'), null())
-  recommendationControl: enum('High Availability', 'Business Continuity', 'Disaster Recovery', 'Scalability', 'Monitoring and Alerting', 'Service Upgrade and Retirement', 'Other Best Practices', 'Personalized', 'Governance', 'Security')
+  recommendationControl: enum('HighAvailability', 'BusinessContinuity', 'DisasterRecovery', 'Scalability', 'MonitoringAndAlerting', 'ServiceUpgradeAndRetirement', 'OtherBestPractices', 'Personalized', 'Governance', 'Security')
   recommendationImpact: enum('Low', 'Medium', 'High')
   recommendationResourceType: any(
     regex('^Microsoft\\.[a-zA-Z0-9.]+/[a-zA-Z0-9]+$'),

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -35,3 +35,6 @@ azure-resources/DBforPostgreSQL @Azure/aprl-maintainers @Azure/aprl-postgres
 ## The aprl-sql team is responsible for all SQL-related PRs
 azure-resources/SQL @Azure/aprl-maintainers @Azure/aprl-sql
 azure-resources/SQLVirtualMachines @Azure/aprl-maintainers @Azure/aprl-sql
+
+## Remove owners from the following paths
+tools/data/recommendations.json
diff --git a/azure-resources/AAD/domainServices/recommendations.yaml b/azure-resources/AAD/domainServices/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Use at least the Enterprise SKU
   aprlGuid: bb6deb9d-24fa-4ee8-bc23-ac3ebc7fdf8e
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.AAD/domainServices
   recommendationMetadataState: Active
@@ -18,7 +18,7 @@
 - description: Use replica sets for resiliency or geolocation in Microsoft Entra Domain Services
   aprlGuid: a3058909-fcf8-4450-88b5-499f57449178
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.AAD/domainServices
   recommendationMetadataState: Active

diff --git a/azure-resources/AVS/privateClouds/recommendations.yaml b/azure-resources/AVS/privateClouds/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Configure Azure Service Health notifications and alerts for Azure VMware Solution
   aprlGuid: 74fcb9f2-9a25-49a6-8c42-d32851c4afb7
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: High
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -18,7 +18,7 @@
 - description: Monitor when Azure VMware Solution Private Cloud is reaching the capacity limit
   aprlGuid: 29d7a115-dfb6-4df1-9205-04824109548f
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -35,7 +35,7 @@
 - description: Monitor when Azure VMware Solution Cluster Size is approaching the host limit
   aprlGuid: f86355e3-de7c-4dad-8080-1b0b411e66c8
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -52,7 +52,7 @@
 - description: Enable Stretched Clusters for Multi-AZ Availability of the vSAN Datastore
   aprlGuid: 9ec5b4c8-3dd8-473a-86ee-3273290331b9
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Low
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -71,7 +71,7 @@
 - description: Configure Azure Monitor Alert warning thresholds for vSAN datastore utilization
   aprlGuid: 4232eb32-3241-4049-9e14-9b8005817b56
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: High
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -88,7 +88,7 @@
 - description: Configure Syslog in Diagnostic Settings for Azure VMware Solution
   aprlGuid: fa4ab927-bced-429a-971a-53350de7f14b
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: High
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -105,7 +105,7 @@
 - description: Monitor CPU Utilization to ensure sufficient resources for workloads
   aprlGuid: 4ee5d535-c47b-470a-9557-4a3dd297d62f
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: High
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -122,7 +122,7 @@
 - description: Monitor Memory Utilization to ensure sufficient resources for workloads
   aprlGuid: 029208c8-5186-4a76-8ee8-6e3445fef4dd
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: High
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active
@@ -173,7 +173,7 @@
 - description: Use multiple DNS servers per private FQDN zone
   aprlGuid: fcc2e257-23af-4c68-aac8-9cc03033c939
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.AVS/privateClouds
   recommendationMetadataState: Active

diff --git a/azure-resources/ApiManagement/service/recommendations.yaml b/azure-resources/ApiManagement/service/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Migrate API Management services to Premium SKU to support Availability Zones
   aprlGuid: baf3bfc0-32a2-4c0c-926d-c9bf0b49808e
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.ApiManagement/service
   recommendationMetadataState: Active
@@ -20,7 +20,7 @@
 - description: Enable Availability Zones on Premium API Management instances
   aprlGuid: 740f2c1c-8857-4648-80eb-47d2c56d5a50
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.ApiManagement/service
   recommendationMetadataState: Active
@@ -39,7 +39,7 @@
 - description: Azure API Management platform version should be stv2
   aprlGuid: e35cf148-8eee-49d1-a1c9-956160f99e0b
   recommendationTypeId: e5f60ef8-3fcc-4fb5-bee7-7aaeb44c1509
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.ApiManagement/service
   recommendationMetadataState: Active
@@ -58,7 +58,7 @@
 - description: Enable auto-scale for production workloads on API Management services
   aprlGuid: c79680ea-de85-44fa-a596-f31fa17a952f
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Low
   recommendationResourceType: Microsoft.ApiManagement/service
   recommendationMetadataState: Active

diff --git a/azure-resources/App/containerApps/recommendations.yaml b/azure-resources/App/containerApps/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Enable container health probes
   aprlGuid: 8dbcd94b-0948-4df3-b608-1946726c3abf
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.App/containerApps
   recommendationMetadataState: Active

diff --git a/azure-resources/App/managedEnvironments/recommendations.yaml b/azure-resources/App/managedEnvironments/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Deploy zone redundant Container app environments
   aprlGuid: f4201965-a88d-449d-b3b4-021394719eb2
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.App/managedenvironments
   recommendationMetadataState: Active

diff --git a/azure-resources/AppConfiguration/configurationStores/recommendations.yaml b/azure-resources/AppConfiguration/configurationStores/recommendations.yaml
@@ -18,7 +18,7 @@
 - description: Upgrade to App Configuration Standard tier
   aprlGuid: 2102a57a-a056-4d5e-afe5-9df9f92177ca
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.AppConfiguration/configurationStores
   recommendationMetadataState: Active

diff --git a/azure-resources/Automation/automationAccounts/recommendations.yaml b/azure-resources/Automation/automationAccounts/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Set up disaster recovery of Automation accounts and its dependent resources
   aprlGuid: 67205887-0733-466e-b50e-b1cd7316c514
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.Automation/automationAccounts
   recommendationMetadataState: Active

diff --git a/azure-resources/Batch/batchAccounts/recommendations.yaml b/azure-resources/Batch/batchAccounts/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Monitor Batch Account quota
   aprlGuid: 3464854d-6f75-4922-95e4-a2a308b53ce6
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Batch/batchAccounts
   recommendationMetadataState: Active
@@ -18,7 +18,7 @@
 - description: Create an Azure Batch pool across Availability Zones
   aprlGuid: 71cfab8f-d588-4742-b175-b6e07ae48dbd
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.Batch/batchAccounts
   recommendationMetadataState: Active

diff --git a/azure-resources/Cache/Redis/recommendations.yaml b/azure-resources/Cache/Redis/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Enable zone redundancy for Azure Cache for Redis
   aprlGuid: 5a44bd30-ae6a-4b81-9b68-dc3a8ffca4d8
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: High
   recommendationResourceType: Microsoft.Cache/Redis
   recommendationMetadataState: Active
@@ -17,7 +17,7 @@
 - description: Schedule updates by setting a maintenance window
   aprlGuid: cabc1f98-c8a7-44f7-ab24-977982ef3f70
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Cache/redis
   recommendationMetadataState: Active

diff --git a/azure-resources/Cdn/profiles/recommendations.yaml b/azure-resources/Cdn/profiles/recommendations.yaml
@@ -39,7 +39,7 @@
 - description: Configure logs
   aprlGuid: 1ad74c3c-e3d7-0046-b83f-a2199974ef15
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Cdn/profiles
   recommendationMetadataState: Active
@@ -111,7 +111,7 @@
 - description: Use latest version for customer-managed certificates
   aprlGuid: 4638c2c0-03de-6d42-9e09-82ee4478cbf3
   recommendationTypeId: 2c057605-4707-4d3e-bbb0-a7fe9b6a626b
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Cdn/profiles
   recommendationMetadataState: Disabled
@@ -162,7 +162,7 @@
 - description: Disable health probes when there is only one origin in an origin group
   aprlGuid: 38f3d542-6de6-a44b-86c6-97e3be690281
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Low
   recommendationResourceType: Microsoft.Cdn/profiles
   recommendationMetadataState: Active
@@ -179,7 +179,7 @@
 - description: Select good health probe endpoints
   aprlGuid: 5225bba3-28ec-1e43-8986-7eedfd466d65
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Cdn/profiles
   recommendationMetadataState: Active
@@ -247,7 +247,7 @@
 - description: Avoid using Classic Azure Front Door
   aprlGuid: 82fa3cff-74bd-4063-b726-834f160592fa
   recommendationTypeId: null
-  recommendationControl: Service Upgrade and Retirement
+  recommendationControl: ServiceUpgradeAndRetirement
   recommendationImpact: High
   recommendationResourceType: Microsoft.Cdn/profiles
   recommendationMetadataState: Active

diff --git a/azure-resources/CognitiveServices/accounts/recommendations.yaml b/azure-resources/CognitiveServices/accounts/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Enable diagnostic logging for Azure AI services and send the data to Log Analytics
   aprlGuid: d6d9e18a-9ad2-491e-878d-86d621785453
   recommendationTypeId: null
-  recommendationControl: Monitoring and Alerting
+  recommendationControl: MonitoringAndAlerting
   recommendationImpact: Low
   recommendationResourceType: Microsoft.CognitiveServices/Accounts
   recommendationMetadataState: Active

diff --git a/azure-resources/Compute/disks/recommendations.yaml b/azure-resources/Compute/disks/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: Shared disks should only be enabled in clustered servers
   aprlGuid: 3263a64a-c256-de48-9818-afd3cbc55c2a
   recommendationTypeId: null
-  recommendationControl: Other Best Practices
+  recommendationControl: OtherBestPractices
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Compute/disks
   recommendationMetadataState: Active
@@ -20,7 +20,7 @@
 - description: Use Azure Disks with Zone Redundant Storage for higher resiliency and availability
   aprlGuid: fa0cf4f5-0b21-47b7-89a9-ee936f193ce1
   recommendationTypeId: d4102c0f-ebe3-4b22-8fe0-e488866a87af
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Compute/disks
   recommendationMetadataState: Active

diff --git a/azure-resources/Compute/galleries/recommendations.yaml b/azure-resources/Compute/galleries/recommendations.yaml
@@ -1,7 +1,7 @@
 - description: A minimum of three replicas should be kept for production image versions
   aprlGuid: b49a39fd-f431-4b61-9062-f2157849d845
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Compute/galleries
   recommendationMetadataState: Active
@@ -18,7 +18,7 @@
 - description: Zone redundant storage should be used for image versions
   aprlGuid: 488dcc8b-f2e3-40ce-bf95-73deb2db095f
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Compute/galleries
   recommendationMetadataState: Active
@@ -37,7 +37,7 @@
 - description: Consider creating TrustedLaunchSupported images where possible
   aprlGuid: 1c5e1e58-4e56-491c-8529-10f37af9d4ed
   recommendationTypeId: null
-  recommendationControl: High Availability
+  recommendationControl: HighAvailability
   recommendationImpact: Low
   recommendationResourceType: Microsoft.Compute/galleries
   recommendationMetadataState: Disabled
@@ -58,7 +58,7 @@
 - description: Create Image Versions replicas in secondary region
   aprlGuid: b14ee8ed-7d27-447b-b6fb-6472cb5f4b75
   recommendationTypeId: null
-  recommendationControl: Disaster Recovery
+  recommendationControl: DisasterRecovery
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Compute/galleries
   recommendationMetadataState: Active
@@ -75,7 +75,7 @@
 - description: Configure Image version replica count per region.
   aprlGuid: b3c3ba1d-7de6-442d-8c50-023330fbf765
   recommendationTypeId: null
-  recommendationControl: Disaster Recovery
+  recommendationControl: DisasterRecovery
   recommendationImpact: Medium
   recommendationResourceType: Microsoft.Compute/galleries
   recommendationMetadataState: Active