Merge branch 'main' into mgmt-vm-and-pip-name

Azure · Apr 4, 2024 · 9700077 · 9700077
2 parents f572ae7 + 10d2891
commit 9700077
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 24 deletions.
diff --git a/docs/networking.md b/docs/networking.md
@@ -16,7 +16,7 @@ This repository has carefully planned default address prefixes configured throug
 | MLZ      | Shared Services                      | 10.0.132.0/24  |
 | Add-On   | Tier 3                               | 10.0.133.0/24  |
 | Add-On   | Imaging                              | 10.0.134.0/24  |
-| Add-On   | ESRI Enterprise                      | 10.0.135.0/23  |
+| Add-On   | ESRI Enterprise                      | 10.0.136.0/23  |
 | Add-On   | Azure Virtual Desktop, Stamp Index 0 | 10.0.140.0/23  |
 | Add-On   | Azure Virtual Desktop, Stamp Index 1 | 10.0.142.0/23  |
 | Add-On   | Azure Virtual Desktop, Stamp Index 2 | 10.0.144.0/23  |

diff --git a/src/bicep/add-ons/esri-enterprise/solution.bicep b/src/bicep/add-ons/esri-enterprise/solution.bicep
@@ -8,7 +8,7 @@ param adminPassword string
 param adminUsername string
 
 @description('The address prefix for the subnet of the application gateway.')
-param applicationGatewaySubnetAddressPrefix string = '10.0.135.0/24'
+param applicationGatewaySubnetAddressPrefix string = '10.0.136.0/24'
 
 @description('Determine whether the ArcGIS Service Account is a domain account.')
 param arcgisServiceAccountIsDomainAccount bool
@@ -68,7 +68,7 @@ param dataStoreVirtualMachineOSDiskSize int = 128
 param debugMode bool = false
 
 @description('The address prefix for the subnet containing the ESRI Enterpise servers.')
-param defaultSubnetAddressPrefix string = '10.0.136.0/24'
+param defaultSubnetAddressPrefix string = '10.0.137.0/24'
 
 @description('Determine whether to deploy Defender for Cloud. This is only necessary if the target description does not have Defender for Cloud already enabled.')
 param deployDefender bool
@@ -317,7 +317,7 @@ param virtualMachineOSDiskSize int = 128
 param virtualMachineSize string = 'Standard_DS4_v2'
 
 @description('The virtual network address prefix')
-param virtualNetworkAddressPrefix string = '10.0.135.0/23'
+param virtualNetworkAddressPrefix string = '10.0.136.0/23'
 
 @secure()
 @description('The password for the Windows domain administrator account.')

