feat: Add additional, optional, telemetry for ALZ team to identify de…

…ployment styles of ALZ (#1623)
Azure · Apr 23, 2024 · 9131d8a · 9131d8a
1 parent 711fecc
commit 9131d8a
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 11 deletions.
diff --git a/docs/wiki/Deploying-ALZ-CustomerUsage.md b/docs/wiki/Deploying-ALZ-CustomerUsage.md
@@ -26,8 +26,13 @@ The following are the unique ID's (also known as PIDs) used in each of the modul
 | Telemetry                                                                 | PID                                  |
 | ------------------------------------------------------------------------- | ------------------------------------ |
 | ALZ Accelerator/ESLZ ARM Deployment                                       | 35c42e79-00b3-42eb-a9ac-e542953efb3c |
-| ALZ Accelerator/ESLZ ARM Deployment - Zero Trust Networking - Phase 1 | f09f64b8-5cb3-4b16-900d-6ba1df8a597e |
-| ALZ Accelerator/ESLZ ARM Deployment - Azure Monitor baseline alerts | 5f0e5693-3998-4ae2-8115-ee96e38dac62 |
+| ALZ Accelerator/ESLZ ARM Deployment - Single Platform Subscription        | b35a8452-8a67-49f9-b1a9-1aee3c1a13c2 |
+| ALZ Accelerator/ESLZ ARM Deployment - Multiple Platform Subscriptions     | 725aea60-cfaa-4a0c-9fe7-71b07f53803d |
+| ALZ Accelerator/ESLZ ARM Deployment - No Networking                       | 35c1ce02-165f-43b2-8d3a-fc68a04b802a |
+| ALZ Accelerator/ESLZ ARM Deployment - Hub & Spoke Networking              | f7fcc714-0c0d-4011-87bf-319810bbb03d |
+| ALZ Accelerator/ESLZ ARM Deployment - Virtual WAN Networking              | 0263335d-f570-470c-8389-aa6c916e5008 |
+| ALZ Accelerator/ESLZ ARM Deployment - Zero Trust Networking - Phase 1     | f09f64b8-5cb3-4b16-900d-6ba1df8a597e |
+| ALZ Accelerator/ESLZ ARM Deployment - Azure Monitor baseline alerts       | 5f0e5693-3998-4ae2-8115-ee96e38dac62 |
 
 ## External modules telemetry tracking
 
@@ -37,7 +42,6 @@ In addition to the above, there are a number of modules in external repos that a
 | ------------------------------------------------------------------------- | ------------------------------------ |
 | [Azure Monitor Baseline Alerts for ALZ](https://aka.ms/amba)              | [Telemetry](https://azure.github.io/azure-monitor-baseline-alerts/patterns/alz/Telemetry)|
 
-
 ### What is Zero Trust Network Telemetry
 
 In an aligned effort with the Azure Networking Product Group, we have created an additional telemetry collection point to help us see customer choosing to adopt Zero Trust Networking best practices from ALZ.

diff --git a/docs/wiki/Whats-new.md b/docs/wiki/Whats-new.md
@@ -1,6 +1,7 @@
 ## In this Section
 
 - [Updates](#updates)
+  - [April 2024](#april-2024)
   - [March 2024](#march-2024)
   - [February 2024](#february-2024)
   - [AMA Update for the Portal Accelerator](#ama-update-for-the-portal-accelerator)
@@ -41,6 +42,12 @@ This article will be updated as and when changes are made to the above and anyth
 
 Here's what's changed in Enterprise Scale/Azure Landing Zones:
 
+### April 2024
+
+#### Tooling
+
+- Add additional, optional, telemetry to help the ALZ team identify styles of deployments.
+
 ### March 2024
 
 #### Documentation

diff --git a/eslzArm/eslzArm.json b/eslzArm/eslzArm.json
@@ -1189,7 +1189,12 @@
             "ChangeTrackingVmssDeploymentName": "[take(concat('alz-ChangeTracking-VMSS', variables('deploymentSuffix')), 64)]",
             "MDFCDefenderSqlAmaDeploymentName": "[take(concat('alz-MDFCDefenderSqlAma', variables('deploymentSuffix')), 64)]",
             "dataCollectionRuleMdfcDefenderSQLDeploymentName": "[take(concat('alz-DataCollectionRuleDefenderSQL', variables('deploymentSuffix')), 64)]",
-            "MDFCSubscriptionEnableDeploymentName": "[take(concat('alz-MDFCSubEnable', variables('deploymentSuffix')), 62)]"
+            "MDFCSubscriptionEnableDeploymentName": "[take(concat('alz-MDFCSubEnable', variables('deploymentSuffix')), 62)]",
+            "pidCuaDeploymentNameSinglePlatformSub": "[take(concat('pid-', variables('cuaidSinglePlatformSub'), '-' , uniqueString(deployment().location, parameters('enterpriseScaleCompanyPrefix'), parameters('currentDateTimeUtcNow'))), 64)]",
+            "pidCuaDeploymentNameMultiPlatformSubs": "[take(concat('pid-', variables('cuaidMultiPlatformSubs'), '-' , uniqueString(deployment().location, parameters('enterpriseScaleCompanyPrefix'), parameters('currentDateTimeUtcNow'))), 64)]",
+            "pidCuaDeploymentNameNetworkingNone": "[take(concat('pid-', variables('cuaidNetworkingNone'), '-' , uniqueString(deployment().location, parameters('enterpriseScaleCompanyPrefix'), parameters('currentDateTimeUtcNow'))), 64)]",
+            "pidCuaDeploymentNameNetworkingHubSpoke": "[take(concat('pid-', variables('cuaidNetworkingHubSpoke'), '-' , uniqueString(deployment().location, parameters('enterpriseScaleCompanyPrefix'), parameters('currentDateTimeUtcNow'))), 64)]",
+            "pidCuaDeploymentNameNetworkingVirtualWan": "[take(concat('pid-', variables('cuaidNetworkingVirtualWan'), '-' , uniqueString(deployment().location, parameters('enterpriseScaleCompanyPrefix'), parameters('currentDateTimeUtcNow'))), 64)]"
         },
         "esLiteDeploymentNames": {
             "mgmtGroupLiteDeploymentName": "[take(concat('alz-MgsLite', variables('deploymentSuffix')), 64)]",
@@ -1341,6 +1346,11 @@
             "networkContributor": "4d97b98b-1d4f-4787-a291-c67834d212e7"
         },
         "cuaid": "35c42e79-00b3-42eb-a9ac-e542953efb3c",
+        "cuaidSinglePlatformSub": "b35a8452-8a67-49f9-b1a9-1aee3c1a13c2",
+        "cuaidMultiPlatformSubs": "725aea60-cfaa-4a0c-9fe7-71b07f53803d",
+        "cuaidNetworkingNone": "35c1ce02-165f-43b2-8d3a-fc68a04b802a",
+        "cuaidNetworkingHubSpoke": "f7fcc714-0c0d-4011-87bf-319810bbb03d",
+        "cuaidNetworkingVirtualWan": "0263335d-f570-470c-8389-aa6c916e5008",
         "ztnPhase1CuaId": "f09f64b8-5cb3-4b16-900d-6ba1df8a597e",
         "ambaPortalCuaId": "5f0e5693-3998-4ae2-8115-ee96e38dac62"
     },
@@ -5774,7 +5784,7 @@
         },
         {
             "condition": "[equals(parameters('telemetryOptOut'), 'No')]",
-            "apiVersion": "2020-06-01",
+            "apiVersion": "2022-09-01",
             "name": "[variables('deploymentNames').pidCuaDeploymentName]",
             "location": "[deployment().location]",
             "type": "Microsoft.Resources/deployments",
@@ -5787,9 +5797,84 @@
                 }
             }
         },
+        {
+            "condition": "[and(equals(parameters('telemetryOptOut'), 'No'), not(empty(parameters('singlePlatformSubscriptionId'))))]",
+            "apiVersion": "2022-09-01",
+            "name": "[variables('deploymentNames').pidCuaDeploymentNameSinglePlatformSub]",
+            "location": "[deployment().location]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "resources": []
+                }
+            }
+        },
+        {
+            "condition": "[and(equals(parameters('telemetryOptOut'), 'No'), empty(parameters('singlePlatformSubscriptionId')))]",
+            "apiVersion": "2022-09-01",
+            "name": "[variables('deploymentNames').pidCuaDeploymentNameMultiPlatformSubs]",
+            "location": "[deployment().location]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "resources": []
+                }
+            }
+        },
+        {
+            "condition": "[and(equals(parameters('telemetryOptOut'), 'No'), equals(parameters('enableHub'), 'No'))]",
+            "apiVersion": "2022-09-01",
+            "name": "[variables('deploymentNames').pidCuaDeploymentNameNetworkingNone]",
+            "location": "[deployment().location]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "resources": []
+                }
+            }
+        },
+        {
+            "condition": "[and(equals(parameters('telemetryOptOut'), 'No'), or(equals(parameters('enableHub'), 'vhub'), equals(parameters('enableHub'), 'nva')))]",
+            "apiVersion": "2022-09-01",
+            "name": "[variables('deploymentNames').pidCuaDeploymentNameNetworkingHubSpoke]",
+            "location": "[deployment().location]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "resources": []
+                }
+            }
+        },
+        {
+            "condition": "[and(equals(parameters('telemetryOptOut'), 'No'), equals(parameters('enableHub'), 'vwan'))]",
+            "apiVersion": "2022-09-01",
+            "name": "[variables('deploymentNames').pidCuaDeploymentNameNetworkingVirtualWan]",
+            "location": "[deployment().location]",
+            "type": "Microsoft.Resources/deployments",
+            "properties": {
+                "mode": "Incremental",
+                "template": {
+                    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+                    "contentVersion": "1.0.0.0",
+                    "resources": []
+                }
+            }
+        },
         {
             "condition": "[and(equals(parameters('telemetryOptOut'), 'No'), equals(parameters('enableDdoS'), 'Yes'), equals(parameters('enableAzFw'), 'Yes'), equals(parameters('firewallSku'), 'Premium'), equals(parameters('denySubnetWithoutNsg'), 'Yes'), equals(parameters('denySubnetWithoutNsgForIdentity'), 'Yes'), equals(parameters('enableStorageHttps'), 'Yes'), or(equals(parameters('enableHub'), 'vhub'), equals(parameters('enableHub'), 'vwan')), or(not(empty(parameters('connectivitySubscriptionId'))), not(empty(parameters('singlePlatformSubscriptionId')))))]",
-            "apiVersion": "2020-06-01",
+            "apiVersion": "2022-09-01",
             "name": "[variables('deploymentNames').ztnPhase1PidCuaDeploymentName]",
             "subscriptionId": "[coalesce(parameters('connectivitySubscriptionId'), parameters('singlePlatformSubscriptionId'))]",
             "location": "[deployment().location]",
@@ -5805,7 +5890,7 @@
         },
         {
             "condition": "[and(equals(parameters('telemetryOptOut'), 'No'), equals(parameters('enableMonitorBaselines'), 'Yes'))]",
-            "apiVersion": "2020-06-01",
+            "apiVersion": "2022-09-01",
             "name": "[variables('deploymentNames').ambaPortalPidCuaDeploymentName]",
             "location": "[deployment().location]",
             "type": "Microsoft.Resources/deployments",

diff --git a/eslzArm/managementGroupTemplates/policyDefinitions/policies.json b/eslzArm/managementGroupTemplates/policyDefinitions/policies.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.25.53.49325",
-      "templateHash": "15804750093379366562"
+      "version": "0.26.170.59819",
+      "templateHash": "3173326000302015324"
     }
   },
   "parameters": {

diff --git a/eslzArm/managementGroupTemplates/roleDefinitions/customRoleDefinitions.json b/eslzArm/managementGroupTemplates/roleDefinitions/customRoleDefinitions.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.25.53.49325",
-      "templateHash": "3448489234650240817"
+      "version": "0.26.170.59819",
+      "templateHash": "15078790678402765486"
     }
   },
   "variables": {