Skip to content

Commit d0f5d28

Browse files
committed
[AZINTS] location and package
1 parent f7fac1e commit d0f5d28

3 files changed

Lines changed: 25 additions & 5 deletions

File tree

azure/eventhub_log_forwarder/event_hub.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"location": {
6+
"type": "string",
7+
"metadata": {
8+
"description": "Location for the eventhub"
9+
}
10+
},
511
"eventHubNamespace": {
612
"type": "string",
713
"metadata": {
@@ -28,7 +34,7 @@
2834
"apiVersion": "2024-01-01",
2935
"name": "[parameters('eventHubNamespace')]",
3036
"type": "Microsoft.EventHub/namespaces",
31-
"location": "[deployment().location]",
37+
"location": "[parameters('location')]",
3238
"sku": {
3339
"name": "Standard",
3440
"tier": "Standard",

azure/eventhub_log_forwarder/function_template.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"location": {
6+
"type": "string",
7+
"metadata": {
8+
"description": "Location for the resources"
9+
}
10+
},
511
"functionAppName": {
612
"type": "string",
713
"defaultValue": "[concat('datadog-functionapp-', newGuid())]",
@@ -65,7 +71,7 @@
6571
"type": "Microsoft.Storage/storageAccounts",
6672
"apiVersion": "2023-05-01",
6773
"name": "[variables('storageAccountName')]",
68-
"location": "[deployment().location]",
74+
"location": "[parameters('location')]",
6975
"kind": "StorageV2",
7076
"sku": {
7177
"name": "Standard_LRS"
@@ -78,7 +84,7 @@
7884
"apiVersion": "2024-04-01",
7985
"type": "Microsoft.Web/sites",
8086
"name": "[parameters('functionAppName')]",
81-
"location": "[deployment().location]",
87+
"location": "[parameters('location')]",
8288
"kind": "functionapp",
8389
"dependsOn": [
8490
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]"
@@ -137,6 +143,10 @@
137143
"name": "WEBSITE_NODE_DEFAULT_VERSION",
138144
"value": "~20"
139145
},
146+
{
147+
"name": "WEBSITE_RUN_FROM_PACKAGE",
148+
"value": "1"
149+
},
140150
{
141151
"name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
142152
"value": "true"

azure/eventhub_log_forwarder/parent_template.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
{
103103
"name": "eventHubTemplate",
104104
"type": "Microsoft.Resources/deployments",
105-
"location": "[parameters('resourcesLocation')]",
106105
"apiVersion": "2024-07-01",
107106
"properties": {
108107
"mode": "Incremental",
@@ -111,6 +110,9 @@
111110
"contentVersion": "1.0.0.0"
112111
},
113112
"parameters": {
113+
"location": {
114+
"value": "[parameters('resourcesLocation')]"
115+
},
114116
"eventHubNamespace": {
115117
"value": "[parameters('eventHubNamespace')]"
116118
},
@@ -127,14 +129,16 @@
127129
"name": "functionAppTemplate",
128130
"type": "Microsoft.Resources/deployments",
129131
"apiVersion": "2024-07-01",
130-
"location": "[parameters('resourcesLocation')]",
131132
"properties": {
132133
"mode": "Incremental",
133134
"templateLink": {
134135
"uri": "[variables('functionAppTemplateLink')]",
135136
"contentVersion": "1.0.0.0"
136137
},
137138
"parameters": {
139+
"location": {
140+
"value": "[parameters('resourcesLocation')]"
141+
},
138142
"eventHubNamespace": {
139143
"value": "[parameters('eventHubNamespace')]"
140144
},

0 commit comments

Comments
 (0)