Skip to content

Commit 5c11622

Browse files
himanshu219himanshu219
authored
Merge pull request #67 from SumoLogic/SUMO-229788
 Version and other Updates for ARM template
2 parents 5d6c86f + 385b6c7 commit 5c11622

File tree

3 files changed

+69
-317
lines changed

3 files changed

+69
-317
lines changed

‎EventHubs/src/azuredeploy_metrics.json‎

Lines changed: 63 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"sites_SumoMetricsFunctionApp_name": {
@@ -47,7 +47,26 @@
4747
"type": "String"
4848
},
4949
"SumoEndpointURL": {
50+
"defaultValue": "Enter HTTP Source URL",
5051
"type": "String"
52+
},
53+
"appInsightsName": {
54+
"defaultValue": "[concat('SumoMetricsAppInsights', uniqueString(resourceGroup().id))]",
55+
"type": "String"
56+
},
57+
"location": {
58+
"type": "string",
59+
"defaultValue": "[resourceGroup().location]",
60+
"metadata": {
61+
"description": "Location for the resources."
62+
}
63+
},
64+
"storageEndpointSuffix": {
65+
"type": "string",
66+
"defaultValue": "core.windows.net",
67+
"metadata": {
68+
"description": "The Azure Storage endpoint suffix. Update for different Azure environments."
69+
}
5170
}
5271
},
5372
"variables": {},
@@ -60,8 +79,8 @@
6079
"capacity": 1
6180
},
6281
"name": "[parameters('namespaces_SumoMetNamespace_name')]",
63-
"apiVersion": "2017-04-01",
64-
"location": "[resourceGroup().location]",
82+
"apiVersion": "2022-10-01-preview",
83+
"location": "[parameters('location')]",
6584
"tags": {},
6685
"scale": null,
6786
"properties": {
@@ -78,18 +97,16 @@
7897
},
7998
"kind": "Storage",
8099
"name": "[parameters('storageAccounts_sumometapplogs_name')]",
81-
"apiVersion": "2017-10-01",
82-
"location": "[resourceGroup().location]",
100+
"apiVersion": "2022-09-01",
101+
"location": "[parameters('location')]",
83102
"tags": {},
84103
"scale": null,
85104
"properties": {
86105
"networkAcls": {
87106
"bypass": "AzureServices",
88-
"virtualNetworkRules": [],
89-
"ipRules": [],
90107
"defaultAction": "Allow"
91108
},
92-
"supportsHttpsTrafficOnly": false,
109+
"supportsHttpsTrafficOnly": true,
93110
"encryption": {
94111
"services": {
95112
"file": {
@@ -112,18 +129,16 @@
112129
},
113130
"kind": "Storage",
114131
"name": "[parameters('storageAccounts_sumometricsfailedmsg')]",
115-
"apiVersion": "2017-10-01",
116-
"location": "[resourceGroup().location]",
132+
"apiVersion": "2022-09-01",
133+
"location": "[parameters('location')]",
117134
"tags": {},
118135
"scale": null,
119136
"properties": {
120137
"networkAcls": {
121138
"bypass": "AzureServices",
122-
"virtualNetworkRules": [],
123-
"ipRules": [],
124139
"defaultAction": "Allow"
125140
},
126-
"supportsHttpsTrafficOnly": false,
141+
"supportsHttpsTrafficOnly": true,
127142
"encryption": {
128143
"services": {
129144
"file": {
@@ -149,14 +164,11 @@
149164
},
150165
"kind": "functionapp",
151166
"name": "[parameters('serverfarms_SumoMetricsAppServicePlan_name')]",
152-
"apiVersion": "2016-09-01",
153-
"location": "[resourceGroup().location]",
167+
"apiVersion": "2022-09-01",
168+
"location": "[parameters('location')]",
154169
"scale": null,
155170
"properties": {
156171
"name": "[parameters('serverfarms_SumoMetricsAppServicePlan_name')]",
157-
"workerTierName": null,
158-
"adminSiteName": null,
159-
"hostingEnvironmentProfile": null,
160172
"perSiteScaling": false,
161173
"reserved": false,
162174
"targetWorkerCount": 0,
@@ -168,28 +180,35 @@
168180
"type": "Microsoft.Web/sites",
169181
"kind": "functionapp",
170182
"name": "[parameters('sites_SumoMetricsFunctionApp_name')]",
171-
"apiVersion": "2016-08-01",
172-
"location": "[resourceGroup().location]",
183+
"apiVersion": "2022-09-01",
184+
"location": "[parameters('location')]",
173185
"scale": null,
174186
"properties": {
187+
"httpsOnly": true,
175188
"enabled": true,
176189
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', parameters('serverfarms_SumoMetricsAppServicePlan_name'))]",
177190
"reserved": false,
178191
"siteConfig": {
192+
"http20Enabled": true,
193+
"minTlsVersion": "1.2",
194+
"scmMinTlsVersion": "1.2",
179195
"appSettings": [
180196
{ "name": "FUNCTIONS_EXTENSION_VERSION", "value": "~1" },
181197
{ "name": "Project", "value": "EventHubs/target/metrics_build/" },
182-
{ "name": "AzureWebJobsStorage", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometapplogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name')),'2015-05-01-preview').key1)]" },
183-
{ "name": "AzureWebJobsDashboard", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometapplogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name')),'2015-05-01-preview').key1)]" },
198+
{ "name": "AzureWebJobsStorage", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometapplogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name')),'2022-09-01').keys[0].value)]" },
199+
{ "name": "APPINSIGHTS_INSTRUMENTATIONKEY", "value": "[reference(resourceId('microsoft.insights/components/', parameters('appInsightsName')), '2020-02-02').InstrumentationKey]" },
200+
{ "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", "value" : "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometapplogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name')),'2022-09-01').keys[0].value)]"},
201+
{ "name": "WEBSITE_CONTENTSHARE", "value": "[toLower(parameters('sites_SumoMetricsFunctionApp_name'))]" },
202+
{ "name": "FUNCTION_APP_EDIT_MODE", "value": "readwrite"},
184203
{ "name": "SumoLabsMetricEndpoint", "value": "[parameters('SumoEndpointURL')]" },
185-
{ "name": "AzureEventHubConnectionString", "value": "[concat(listkeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', parameters('namespaces_SumoMetNamespace_name'),parameters('AuthorizationRules_RootManageSharedAccessKey_name')), '2017-04-01').primaryConnectionString,';EntityPath=',parameters('eventhubs_insights_metrics_pt1m_name'))]" },
186-
{ "name": "StorageConnectionString", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometricsfailedmsg'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometricsfailedmsg')),'2015-05-01-preview').key1,';EndpointSuffix=core.windows.net')]" }
204+
{ "name": "AzureEventHubConnectionString", "value": "[concat(listkeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', parameters('namespaces_SumoMetNamespace_name'),parameters('AuthorizationRules_RootManageSharedAccessKey_name')), '2022-10-01-preview').primaryConnectionString,';EntityPath=',parameters('eventhubs_insights_metrics_pt1m_name'))]" },
205+
{ "name": "StorageConnectionString", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometricsfailedmsg'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometricsfailedmsg')),'2022-09-01').keys[0].value,';EndpointSuffix=', parameters('storageEndpointSuffix'))]" }
187206
]
188207
}
189208
},
190209
"resources": [
191210
{
192-
"apiVersion": "2015-08-01",
211+
"apiVersion": "2022-09-01",
193212
"name": "web",
194213
"type": "sourcecontrols",
195214
"dependsOn": [
@@ -205,14 +224,15 @@
205224
"dependsOn": [
206225
"[resourceId('Microsoft.Web/serverfarms', parameters('serverfarms_SumoMetricsAppServicePlan_name'))]",
207226
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name'))]",
208-
"[concat('Microsoft.EventHub/namespaces/', parameters('namespaces_SumoMetNamespace_name'))]"
227+
"[resourceId('Microsoft.EventHub/namespaces/', parameters('namespaces_SumoMetNamespace_name'))]",
228+
"[resourceId('Microsoft.Insights/components', parameters('appInsightsName'))]"
209229
]
210230
},
211231
{
212232
"type": "Microsoft.EventHub/namespaces/AuthorizationRules",
213233
"name": "[concat(parameters('namespaces_SumoMetNamespace_name'), '/', parameters('AuthorizationRules_RootManageSharedAccessKey_name'))]",
214-
"apiVersion": "2017-04-01",
215-
"location": "[resourceGroup().location]",
234+
"apiVersion": "2022-10-01-preview",
235+
"location": "[parameters('location')]",
216236
"scale": null,
217237
"properties": {
218238
"rights": [
@@ -228,8 +248,8 @@
228248
{
229249
"type": "Microsoft.EventHub/namespaces/eventhubs",
230250
"name": "[concat(parameters('namespaces_SumoMetNamespace_name'), '/', parameters('eventhubs_insights_metrics_pt1m_name'))]",
231-
"apiVersion": "2017-04-01",
232-
"location": "[resourceGroup().location]",
251+
"apiVersion": "2022-10-01-preview",
252+
"location": "[parameters('location')]",
233253
"scale": null,
234254
"properties": {
235255
"messageRetentionInDays": 7,
@@ -243,14 +263,25 @@
243263
{
244264
"type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups",
245265
"name": "[concat(parameters('namespaces_SumoMetNamespace_name'), '/', parameters('eventhubs_insights_metrics_pt1m_name'), '/', parameters('consumerGroupName'))]",
246-
"apiVersion": "2017-04-01",
247-
"location": "[resourceGroup().location]",
266+
"apiVersion": "2022-10-01-preview",
267+
"location": "[parameters('location')]",
248268
"scale": null,
249269
"properties": {},
250270
"dependsOn": [
251271
"[resourceId('Microsoft.EventHub/namespaces', parameters('namespaces_SumoMetNamespace_name'))]",
252272
"[resourceId('Microsoft.EventHub/namespaces/eventhubs', parameters('namespaces_SumoMetNamespace_name'), parameters('eventhubs_insights_metrics_pt1m_name'))]"
253273
]
274+
},
275+
{
276+
"name": "[parameters('appInsightsName')]",
277+
"type": "Microsoft.Insights/components",
278+
"apiVersion": "2020-02-02",
279+
"location": "[parameters('location')]",
280+
"kind": "web",
281+
"properties": {
282+
"Application_Type": "web",
283+
"applicationId": "[parameters('appInsightsName')]"
284+
}
254285
}
255286
]
256287
}

0 commit comments

Comments
 (0)