From 38ca1fcd17f74516ce6a201a88f562521788382a Mon Sep 17 00:00:00 2001 From: Benjamin Chiverton Date: Wed, 26 Jun 2024 16:44:16 +0100 Subject: [PATCH] Use https --- .github/workflows/instance-deploy-prod.yml | 2 +- .github/workflows/instance-deploy-test.yml | 4 ++-- src/Api/Company.Api/appsettings.Development.json | 2 +- terraform/instance/container_apps.tf | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/instance-deploy-prod.yml b/.github/workflows/instance-deploy-prod.yml index 38c2d62..1cf3e5a 100644 --- a/.github/workflows/instance-deploy-prod.yml +++ b/.github/workflows/instance-deploy-prod.yml @@ -143,7 +143,7 @@ jobs: location: 'East US' resourceGroup: ${{ env.resource_group_name }} targetPort: 8080 - environmentVariables: "OTEL_EXPORTER_OTLP_ENDPOINT=http://${{ env.container_app_monitoring_fqdn }}:18889" + environmentVariables: "OTEL_EXPORTER_OTLP_ENDPOINT=https://${{ env.container_app_monitoring_fqdn }}:18889" - name: Deploy website uses: azure/container-apps-deploy-action@v1 with: diff --git a/.github/workflows/instance-deploy-test.yml b/.github/workflows/instance-deploy-test.yml index 94a456b..bc91c37 100644 --- a/.github/workflows/instance-deploy-test.yml +++ b/.github/workflows/instance-deploy-test.yml @@ -120,7 +120,7 @@ jobs: location: 'East US' resourceGroup: ${{ env.resource_group_name }} targetPort: 8080 - environmentVariables: "OTEL_EXPORTER_OTLP_ENDPOINT=http://${{ env.container_app_monitoring_fqdn }}:18889" + environmentVariables: "OTEL_EXPORTER_OTLP_ENDPOINT=https://${{ env.container_app_monitoring_fqdn }}:18889" - name: Deploy website uses: azure/container-apps-deploy-action@v1 with: @@ -144,7 +144,7 @@ jobs: const output = `### Test environment information #### 🔗[Visit website](https://${{ env.container_app_website_fqdn }}/) #### 🔗[Visit API](https://${{ env.container_app_api_fqdn }}/swagger/) - #### 🔗[Visit monitoring UI](http://${{ env.container_app_monitoring_fqdn }}) + #### 🔗[Visit monitoring UI](https://${{ env.container_app_monitoring_fqdn }}) *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Working Directory: \`${{ env.tf_actions_working_dir }}\`, Workflow: \`${{ github.workflow }}\`*`; diff --git a/src/Api/Company.Api/appsettings.Development.json b/src/Api/Company.Api/appsettings.Development.json index 25b6a0f..d345749 100644 --- a/src/Api/Company.Api/appsettings.Development.json +++ b/src/Api/Company.Api/appsettings.Development.json @@ -5,6 +5,6 @@ "Microsoft.AspNetCore": "Warning" } }, - "OTEL_EXPORTER_OTLP_ENDPOINT": "http://onlinestore-update-monitoring-monitoring.eastus.azurecontainer.io:18889", + "OTEL_EXPORTER_OTLP_ENDPOINT": "set-me", "OTEL_SERVICE_NAME": "Company.Api" } diff --git a/terraform/instance/container_apps.tf b/terraform/instance/container_apps.tf index 6778246..886069f 100644 --- a/terraform/instance/container_apps.tf +++ b/terraform/instance/container_apps.tf @@ -98,7 +98,6 @@ resource "azurerm_container_app" "monitoring" { external_enabled = true transport = "http" target_port = 18888 - allow_insecure_connections = true traffic_weight { latest_revision = true percentage = 100