Skip to content

Azure: improve logging #264

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.

Sign up for GitHub

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

Draft
lionello wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Azure: improve logging #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d255b1d
fix(azure): basic tier + cap for logs
lionello May 16, 2026
2ff203e
feat(azure): update settings and add integration test configuration
lionello May 19, 2026
687f484
feat(azure): update logging configuration to use Azure Monitor and ad…
lionello May 20, 2026
04833a8
fix(deps): update pulumi-azure-native-sdk dependencies to v3.17.0
lionello May 20, 2026
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 .claude/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"Bash(az monitor log-analytics workspace table list:*)",
"Bash(az monitor log-analytics workspace table show:*)",
"Bash(az role assignment list:*)",
"Bash(az role assignment show:*)",
"Bash(cat:*)",
"Bash(curl -sf http://localhost:*)",
"Bash(diff:*)",
Expand Down
12 changes: 7 additions & 5 deletions cd/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@ func TestRunPreviewGCP(t *testing.T) {
}

func testProviderPreview(t *testing.T, provider, accountId string) {
t.Helper()

if err := exec.CommandContext(t.Context(), "make", "-C", "..", "install_defang-"+provider).Run(); err != nil {
t.Fatalf("failed to install defang-%s provider: %v", provider, err)
}
t.Run("install defang-"+provider, func(t *testing.T) {
makeCmd := exec.CommandContext(t.Context(), "make", "-C", "..", "install_defang-"+provider)
makeCmd.Stderr = t.Output()
if err := makeCmd.Run(); err != nil {
t.Fatalf("failed to install defang-%s provider: %v", provider, err)
}
})

eventsFile := t.TempDir() + "/events.json.gz"
t.Setenv("DEFANG_EVENTS_UPLOAD_URL", "file://"+eventsFile)
Expand Down
219 changes: 203 additions & 16 deletions cd/testdata/preview-events-azure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"maybeCorrupt": false,
"durationSeconds": 42,
"resourceChanges": {
"create": 8
"create": 10
},
"PolicyPacks": {},
"isPreview": true
Expand All @@ -51,6 +51,121 @@
"cancelEvent": {},
"Error": null
},
{
"sequence": 42,
"timestamp": 42,
"resourcePreEvent": {
"metadata": {
"op": "create",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:app:ManagedEnvironment$azure-native:monitor:DiagnosticSetting::cd-test-aca-logs",
"type": "azure-native:monitor:DiagnosticSetting",
"old": null,
"new": {
"type": "azure-native:monitor:DiagnosticSetting",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:app:ManagedEnvironment$azure-native:monitor:DiagnosticSetting::cd-test-aca-logs",
"custom": true,
"id": "",
"parent": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:app:ManagedEnvironment::cd-test",
"inputs": {
"__createBeforeDelete": true,
"azureApiVersion": "2021-05-01-preview",
"logAnalyticsDestinationType": "Dedicated",
"logs": [
{
"category": "ContainerAppConsoleLogs",
"enabled": true
},
{
"category": "ContainerAppSystemLogs",
"enabled": true
}
],
"name": "Defang-cd-test-azure-cd-test-aca-logs-***",
"resourceUri": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"workspaceId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"outputs": {},
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"detailedDiff": null,
"logical": true,
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"planning": true
},
"Error": null
},
{
"sequence": 42,
"timestamp": 42,
"resOutputsEvent": {
"metadata": {
"op": "create",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:app:ManagedEnvironment$azure-native:monitor:DiagnosticSetting::cd-test-aca-logs",
"type": "azure-native:monitor:DiagnosticSetting",
"old": null,
"new": {
"type": "azure-native:monitor:DiagnosticSetting",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:app:ManagedEnvironment$azure-native:monitor:DiagnosticSetting::cd-test-aca-logs",
"custom": true,
"id": "",
"parent": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:app:ManagedEnvironment::cd-test",
"inputs": {
"__createBeforeDelete": true,
"azureApiVersion": "2021-05-01-preview",
"logAnalyticsDestinationType": "Dedicated",
"logs": [
{
"category": "ContainerAppConsoleLogs",
"enabled": true
},
{
"category": "ContainerAppSystemLogs",
"enabled": true
}
],
"name": "Defang-cd-test-azure-cd-test-aca-logs-***",
"resourceUri": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"workspaceId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"outputs": {
"eventHubAuthorizationRuleId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"eventHubName": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"id": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"logAnalyticsDestinationType": "Dedicated",
"logs": [
{
"category": "ContainerAppConsoleLogs",
"categoryGroup": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"enabled": true,
"retentionPolicy": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
{
"category": "ContainerAppSystemLogs",
"categoryGroup": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"enabled": true,
"retentionPolicy": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
}
],
"marketplacePartnerId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"metrics": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"name": "Defang-cd-test-azure-cd-test-aca-logs-***",
"serviceBusRuleId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"storageAccountId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"systemData": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"type": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"workspaceId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"detailedDiff": null,
"logical": true,
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"planning": true
},
"Error": null
},
{
"sequence": 42,
"timestamp": 42,
Expand All @@ -69,11 +184,7 @@
"inputs": {
"__createBeforeDelete": true,
"appLogsConfiguration": {
"destination": "log-analytics",
"logAnalyticsConfiguration": {
"customerId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"sharedKey": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
}
"destination": "azure-monitor"
},
"azureApiVersion": "2025-02-02-preview",
"environmentName": "Defang-cd-test-azure-***",
Expand Down Expand Up @@ -115,11 +226,7 @@
"inputs": {
"__createBeforeDelete": true,
"appLogsConfiguration": {
"destination": "log-analytics",
"logAnalyticsConfiguration": {
"customerId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"sharedKey": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
}
"destination": "azure-monitor"
},
"azureApiVersion": "2025-02-02-preview",
"environmentName": "Defang-cd-test-azure-***",
Expand All @@ -135,11 +242,8 @@
"outputs": {
"appInsightsConfiguration": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"appLogsConfiguration": {
"destination": "log-analytics",
"logAnalyticsConfiguration": {
"customerId": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"dynamicJsonColumns": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
}
"destination": "azure-monitor",
"logAnalyticsConfiguration": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"availabilityZones": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"customDomainConfiguration": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
Expand Down Expand Up @@ -188,6 +292,89 @@
},
"Error": null
},
{
"sequence": 42,
"timestamp": 42,
"resourcePreEvent": {
"metadata": {
"op": "create",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:operationalinsights:Workspace$azure-native:operationalinsights:Table::cd-test-console-logs",
"type": "azure-native:operationalinsights:Table",
"old": null,
"new": {
"type": "azure-native:operationalinsights:Table",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:operationalinsights:Workspace$azure-native:operationalinsights:Table::cd-test-console-logs",
"custom": true,
"id": "",
"parent": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:operationalinsights:Workspace::cd-test",
"inputs": {
"azureApiVersion": "2023-09-01",
"plan": "Basic",
"resourceGroupName": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"tableName": "ContainerAppConsoleLogs",
"workspaceName": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"outputs": {},
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"detailedDiff": null,
"logical": true,
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"planning": true
},
"Error": null
},
{
"sequence": 42,
"timestamp": 42,
"resOutputsEvent": {
"metadata": {
"op": "create",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:operationalinsights:Workspace$azure-native:operationalinsights:Table::cd-test-console-logs",
"type": "azure-native:operationalinsights:Table",
"old": null,
"new": {
"type": "azure-native:operationalinsights:Table",
"urn": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:operationalinsights:Workspace$azure-native:operationalinsights:Table::cd-test-console-logs",
"custom": true,
"id": "",
"parent": "urn:pulumi:azure::cd-test::defang-azure:index:Project$azure-native:operationalinsights:Workspace::cd-test",
"inputs": {
"azureApiVersion": "2023-09-01",
"plan": "Basic",
"resourceGroupName": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"tableName": "ContainerAppConsoleLogs",
"workspaceName": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"outputs": {
"archiveRetentionInDays": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"id": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"lastPlanModifiedDate": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"name": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"plan": "Basic",
"provisioningState": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"restoredLogs": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"resultStatistics": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"retentionInDays": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"retentionInDaysAsDefault": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"schema": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"searchResults": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"systemData": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"totalRetentionInDays": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"totalRetentionInDaysAsDefault": "04da6b54-80e4-46f7-96ec-b56ff0331ba9",
"type": "04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"detailedDiff": null,
"logical": true,
"provider": "urn:pulumi:azure::cd-test::pulumi:providers:azure-native::azure::04da6b54-80e4-46f7-96ec-b56ff0331ba9"
},
"planning": true
},
"Error": null
},
{
"sequence": 42,
"timestamp": 42,
Expand Down
19 changes: 10 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,17 @@ require (
github.com/pulumi/pulumi-awsx/sdk/v3 v3.1.0
github.com/pulumi/pulumi-azure-native-sdk/app/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/cognitiveservices/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/containerregistry/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/dbforpostgresql/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/cognitiveservices/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/containerregistry/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/dbforpostgresql/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/keyvault/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/operationalinsights/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/privatedns/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/redisenterprise/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.16.0
github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/monitor/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/operationalinsights/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/privatedns/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/redisenterprise/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.17.0
github.com/pulumi/pulumi-azure-native-sdk/v3 v3.17.0
github.com/pulumi/pulumi-gcp/sdk/v9 v9.21.0
github.com/pulumi/pulumi-go-provider v1.3.1
Expand Down
Loading
Loading