finishing touches

segraef · Dec 21, 2023 · 71e7a5c · 71e7a5c
1 parent 9ce10c6
commit 71e7a5c
Show file tree

Hide file tree

Showing 31 changed files with 839 additions and 642 deletions.
diff --git a/avm/res/analysis-services/server/README.md b/avm/res/analysis-services/server/README.md
@@ -25,7 +25,7 @@ The following section provides usage examples for the module, which were used to
 
 >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
 
->**Note**: To reference the module, please use the following syntax `br:bicep/modules/analysis-services.server:1.0.0`.
+>**Note**: To reference the module, please use the following syntax `br/public:avm/res/analysis-services/server:<version>`.
 
 - [Using only defaults](#example-1-using-only-defaults)
 - [Using large parameter set](#example-2-using-large-parameter-set)
@@ -41,13 +41,13 @@ This instance deploys the module with the minimum set of required parameters.
 <summary>via Bicep module</summary>
 
 ```bicep
-module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
+module server 'br/public:avm/res/analysis-services/server:<version>' = {
   name: '${uniqueString(deployment().name, location)}-test-assmin'
   params: {
     // Required parameters
     name: 'assmin'
     // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    location: '<location>'
   }
 }
 ```
@@ -69,8 +69,8 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
       "value": "assmin"
     },
     // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
+    "location": {
+      "value": "<location>"
     }
   }
 }
@@ -89,7 +89,7 @@ This instance deploys the module with most of its features enabled.
 <summary>via Bicep module</summary>
 
 ```bicep
-module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
+module server 'br/public:avm/res/analysis-services/server:<version>' = {
   name: '${uniqueString(deployment().name, location)}-test-assmax'
   params: {
     // Required parameters
@@ -117,7 +117,6 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
     firewallSettings: {
       enablePowerBIService: true
       firewallRules: [
@@ -128,6 +127,7 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         }
       ]
     }
+    location: '<location>'
     lock: {
       kind: 'CanNotDelete'
       name: 'myCustomLockName'
@@ -201,9 +201,6 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         }
       ]
     },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
     "firewallSettings": {
       "value": {
         "enablePowerBIService": true,
@@ -216,6 +213,9 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         ]
       }
     },
+    "location": {
+      "value": "<location>"
+    },
     "lock": {
       "value": {
         "kind": "CanNotDelete",
@@ -271,7 +271,7 @@ This instance deploys the module in alignment with the best-practices of the Azu
 <summary>via Bicep module</summary>
 
 ```bicep
-module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
+module server 'br/public:avm/res/analysis-services/server:<version>' = {
   name: '${uniqueString(deployment().name, location)}-test-asswaf'
   params: {
     // Required parameters
@@ -299,7 +299,6 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
     firewallSettings: {
       enablePowerBIService: true
       firewallRules: [
@@ -310,6 +309,7 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         }
       ]
     }
+    location: '<location>'
     lock: {
       kind: 'CanNotDelete'
       name: 'myCustomLockName'
@@ -366,9 +366,6 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         }
       ]
     },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
     "firewallSettings": {
       "value": {
         "enablePowerBIService": true,
@@ -381,6 +378,9 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
         ]
       }
     },
