Guacamole sends logs to app insights

.github/workflows/build_docker_images.yml

@@ -45,7 +45,7 @@ jobs:
             guacamole_server:
               - 'templates/workspace_services/guacamole/guacamole-server/**/*'
             guacamole_server_version:
-              - 'templates/workspace_services/guacamole/version.txt'
+              - 'templates/workspace_services/guacamole/guacamole-server/docker/version.txt'
             gitea:
               - 'templates/shared_services/gitea/**/*'
             gitea_version:

CHANGELOG.md

@@ -12,7 +12,7 @@ FEATURES:
 
 ENHANCEMENTS:
 
-*
+* Guacamole logs are sent to Application Insights ([#2376](https://github.com/microsoft/AzureTRE/pull/2376))
 
 BUG FIXES:
 

templates/workspace_services/guacamole/.dockerignore

@@ -10,4 +10,5 @@ Dockerfile.tmpl
 terraform/deploy.sh
 terraform/destroy.sh
 guacamole-server/
+!guacamole-server/docker/version.txt
 user_resources/

templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile

@@ -25,15 +25,15 @@ RUN apt-get update && apt-get install wget curl openssh-server apt-transport-htt
 
 ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
 RUN JAVA_ARCHIVE=java.tar.gz && \
-    wget -O "$JAVA_ARCHIVE" "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz" --progress=dot:giga && \
+    wget -O "$JAVA_ARCHIVE" "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.16_8.tar.gz" --progress=dot:giga && \
     mkdir -p "$JAVA_HOME" && \
     tar xzf "$JAVA_ARCHIVE" -C "$JAVA_HOME" --strip-components=1 && \
     rm -f "$JAVA_ARCHIVE" && \
     export PATH="$JAVA_HOME"/bin:"$PATH" && java -version
 
 ENV CATALINA_BASE=/usr/share/tomcat9/
 RUN TOMCAT_ARCHIVE=tomcat.tar.gz && \
-    TOMCAT_VER=9.0.62 && \
+    TOMCAT_VER=9.0.65 && \
     wget -O "$TOMCAT_ARCHIVE" -N "https://archive.apache.org/dist/tomcat/tomcat-9/v${TOMCAT_VER}/bin/apache-tomcat-${TOMCAT_VER}.tar.gz" --progress=dot:giga && \
     tar xzf "$TOMCAT_ARCHIVE" && \
     rm -f "$TOMCAT_ARCHIVE" && \
@@ -64,13 +64,17 @@ RUN wget -O "${GUACAMOLE_HOME}/guacamole.war" "http://apache.org/dyn/closer.cgi?
 
 ENV OAUTH2_PROXY_HOME=/etc/oauth2-proxy
 RUN OAUTH2_PROXY_ARCHIVE=oauth2-proxy.tar.gz && \
+    # For some reason 7.3.1 doesn't work when deployed to app service
     wget -O "$OAUTH2_PROXY_ARCHIVE" "https://github.com/oauth2-proxy/oauth2-proxy/releases/download/v7.2.1/oauth2-proxy-v7.2.1.linux-amd64.tar.gz" --progress=dot:giga && \
     mkdir -p "$OAUTH2_PROXY_HOME" && \
     tar zxpf "$OAUTH2_PROXY_ARCHIVE" -C "$OAUTH2_PROXY_HOME" --strip-components=1 && \
     rm -f "$OAUTH2_PROXY_ARCHIVE"
 
 COPY ./docker/index.jsp "$CATALINA_BASE"/webapps/ROOT/index.jsp
 
+RUN wget -O "/tmp/applicationinsights-agent.jar" "https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.3.1/applicationinsights-agent-3.3.1.jar" --progress=dot:giga
+ENV CATALINA_OPTS="$CATALINA_OPTS -javaagent:/tmp/applicationinsights-agent.jar"
+
 ENTRYPOINT [ "/init" ]
 
 EXPOSE 80 2222

templates/workspace_services/guacamole/guacamole-server/docker/version.txt

@@ -0,0 +1 @@
+__version__ = "0.3.6"

templates/workspace_services/guacamole/porter.yaml

@@ -1,14 +1,14 @@
 ---
 name: tre-service-guacamole
-version: 0.4.0
+version: 0.4.1
 description: "An Azure TRE service for Guacamole"
 registry: azuretre
 
 custom:
   runtime_image:
     name: guac-server
     build:
-      version_file: version.txt
+      version_file: guacamole-server/docker/version.txt
       docker_file: guacamole-server/docker/Dockerfile
       docker_context: guacamole-server
 

templates/workspace_services/guacamole/terraform/data.tf

@@ -57,6 +57,10 @@ data "azurerm_log_analytics_workspace" "tre" {
 }
 
 data "local_file" "version" {
-  filename = "${path.module}/../version.txt"
+  filename = "${path.module}/../guacamole-server/docker/version.txt"
 }
 
+data "azurerm_application_insights" "ws" {
+  name                = "appi-${var.tre_id}-ws-${local.short_workspace_id}"
+  resource_group_name = data.azurerm_resource_group.ws.name
+}

templates/workspace_services/guacamole/terraform/web_app.tf

@@ -46,6 +46,9 @@ resource "azurerm_linux_web_app" "guacamole" {
     WORKSPACE_ID               = var.workspace_id
     MANAGED_IDENTITY_CLIENT_ID = azurerm_user_assigned_identity.guacamole_id.client_id
 
+    APPLICATIONINSIGHTS_CONNECTION_STRING             = data.azurerm_application_insights.ws.connection_string
+    APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "INFO"
+
     # Guacmole configuration
     GUAC_DISABLE_COPY     = var.guac_disable_copy
     GUAC_DISABLE_PASTE    = var.guac_disable_paste