diff --git a/src/bicep/add-ons/esri-enterprise/solution.json b/src/bicep/add-ons/esri-enterprise/solution.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.26.54.24096",
-      "templateHash": "12024057895193102005"
+      "templateHash": "17309430228877481225"
     }
   },
   "parameters": {
@@ -23,7 +23,7 @@
     },
     "applicationGatewaySubnetAddressPrefix": {
       "type": "string",
-      "defaultValue": "10.0.135.0/24",
+      "defaultValue": "10.0.136.0/24",
       "metadata": {
         "description": "The address prefix for the subnet of the application gateway."
       }
@@ -126,7 +126,7 @@
     },
     "defaultSubnetAddressPrefix": {
       "type": "string",
-      "defaultValue": "10.0.136.0/24",
+      "defaultValue": "10.0.137.0/24",
       "metadata": {
         "description": "The address prefix for the subnet containing the ESRI Enterpise servers."
       }
@@ -553,7 +553,7 @@
     },
     "virtualNetworkAddressPrefix": {
       "type": "string",
-      "defaultValue": "10.0.135.0/23",
+      "defaultValue": "10.0.136.0/23",
       "metadata": {
         "description": "The virtual network address prefix"
       }

diff --git a/src/bicep/add-ons/esri-enterprise/uiDefinition.json b/src/bicep/add-ons/esri-enterprise/uiDefinition.json
@@ -152,7 +152,7 @@
                                     "name": "spokeVirtualNetworkAddressCidrRange",
                                     "label": "Spoke Virtual Network CIDR",
                                     "type": "Microsoft.Common.TextBox",
-                                    "defaultValue": "10.0.135.0/23",
+                                    "defaultValue": "10.0.136.0/23",
                                     "toolTip": "Specify an address CIDR range within the range [10,26].",
                                     "constraints": {
                                         "required": true,
@@ -168,7 +168,7 @@
                                     "name": "appGwSubnetAddressCidrRange",
                                     "label": "Application Gateway Subnet",
                                     "type": "Microsoft.Common.TextBox",
-                                    "defaultValue": "10.0.135.0/24",
+                                    "defaultValue": "10.0.136.0/24",
                                     "toolTip": "Specify a CIDR range for the Application Gateway subnet within the Spoke Virtual Network range [10,24].",
                                     "constraints": {
                                         "required": true,
@@ -200,7 +200,7 @@
                                     "name": "esriSubnetAddressCidrRange",
                                     "label": "ESRI Enterprise Virtual Machine Subnet",
                                     "type": "Microsoft.Common.TextBox",
-                                    "defaultValue": "10.0.136.0/24",
+                                    "defaultValue": "10.0.137.0/24",
                                     "toolTip": "Specify a CIDR range for the Management Virtual Machine subnet within the Spoke Virtual Network range [10,24].",
                                     "constraints": {
                                         "required": true,

diff --git a/src/bicep/mlz.json b/src/bicep/mlz.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.26.54.24096",
-      "templateHash": "11949976318508029089"
+      "templateHash": "7783918794036563591"
     }
   },
   "parameters": {
@@ -7355,7 +7355,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.26.54.24096",
-              "templateHash": "49100111797787087"
+              "templateHash": "13989055129357073540"
             }
           },
           "parameters": {
@@ -7435,9 +7435,6 @@
                 "parameters": {
                   "logAnalyticsWorkspaceId": {
                     "value": "[parameters('logAnalyticsWorkspaceResourceId')]"
-                  },
-                  "supportedClouds": {
-                    "value": "[parameters('supportedClouds')]"
                   }
                 },
                 "template": {
@@ -7447,20 +7444,16 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.26.54.24096",
-                      "templateHash": "14852926421482749735"
+                      "templateHash": "2758250668679366524"
                     }
                   },
                   "parameters": {
                     "logAnalyticsWorkspaceId": {
                       "type": "string"
-                    },
-                    "supportedClouds": {
-                      "type": "array"
                     }
                   },
                   "resources": [
                     {
-                      "condition": "[contains(parameters('supportedClouds'), environment().name)]",
                       "type": "Microsoft.Insights/diagnosticSettings",
                       "apiVersion": "2017-05-01-preview",
                       "name": "[format('diag-activity-log-{0}', subscription().subscriptionId)]",

diff --git a/src/bicep/modules/activity-log-diagnostic-settings.bicep b/src/bicep/modules/activity-log-diagnostic-settings.bicep
@@ -5,10 +5,9 @@ Licensed under the MIT License.
 targetScope = 'subscription'
 
 param logAnalyticsWorkspaceId string
-param supportedClouds array
 
 // Export Activity Log to LAW
-resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2017-05-01-preview' = if ( contains(supportedClouds, environment().name) ) {
+resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2017-05-01-preview' =  {
   name: 'diag-activity-log-${subscription().subscriptionId}'
   properties: {
     workspaceId: logAnalyticsWorkspaceId

diff --git a/src/bicep/modules/diagnostics.bicep b/src/bicep/modules/diagnostics.bicep
@@ -30,7 +30,6 @@ module activityLogDiagnosticSettings 'activity-log-diagnostic-settings.bicep' =
   scope: subscription(network.subscriptionId)
   params: {
     logAnalyticsWorkspaceId: logAnalyticsWorkspaceResourceId
-    supportedClouds: supportedClouds
   }
 }]