Merge branch 'main' into copilot/fix-85f15788-a0b8-4e52-bc90-ebff04f64f28

Author: kpoineal

.github/scripts/schemas/aprl-schema.yaml

@@ -8,9 +8,9 @@ recommendation:
   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]+$'),
-    regex('^Microsoft\\.[a-zA-Z0-9.]+/[a-zA-Z0-9.]+/[a-zA-Z0-9]+$'),
-    regex('^Microsoft\\.[a-zA-Z0-9.]+/[a-zA-Z0-9.]+/[a-zA-Z0-9.]+/[a-zA-Z0-9]+$'),
+    regex('^(Microsoft|Oracle)\\.[a-zA-Z0-9.]+/[a-zA-Z0-9]+$'),
+    regex('^(Microsoft|Oracle)\\.[a-zA-Z0-9.]+/[a-zA-Z0-9.]+/[a-zA-Z0-9]+$'),
+    regex('^(Microsoft|Oracle)\\.[a-zA-Z0-9.]+/[a-zA-Z0-9.]+/[a-zA-Z0-9.]+/[a-zA-Z0-9]+$'),
     regex('^WellArchitected/[A-Za-z]+$'),
     regex('^Specialized\\.Workload/[A-Za-z]+$'))
   recommendationMetadataState: enum('Active', 'Disabled')

.github/workflows/scorecard.yml

@@ -31,7 +31,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif

azure-resources/Compute/virtualMachineScaleSets/kql/a7bfcc18-b0d8-4d37-81f3-8131ed8bead5.kql

@@ -0,0 +1,32 @@
+// Azure Resource Graph Query
+// Returns any AKS cluster nodepools that do not have Ephemeral Disks
+resources
+| where type == "microsoft.containerservice/managedclusters"
+| mv-expand agentPoolProfile = properties.agentPoolProfiles
+| extend
+    osDiskType         = tostring(agentPoolProfile.osDiskType),
+    nodePoolName       = tostring(agentPoolProfile.name),
+    nodeResourceGroup  = tostring(properties.nodeResourceGroup),
+    subscriptionId     = tostring(split(id, "/")[2])
+| where osDiskType != "Ephemeral" and isnotempty(nodeResourceGroup)
+| project
+    nodePoolName,
+    nodeResourceGroup,
+    subscriptionId
+| join kind=inner (
+    resources
+    | where type == "microsoft.compute/virtualmachinescalesets"
+    | extend
+        vmssName        = name,
+        vmssId          = id,
+        subscriptionId  = tostring(split(id, "/")[2]),
+        resourceGroup   = tostring(split(id, "/")[4])
+) on subscriptionId
+| where tolower(resourceGroup) == tolower(nodeResourceGroup)
+    and tolower(vmssName) contains tolower(nodePoolName)
+| project
+    recommendationId = "a7bfcc18-b0d8-4d37-81f3-8131ed8bead5",
+    name = vmssName,
+    id   = vmssId,
+    tags,
+    param1 = "osDiskType: Non-Ephemeral"

azure-resources/Compute/virtualMachineScaleSets/recommendations.yaml

@@ -151,3 +151,19 @@
     - name: Deprecated Azure Marketplace images
       url: "https://learn.microsoft.com/azure/virtual-machines/deprecated-images"
 
+- description: Use Ephemeral OS Disks for AKS VMSS Node Pools
+  aprlGuid: a7bfcc18-b0d8-4d37-81f3-8131ed8bead5
+  recommendationTypeId: null
+  recommendationControl: Scalability
+  recommendationImpact: Medium
+  recommendationResourceType: Microsoft.Compute/virtualMachineScaleSets
+  recommendationMetadataState: Active
+  longDescription: |
+    Ephemeral OS disks on AKS offer lower read/write latency due to local attachment, eliminating the need for replication seen with managed disks. This enhances performance and speeds up cluster operations such as scaling or upgrading due to quicker re-imaging and boot times.
+  potentialBenefits: Lower latency, faster re-imaging and booting
+  pgVerified: true
+  automationAvailable: true
+  tags: []
+  learnMoreLink:
+    - name: Ephemeral OS disk
+      url: "https://learn.microsoft.com/azure/aks/concepts-storage#ephemeral-os-disk"

