Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable workspace AppInsight's private endpoint #2543

Merged
merged 3 commits into from
Sep 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ENHANCEMENTS:
BUG FIXES:

* API health check is also returned by accessing the root path at / ([#2469](https://github.com/microsoft/AzureTRE/pull/2469))
* Temporary disable AppInsight's private endpoint in base workspace ([#2543](https://github.com/microsoft/AzureTRE/pull/2543))

## 0.4.2 (August 23, 2022)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ FROM debian:buster-slim

ARG BUNDLE_DIR

# Disable Terraform checkpoint
ENV CHECKPOINT_DISABLE=1

# This is a template Dockerfile for the bundle's invocation image
# You can customize it to use different base images, install tools and copy configuration files.
#
Expand All @@ -22,4 +25,5 @@ COPY . $BUNDLE_DIR
# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
WORKDIR $BUNDLE_DIR/terraform
RUN terraform init -backend=false \
&& rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
&& terraform providers mirror /usr/local/share/terraform/plugins
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: tre-service-guacamole-windowsvm
version: 0.4.5
version: 0.4.6
description: "An Azure TRE User Resource Template for Guacamole (Windows 10)"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down Expand Up @@ -86,7 +86,7 @@ outputs:
mixins:
- exec
- terraform:
clientVersion: 1.2.6
clientVersion: 1.2.8
- az

install:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "=3.20.0"
version = "=3.21.1"
}
random = {
source = "hashicorp/random"
Expand Down
4 changes: 4 additions & 0 deletions templates/workspaces/base/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ RUN apt-get update && \
apt-get install -y jq="1.5+dfsg-2+b1" --no-install-recommends && \
apt-get clean -y && rm -rf /var/lib/apt/lists/*

# Disable Terraform checkpoint
ENV CHECKPOINT_DISABLE=1

# This is a template Dockerfile for the bundle's invocation image
# You can customize it to use different base images, install tools and copy configuration files.
#
Expand All @@ -28,4 +31,5 @@ COPY . $BUNDLE_DIR
# Remove when available from https://github.com/getporter/terraform-mixin/issues/90
WORKDIR $BUNDLE_DIR/terraform
RUN terraform init -backend=false \
&& rm -fr $BUNDLE_DIR/terraform/.terraform/providers \
&& terraform providers mirror /usr/local/share/terraform/plugins
4 changes: 2 additions & 2 deletions templates/workspaces/base/porter.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: tre-workspace-base
version: 0.3.26
version: 0.3.27
description: "A base Azure TRE workspace"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down Expand Up @@ -134,7 +134,7 @@ outputs:
mixins:
- exec
- terraform:
clientVersion: 1.2.7
clientVersion: 1.2.8
- az

install:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ resource "azurerm_monitor_private_link_scoped_service" "ampls_app_insights" {
}

resource "azurerm_private_endpoint" "azure_monitor_private_endpoint" {
count = 0 # Remove with https://github.com/microsoft/AzureTRE/issues/2357
yuvalyaron marked this conversation as resolved.
Show resolved Hide resolved
name = "pe-ampls-${var.tre_id}-ws-${local.short_workspace_id}"
resource_group_name = var.resource_group_name
location = var.location
Expand Down