Skip to content

Upgrade Azure Log Forwader's EventHub/Storage Acct TLS versions #919

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

Merged
agulen merged 5 commits into from
Mar 18, 2025
Merged

Upgrade Azure Log Forwader's EventHub/Storage Acct TLS versions #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f76200a
tls 1.2 for event hubs and storage accts
agulen Mar 18, 2025
d61b05f
api versions + testing
agulen Mar 18, 2025
9ff2966
back to master branch for urls
agulen Mar 18, 2025
698b0ae
missed one branch replacement
agulen Mar 18, 2025
70cf602
Merge branch 'master' into altan/tls12
agulen Mar 18, 2025
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
8 changes: 5 additions & 3 deletions azure/deploy-to-azure/event_hub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"resources": [
{
"apiVersion": "2018-01-01-preview",
"apiVersion": "2024-01-01",
"name": "[parameters('eventHubNamespace')]",
"type": "Microsoft.EventHub/namespaces",
"location": "[parameters('location')]",
Expand All @@ -42,10 +42,12 @@
"capacity": 1
},
"tags": {},
"properties": {},
"properties": {
"minimumTlsVersion": "1.2"
},
"resources": [
{
"apiVersion": "2017-04-01",
"apiVersion": "2024-01-01",
"name": "[parameters('eventHubName')]",
"type": "eventhubs",
"dependsOn": [
Expand Down
11 changes: 7 additions & 4 deletions azure/deploy-to-azure/function_template.json
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions azure/deploy-to-azure/parent_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
}
},
"diagnosticSettingName": {
"type": "string",
"defaultValue": "[concat('datadog-activity-logs-diagnostic-setting-', uniqueString(newGuid()))]",
"metadata": {
"description": "The name of the diagnostic setting if sending Activity Logs"
}
"type": "string",
"defaultValue": "[concat('datadog-activity-logs-diagnostic-setting-', uniqueString(newGuid()))]",
"metadata": {
"description": "The name of the diagnostic setting if sending Activity Logs"
}
}
},
"variables": {
Expand Down Expand Up @@ -185,10 +185,10 @@
"location": "[parameters('resourcesLocation')]"
}
],
"outputs": {
"eventHubNamespace": {
"type": "string",
"value": "[parameters('eventHubNamespace')]"
}
"outputs": {
"eventHubNamespace": {
"type": "string",
"value": "[parameters('eventHubNamespace')]"
}
}
}
8 changes: 5 additions & 3 deletions azure/eventhub_log_forwarder/event_hub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"resources": [
{
"apiVersion": "2018-01-01-preview",
"apiVersion": "2024-01-01",
"name": "[parameters('eventHubNamespace')]",
"type": "Microsoft.EventHub/namespaces",
"location": "[parameters('location')]",
Expand All @@ -35,10 +35,12 @@
"capacity": 1
},
"tags": {},
"properties": {},
"properties": {
"minimumTlsVersion": "1.2"
},
"resources": [
{
"apiVersion": "2017-04-01",
"apiVersion": "2024-01-01",
"name": "[parameters('eventHubName')]",
"type": "eventhubs",
"dependsOn": [
Expand Down
9 changes: 6 additions & 3 deletions azure/eventhub_log_forwarder/function_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,19 @@
"resources": [
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2019-06-01",
"apiVersion": "2023-05-01",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
"kind": "StorageV2",
"sku": {
"name": "Standard_LRS"
},
"properties": {
"minimumTlsVersion": "TLS1_2"
}
},
{
"apiVersion": "2018-11-01",
"apiVersion": "2024-04-01",
"type": "Microsoft.Web/sites",
"name": "[parameters('functionAppName')]",
"location": "[parameters('location')]",
Expand Down Expand Up @@ -152,7 +155,7 @@
{
"name": "[concat(parameters('functionAppName'), '/', parameters('functionName'))]",
"type": "Microsoft.Web/sites/functions",
"apiVersion": "2020-06-01",
"apiVersion": "2024-04-01",
"properties": {
"config": {
"bindings": [
Expand Down
14 changes: 7 additions & 7 deletions azure/eventhub_log_forwarder/parent_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
{
"name": "eventHubTemplate",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2018-05-01",
"apiVersion": "2024-07-01",
"properties": {
"mode": "Incremental",
"templateLink": {
Expand All @@ -102,7 +102,7 @@
{
"name": "functionAppTemplate",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2018-05-01",
"apiVersion": "2024-07-01",
"properties": {
"mode": "Incremental",
"templateLink": {
Expand Down Expand Up @@ -147,10 +147,10 @@
]
}
],
"outputs": {
"eventHubNamespace": {
"type": "string",
"value": "[parameters('eventHubNamespace')]"
}
"outputs": {
"eventHubNamespace": {
"type": "string",
"value": "[parameters('eventHubNamespace')]"
}
}
}
Loading