azure-resources/ContainerService/managedClusters/kql/005ccbbd-aeab-46ef-80bd-9bd4479412ec.kql

@@ -6,4 +6,4 @@ resources
 | extend taints = tostring(parse_json(agentPoolProfile.nodeTaints))
 | extend nodePool = tostring(parse_json(agentPoolProfile.name))
 | where taints !has "CriticalAddonsOnly=true:NoSchedule" and  agentPoolProfile.minCount < 2
-| project recommendationId="005ccbbd-aeab-46ef-80bd-9bd4479412ec", name=nodePool, id=strcat(id,"/agentPools/",nodePool), tags,param1=strcat("nodePoolName: ", nodePool), param2=strcat("nodePoolMinNodeCount: ", agentPoolProfile.minCount)
+| project recommendationId="005ccbbd-aeab-46ef-80bd-9bd4479412ec", name, id=id, tags,param1=strcat("nodePoolName: ", nodePool), param2=strcat("nodePoolMinNodeCount: ", agentPoolProfile.minCount)

azure-resources/ContainerService/managedClusters/kql/a7bfcc18-b0d8-4d37-81f3-8131ed8bead5.kql

@@ -1,7 +1,9 @@
 // Azure Resource Graph Query
-// Returns each AKS cluster with nodepools that have Linux nodepools not using Azure Linux
+// Returns each AKS cluster that has Linux node pools not using Azure Linux
 resources
-| where type == "microsoft.containerservice/managedclusters"
-| mv-expand agentPoolProfile = properties.agentPoolProfiles
-| where agentPoolProfile.osType == 'Linux' and agentPoolProfile.osSKU != 'AzureLinux'
-| project recommendationid="f46b0d1d-56ef-4795-b98a-f6ee00cb341a", name=agentPoolProfile.name, id=strcat(id,"/agentPools/",agentPoolProfile.name),tags, param1=strcat("nodePoolName: ", agentPoolProfile.name)
+  | where type == "microsoft.containerservice/managedclusters"
+  | mv-expand agentPoolProfile = properties.agentPoolProfiles
+  | where agentPoolProfile.osType == 'Linux' and agentPoolProfile.osSKU != 'AzureLinux'
+  | extend clusterId = id,clusterName = name,nodePoolName = tostring(agentPoolProfile.name)
+  | summarize nonAzureLinuxNodePools = make_list(strcat("nodePoolName: ", nodePoolName)),anyClusterName = any(clusterName),anyTags = any(tags) by clusterId
+  | project recommendationId = "f46b0d1d-56ef-4795-b98a-f6ee00cb341a",name = anyClusterName,id = clusterId,tags = anyTags,param1 = tostring(nonAzureLinuxNodePools)

azure-resources/ContainerService/managedClusters/kql/f46b0d1d-56ef-4795-b98a-f6ee00cb341a.kql

@@ -3,7 +3,7 @@
   recommendationTypeId: 9f3263db-b9c0-43bb-8523-6800f9f50793
   recommendationControl: HighAvailability
   recommendationImpact: High
-  recommendationResourceType: Microsoft.ContainerService/managedClusters/agentPools
+  recommendationResourceType: Microsoft.ContainerService/managedClusters
   recommendationMetadataState: Active
   longDescription: |
     Azure Availability Zones ensure high availability by offering independent locations within regions, equipped with their own power, cooling, and networking to ensure applications and data are protected from datacenter-level failures.
@@ -202,23 +202,6 @@
     - name: Monitor AKS
       url: "https://learn.microsoft.com/azure/aks/monitor-aks"
 
