From 24afe01922adfde227177bebc6bdc2c9596a1a5e Mon Sep 17 00:00:00 2001 From: mosabami Date: Mon, 4 Nov 2024 12:49:00 -0800 Subject: [PATCH] remove old avm folder, add telemetry --- Scenarios/Secure-Baseline/bicep/01-Hub/main.bicep | 12 ++++++++++++ .../Secure-Baseline/bicep/01-Hub/telemetry.bicep | 13 +++++++++++++ .../Secure-Baseline/bicepWithAVM/01-Hub/README.md | 3 --- .../Secure-Baseline/bicepWithAVM/02-Spoke/README.md | 3 --- .../bicepWithAVM/03-Supporting-Services/README.md | 3 --- .../Secure-Baseline/bicepWithAVM/04-ARO/README.md | 3 --- .../bicepWithAVM/05-Front-Door/README.md | 3 --- .../bicepWithAVM/06-Sample-App/README.md | 3 --- Scenarios/Secure-Baseline/bicepWithAVM/README.md | 3 --- 9 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 Scenarios/Secure-Baseline/bicep/01-Hub/telemetry.bicep delete mode 100644 Scenarios/Secure-Baseline/bicepWithAVM/01-Hub/README.md delete mode 100644 Scenarios/Secure-Baseline/bicepWithAVM/02-Spoke/README.md delete mode 100644 Scenarios/Secure-Baseline/bicepWithAVM/03-Supporting-Services/README.md delete mode 100644 Scenarios/Secure-Baseline/bicepWithAVM/04-ARO/README.md delete mode 100644 Scenarios/Secure-Baseline/bicepWithAVM/05-Front-Door/README.md delete mode 100644 Scenarios/Secure-Baseline/bicepWithAVM/06-Sample-App/README.md delete mode 100644 Scenarios/Secure-Baseline/bicepWithAVM/README.md diff --git a/Scenarios/Secure-Baseline/bicep/01-Hub/main.bicep b/Scenarios/Secure-Baseline/bicep/01-Hub/main.bicep index aadb9e4..e23a8b8 100644 --- a/Scenarios/Secure-Baseline/bicep/01-Hub/main.bicep +++ b/Scenarios/Secure-Baseline/bicep/01-Hub/main.bicep @@ -343,6 +343,18 @@ module logAnalyticsWorkspace 'br/public:avm/res/operational-insights/workspace:0 } } +/* ------------------------------- Telemetry ------------------------------- */ +@description('Enable usage and telemetry feedback to Microsoft.') +var telemetryId = '1adc75a7-5143-4889-b19b-46b2d976020c-${location}' +module telemetry './telemetry.bicep' = { + scope: resourceGroup + name: 'telemetry' + params: { + enableTelemetry: enableAvmTelemetry + telemetryId: telemetryId + } +} + /* -------------------------------------------------------------------------- */ /* OUTPUTS */ /* -------------------------------------------------------------------------- */ diff --git a/Scenarios/Secure-Baseline/bicep/01-Hub/telemetry.bicep b/Scenarios/Secure-Baseline/bicep/01-Hub/telemetry.bicep new file mode 100644 index 0000000..2b27ecf --- /dev/null +++ b/Scenarios/Secure-Baseline/bicep/01-Hub/telemetry.bicep @@ -0,0 +1,13 @@ +param enableTelemetry bool +param telemetryId string +resource telemetrydeployment 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { + name: telemetryId + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#' + contentVersion: '1.0.0.0' + resources: {} + } + } +} diff --git a/Scenarios/Secure-Baseline/bicepWithAVM/01-Hub/README.md b/Scenarios/Secure-Baseline/bicepWithAVM/01-Hub/README.md deleted file mode 100644 index 0d251b4..0000000 --- a/Scenarios/Secure-Baseline/bicepWithAVM/01-Hub/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ARO Secure Baseline - Bicep with Azure Verified Modules (AVM) - -This scenario has been moved to the [bicep](../../bicep/) folder. \ No newline at end of file diff --git a/Scenarios/Secure-Baseline/bicepWithAVM/02-Spoke/README.md b/Scenarios/Secure-Baseline/bicepWithAVM/02-Spoke/README.md deleted file mode 100644 index 0d251b4..0000000 --- a/Scenarios/Secure-Baseline/bicepWithAVM/02-Spoke/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ARO Secure Baseline - Bicep with Azure Verified Modules (AVM) - -This scenario has been moved to the [bicep](../../bicep/) folder. \ No newline at end of file diff --git a/Scenarios/Secure-Baseline/bicepWithAVM/03-Supporting-Services/README.md b/Scenarios/Secure-Baseline/bicepWithAVM/03-Supporting-Services/README.md deleted file mode 100644 index 0d251b4..0000000 --- a/Scenarios/Secure-Baseline/bicepWithAVM/03-Supporting-Services/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ARO Secure Baseline - Bicep with Azure Verified Modules (AVM) - -This scenario has been moved to the [bicep](../../bicep/) folder. \ No newline at end of file diff --git a/Scenarios/Secure-Baseline/bicepWithAVM/04-ARO/README.md b/Scenarios/Secure-Baseline/bicepWithAVM/04-ARO/README.md deleted file mode 100644 index 0d251b4..0000000 --- a/Scenarios/Secure-Baseline/bicepWithAVM/04-ARO/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ARO Secure Baseline - Bicep with Azure Verified Modules (AVM) - -This scenario has been moved to the [bicep](../../bicep/) folder. \ No newline at end of file diff --git a/Scenarios/Secure-Baseline/bicepWithAVM/05-Front-Door/README.md b/Scenarios/Secure-Baseline/bicepWithAVM/05-Front-Door/README.md deleted file mode 100644 index 0d251b4..0000000 --- a/Scenarios/Secure-Baseline/bicepWithAVM/05-Front-Door/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ARO Secure Baseline - Bicep with Azure Verified Modules (AVM) - -This scenario has been moved to the [bicep](../../bicep/) folder. \ No newline at end of file diff --git a/Scenarios/Secure-Baseline/bicepWithAVM/06-Sample-App/README.md b/Scenarios/Secure-Baseline/bicepWithAVM/06-Sample-App/README.md deleted file mode 100644 index 0d251b4..0000000 --- a/Scenarios/Secure-Baseline/bicepWithAVM/06-Sample-App/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ARO Secure Baseline - Bicep with Azure Verified Modules (AVM) - -This scenario has been moved to the [bicep](../../bicep/) folder. \ No newline at end of file diff --git a/Scenarios/Secure-Baseline/bicepWithAVM/README.md b/Scenarios/Secure-Baseline/bicepWithAVM/README.md deleted file mode 100644 index 1dfa113..0000000 --- a/Scenarios/Secure-Baseline/bicepWithAVM/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ARO Secure Baseline - Bicep with Azure Verified Modules (AVM) - -This scenario has been moved to the [bicep](../bicep/) folder \ No newline at end of file