Remove AppInsights Profiler support in base workspace bundle (#2478)

* access core's appinsights when debugging locally * appinsights without arm in base workspace * bundle build validates terraform * fix * fix * fix * update change log * update porter yaml * remove arm templates * update core version
microsoft · Aug 22, 2022 · d19ef55 · d19ef55
1 parent cdab043
commit d19ef55
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 261 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,14 +9,16 @@
 
 FEATURES:
 
-* MySql workspace service ([#2476](https://github.com/microsoft/AzureTRE/issues/2476))
+* MySql workspace service ([#2476](https://github.com/microsoft/AzureTRE/pull/2476))
 
 ENHANCEMENTS:
 
-* 'CreationTime' field was added to Airlock requests ([#2432](https://github.com/microsoft/AzureTRE/issues/2432))
+* 'CreationTime' field was added to Airlock requests ([#2432](https://github.com/microsoft/AzureTRE/pull/2432))
 * Bundles mirror Terraform plugins when built ([#2446](https://github.com/microsoft/AzureTRE/pull/2446))
-* 'Get all Airlock requests' endpoint supports filtering ([#2433](https://github.com/microsoft/AzureTRE/pull/2433)).
-* API uses user delagation key when generating SAS token for airlock requests. ([#2390](https://github.com/microsoft/AzureTRE/issues/2390))
+* 'Get all Airlock requests' endpoint supports filtering ([#2433](https://github.com/microsoft/AzureTRE/pull/2433))
+* API uses user delagation key when generating SAS token for airlock requests ([#2460](https://github.com/microsoft/AzureTRE/pull/2460))
+* Longer docker caching in Resource Processor ([#2486](https://github.com/microsoft/AzureTRE/pull/2486))
+* Remove AppInsights Profiler support in base workspace bundle and deploy with native Terraform resources ([#2478](https://github.com/microsoft/AzureTRE/pull/2478))
 
 BUG FIXES:
 

diff --git a/Makefile b/Makefile
@@ -183,6 +183,7 @@ bundle-build:
 	&& . ${MAKEFILE_DIR}/devops/scripts/load_env.sh ${DIR}/.env \
 	&& . ${MAKEFILE_DIR}/devops/scripts/set_docker_sock_permission.sh \
 	&& cd ${DIR} \
+	&& if [ -d terraform ]; then terraform -chdir=terraform init -backend=false; terraform -chdir=terraform validate; fi \
 	&& FULL_IMAGE_NAME_PREFIX=${FULL_IMAGE_NAME_PREFIX} IMAGE_NAME_PREFIX=${IMAGE_NAME_PREFIX} \
 		${MAKEFILE_DIR}/devops/scripts/bundle_runtime_image_build.sh \
 	&& porter build --debug

diff --git a/templates/core/terraform/azure-monitor/azure-monitor.tf b/templates/core/terraform/azure-monitor/azure-monitor.tf
@@ -6,7 +6,7 @@ resource "azurerm_log_analytics_workspace" "core" {
   retention_in_days          = 30
   sku                        = "PerGB2018"
   tags                       = var.tre_core_tags
-  internet_ingestion_enabled = false
+  internet_ingestion_enabled = var.enable_local_debugging ? true : false
 
   lifecycle { ignore_changes = [tags] }
 }
@@ -65,7 +65,7 @@ resource "azurerm_application_insights" "core" {
   resource_group_name                 = var.resource_group_name
   workspace_id                        = azurerm_log_analytics_workspace.core.id
   application_type                    = "web"
-  internet_ingestion_enabled          = false
+  internet_ingestion_enabled          = var.enable_local_debugging ? true : false
   force_customer_storage_for_profiler = true
   tags                                = var.tre_core_tags
 

diff --git a/templates/core/terraform/azure-monitor/variables.tf b/templates/core/terraform/azure-monitor/variables.tf
@@ -8,3 +8,4 @@ variable "azure_monitor_ods_opinsights_dns_zone_id" {}
 variable "azure_monitor_agentsvc_dns_zone_id" {}
 variable "blob_core_dns_zone_id" {}
 variable "tre_core_tags" {}
+variable "enable_local_debugging" {}
diff --git a/templates/core/terraform/main.tf b/templates/core/terraform/main.tf
@@ -68,6 +68,7 @@ module "azure_monitor" {
   azure_monitor_agentsvc_dns_zone_id       = module.network.azure_monitor_agentsvc_dns_zone_id
   blob_core_dns_zone_id                    = module.network.blob_core_dns_zone_id
   tre_core_tags                            = local.tre_core_tags
+  enable_local_debugging                   = var.enable_local_debugging
 
   depends_on = [
     module.network

diff --git a/templates/core/version.txt b/templates/core/version.txt
@@ -1 +1 @@
-__version__ = "0.4.16"
+__version__ = "0.4.17"
diff --git a/templates/workspaces/base/porter.yaml b/templates/workspaces/base/porter.yaml
@@ -1,6 +1,6 @@
 ---
 name: tre-workspace-base
-version: 0.3.24
+version: 0.3.25
 description: "A base Azure TRE workspace"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/workspaces/base/terraform/azure-monitor/ampls.json b/templates/workspaces/base/terraform/azure-monitor/ampls.json
diff --git a/templates/workspaces/base/terraform/azure-monitor/app_insights.json b/templates/workspaces/base/terraform/azure-monitor/app_insights.json