-- description: Use Ephemeral OS disks on AKS clusters
-  aprlGuid: a7bfcc18-b0d8-4d37-81f3-8131ed8bead5
-  recommendationTypeId: null
-  recommendationControl: Scalability
-  recommendationImpact: Medium
-  recommendationResourceType: Microsoft.ContainerService/managedClusters/agentPools
-  recommendationMetadataState: Active
-  longDescription: |
-    Ephemeral OS disks on AKS offer lower read/write latency due to local attachment, eliminating the need for replication seen with managed disks. This enhances performance and speeds up cluster operations such as scaling or upgrading due to quicker re-imaging and boot times.
-  potentialBenefits: Lower latency, faster re-imaging and booting
-  pgVerified: true
-  automationAvailable: true
-  tags: []
-  learnMoreLink:
-    - name: Ephemeral OS disk
-      url: "https://learn.microsoft.com/azure/aks/concepts-storage#ephemeral-os-disk"
-
 - description: Enable and remediate Azure Policies configured for AKS
   aprlGuid: 26ebaf1f-c70d-4ebd-8641-4b60a0ce0094
   recommendationTypeId: null
@@ -326,7 +309,7 @@
   recommendationTypeId: null
   recommendationControl: HighAvailability
   recommendationImpact: High
-  recommendationResourceType: Microsoft.ContainerService/managedClusters/agentPools
+  recommendationResourceType: Microsoft.ContainerService/managedClusters
   recommendationMetadataState: Active
   longDescription: |
     Configuring the user node pool with at least two nodes is essential for applications needing high availability, ensuring they remain operational and accessible without interruption.
@@ -394,7 +377,7 @@
   recommendationTypeId: null
   recommendationControl: HighAvailability
   recommendationImpact: High
-  recommendationResourceType: Microsoft.ContainerService/managedClusters/agentPools
+  recommendationResourceType: Microsoft.ContainerService/managedClusters
   recommendationMetadataState: Disabled
   longDescription: |
     Azure Linux on AKS boosts resiliency with a native image using validated, source-built components. It's lightweight, reducing the attack surface and maintenance. A Microsoft-hardened kernel, optimized for Azure, enhances stability and security for container workloads.

azure-resources/ContainerService/managedClusters/recommendations.yaml

@@ -27,7 +27,7 @@ resources
     | join kind=innerunique (
         resources
         | where type == "microsoft.network/publicipaddresses"
-        | where location in~ ("australiaeast", "brazilsouth", "canadacentral", "centralindia", "centralus", "eastasia", "eastus", "eastus2", "francecentral", "germanywestcentral", "israelcentral", "italynorth", "japaneast", "japanwest", "koreacentral", "mexicocentral", "newzealandnorth", "northeurope", "norwayeast", "polandcentral", "qatarcentral", "southafricanorth", "southcentralus", "southeastasia", "spaincentral", "swedencentral", "switzerlandnorth", "uaenorth", "uksouth", "westeurope", "westus2", "westus3", "usgovvirginia", "chinanorth3")
+        | where location in~ ("centralindia", "centralus", "eastus", "japaneast", "japanwest","newzealandnorth", "southcentralus", "southeastasia", "switzerlandnorth","uaenorth", "westeurope", "westus3", "usgovvirginia", "chinanorth3")
         | where isnull(zones) or array_length(zones) < 2
         | extend
             LBid = toupper(substring(properties.ipConfiguration.id, 0, indexof(properties.ipConfiguration.id, '/frontendIPConfigurations'))),

azure-resources/Network/loadBalancers/kql/621dbc78-3745-4d32-8eac-9e65b27b7512.kql

@@ -1,9 +1,10 @@
 // Azure Resource Graph Query
-// Find all LoadBalancers which only have 1 backend pool defined or only 1 VM in the backend pool,
-// and project the name of the impacted backend pool.
+// Find all LoadBalancers with only 1 VM in any backend pool
 resources
 | where type =~ 'Microsoft.Network/loadBalancers'
 | mv-expand bpool = properties.backendAddressPools
 | extend BackendAddresses = array_length(bpool.properties.loadBalancerBackendAddresses)
 | where BackendAddresses <= 1
-| project recommendationId = "6d82d042-6d61-ad49-86f0-6a5455398081",name=bpool.name,id=strcat(id,"/backendAddressPools/",bpool.name),tags
+| extend lbId = id, lbName = name, poolName = tostring(bpool.name)
+| summarize anyPool = any(poolName), anyTags = any(tags) by lbId, lbName
+| project recommendationId = "6d82d042-6d61-ad49-86f0-6a5455398081", name = lbName, id = lbId, tags = anyTags, param1 = strcat("backendPoolName: ", anyPool)