+    "location": {
+      "value": "<location>"
+    },
     "lock": {
       "value": {
         "kind": "CanNotDelete",
@@ -421,7 +421,7 @@ module server 'br:bicep/modules/analysis-services.server:1.0.0' = {
 | Parameter | Type | Description |
 | :-- | :-- | :-- |
 | [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. |
-| [`enableDefaultTelemetry`](#parameter-enabledefaulttelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). |
+| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). |
 | [`firewallSettings`](#parameter-firewallsettings) | object | The inbound firewall rules to define on the server. If not specified, firewall is disabled. |
 | [`location`](#parameter-location) | string | Location for all Resources. |
 | [`lock`](#parameter-lock) | object | The lock settings of the service. |
@@ -528,7 +528,7 @@ Resource ID of the diagnostic log analytics workspace. For security reasons, it
 - Required: No
 - Type: string
 
-### Parameter: `enableDefaultTelemetry`
+### Parameter: `enableTelemetry`
 
 Enable telemetry via a Globally Unique Identifier (GUID).
 

diff --git a/avm/res/analysis-services/server/main.json b/avm/res/analysis-services/server/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.23.1.45101",
-      "templateHash": "1605417065240868452"
+      "templateHash": "15153643486811668197"
     },
     "name": "Analysis Services Servers",
     "description": "This module deploys an Analysis Services Server.",
@@ -280,7 +280,7 @@
         "description": "Optional. Tags of the resource."
       }
     },
-    "enableDefaultTelemetry": {
+    "enableTelemetry": {
       "type": "bool",
       "defaultValue": true,
       "metadata": {
@@ -298,17 +298,23 @@
     }
   },
   "resources": {
-    "defaultTelemetry": {
-      "condition": "[parameters('enableDefaultTelemetry')]",
+    "avmTelemetry": {
+      "condition": "[parameters('enableTelemetry')]",
       "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2021-04-01",
-      "name": "[format('pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-{0}', uniqueString(deployment().name, parameters('location')))]",
+      "apiVersion": "2023-07-01",
+      "name": "[format('46d3xbcp.res.analysisservices-server.{0}.{1}', replace('-..--..-', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]",
       "properties": {
         "mode": "Incremental",
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
           "contentVersion": "1.0.0.0",
-          "resources": []
+          "resources": [],
+          "outputs": {
+            "telemetry": {
+              "type": "String",
+              "value": "For more information, see https://aka.ms/avm/TelemetryInfo"
+            }
+          }
         }
       }
     },

diff --git a/avm/res/cache/redis/README.md b/avm/res/cache/redis/README.md
@@ -28,7 +28,7 @@ The following section provides usage examples for the module, which were used to
 
 >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
 
->**Note**: To reference the module, please use the following syntax `br:bicep/modules/cache.redis:1.0.0`.
+>**Note**: To reference the module, please use the following syntax `br/public:avm/res/cache/redis:<version>`.
 
 - [Using only defaults](#example-1-using-only-defaults)
 - [Using large parameter set](#example-2-using-large-parameter-set)
@@ -44,13 +44,13 @@ This instance deploys the module with the minimum set of required parameters.
 <summary>via Bicep module</summary>
 
 ```bicep
-module redis 'br:bicep/modules/cache.redis:1.0.0' = {
+module redis 'br/public:avm/res/cache/redis:<version>' = {
   name: '${uniqueString(deployment().name, location)}-test-crmin'
   params: {
     // Required parameters
     name: 'crmin001'
     // Non-required parameters
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    location: '<location>'
   }
 }
 ```
@@ -72,8 +72,8 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = {
       "value": "crmin001"
     },
     // Non-required parameters
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
+    "location": {
+      "value": "<location>"
     }
   }
 }
@@ -92,7 +92,7 @@ This instance deploys the module with most of its features enabled.
 <summary>via Bicep module</summary>
 
 ```bicep
-module redis 'br:bicep/modules/cache.redis:1.0.0' = {
+module redis 'br/public:avm/res/cache/redis:<version>' = {
   name: '${uniqueString(deployment().name, location)}-test-crmax'
   params: {
     // Required parameters
@@ -113,8 +113,8 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = {
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
     enableNonSslPort: true
+    location: '<location>'
     lock: {
       kind: 'CanNotDelete'
       name: 'myCustomLockName'
@@ -192,12 +192,12 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = {
         }
       ]
     },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
     "enableNonSslPort": {
       "value": true
     },
+    "location": {
+      "value": "<location>"
+    },
     "lock": {
       "value": {
         "kind": "CanNotDelete",
@@ -274,7 +274,7 @@ This instance deploys the module in alignment with the best-practices of the Azu
 <summary>via Bicep module</summary>
 
 ```bicep
-module redis 'br:bicep/modules/cache.redis:1.0.0' = {
+module redis 'br/public:avm/res/cache/redis:<version>' = {
   name: '${uniqueString(deployment().name, location)}-test-crwaf'
   params: {
     // Required parameters
@@ -295,8 +295,8 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = {
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
     enableNonSslPort: true
+    location: '<location>'
     lock: {
       kind: 'CanNotDelete'
       name: 'myCustomLockName'
@@ -374,12 +374,12 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = {
         }
       ]
     },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
     "enableNonSslPort": {
       "value": true
     },
+    "location": {
+      "value": "<location>"
+    },
     "lock": {
       "value": {
         "kind": "CanNotDelete",
@@ -461,8 +461,8 @@ module redis 'br:bicep/modules/cache.redis:1.0.0' = {
 | :-- | :-- | :-- |
 | [`capacity`](#parameter-capacity) | int | The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4). |
 | [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. |
-| [`enableDefaultTelemetry`](#parameter-enabledefaulttelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). |
 | [`enableNonSslPort`](#parameter-enablenonsslport) | bool | Specifies whether the non-ssl Redis server port (6379) is enabled. |
+| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). |
 | [`location`](#parameter-location) | string | The location to deploy the Redis cache service. |
 | [`lock`](#parameter-lock) | object | The lock settings of the service. |
 | [`managedIdentities`](#parameter-managedidentities) | object | The managed identity definition for this resource. |
@@ -601,21 +601,21 @@ Resource ID of the diagnostic log analytics workspace. For security reasons, it
 - Required: No
 - Type: string
 
-### Parameter: `enableDefaultTelemetry`
+### Parameter: `enableNonSslPort`
 
-Enable telemetry via a Globally Unique Identifier (GUID).
+Specifies whether the non-ssl Redis server port (6379) is enabled.
 
 - Required: No
 - Type: bool
-- Default: `True`
+- Default: `False`
 
-### Parameter: `enableNonSslPort`
+### Parameter: `enableTelemetry`
 
-Specifies whether the non-ssl Redis server port (6379) is enabled.
+Enable telemetry via a Globally Unique Identifier (GUID).
 
 - Required: No
 - Type: bool
-- Default: `False`
+- Default: `True`
 
 ### Parameter: `location`
 
@@ -731,7 +731,7 @@ Configuration details for private endpoints. For security reasons, it is recomme
 | [`lock`](#parameter-privateendpointslock) | object | Specify the type of lock. |
 | [`manualPrivateLinkServiceConnections`](#parameter-privateendpointsmanualprivatelinkserviceconnections) | array | Manual PrivateLink Service Connections. |
 | [`name`](#parameter-privateendpointsname) | string | The name of the private endpoint. |
-| [`privateDnsZoneGroupName`](#parameter-privateendpointsprivatednszonegroupname) | string | The name of the private DNS zone group to create if privateDnsZoneResourceIds were provided. |
+| [`privateDnsZoneGroupName`](#parameter-privateendpointsprivatednszonegroupname) | string | The name of the private DNS zone group to create if `privateDnsZoneResourceIds` were provided. |
 | [`privateDnsZoneResourceIds`](#parameter-privateendpointsprivatednszoneresourceids) | array | The private DNS zone groups to associate the private endpoint with. A DNS zone group can support up to 5 DNS zones. |
 | [`roleAssignments`](#parameter-privateendpointsroleassignments) | array | Array of role assignments to create. |
 | [`service`](#parameter-privateendpointsservice) | string | The service (sub-) type to deploy the private endpoint for. For example "vault" or "blob". |
@@ -838,7 +838,7 @@ The name of the private endpoint.
 
 ### Parameter: `privateEndpoints.privateDnsZoneGroupName`
 
-The name of the private DNS zone group to create if privateDnsZoneResourceIds were provided.
+The name of the private DNS zone group to create if `privateDnsZoneResourceIds` were provided.
 
 - Required: No
 - Type: string
@@ -1188,7 +1188,7 @@ This section gives you an overview of all local-referenced module files (i.e., o
 
 | Reference | Type |
 | :-- | :-- |
-| `modules/network/private-endpoint` | Local reference |
+| `br/public:avm/res/network/private-endpoint:0.3.1` | Remote reference |
 
 ## Notes
 

diff --git a/avm/res/cache/redis/main.bicep b/avm/res/cache/redis/main.bicep
@@ -114,8 +114,6 @@ var identity = !empty(managedIdentities) ? {
   userAssignedIdentities: !empty(formattedUserAssignedIdentities) ? formattedUserAssignedIdentities : null
 } : null
 
-var enableReferencedModulesTelemetry = false
-
 var builtInRoleNames = {
   Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
   Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635')