From ab577c2fcfb5e01204bb7b332f39948f20807920 Mon Sep 17 00:00:00 2001 From: Thiago Almeida Date: Thu, 1 Feb 2024 22:10:48 +0000 Subject: [PATCH 1/3] Adding simple and with details for Flex Consumption function app sample --- ...ateOrUpdateFlexConsumptionFunctionApp.json | 18 +- ...FunctionAppFlexConsumptionWithDetails.json | 367 ++++++++++++++++++ 2 files changed, 368 insertions(+), 17 deletions(-) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFunctionAppFlexConsumptionWithDetails.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json index b6b4e6a57cb9..312386c222ea 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json @@ -17,10 +17,6 @@ { "name": "FUNCTIONS_EXTENSION_VERSION", "value": "~4" - }, - { - "name": "APPLICATIONINSIGHTS_CONNECTION_STRING", - "value": "InstrumentationKey=Sanitized;IngestionEndpoint=Sanitized;LiveEndpoint=Sanitized" } ] }, @@ -40,19 +36,7 @@ "version": "3.11" }, "scaleAndConcurrency": { - "alwaysReady": [ - { - "name": "http", - "instanceCount": 2 - } - ], - "maximumInstanceCount": 50, - "instanceMemoryMB": 2048, - "triggers": { - "http": { - "perInstanceConcurrency": 16 - } - } + "instanceMemoryMB": 2048 } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFunctionAppFlexConsumptionWithDetails.json b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFunctionAppFlexConsumptionWithDetails.json new file mode 100644 index 000000000000..5117c1797456 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFunctionAppFlexConsumptionWithDetails.json @@ -0,0 +1,367 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "name": "sitef6141", + "api-version": "2023-12-01", + "siteEnvelope": { + "location": "East US", + "kind": "functionapp,linux", + "properties": { + "siteConfig": { + "appSettings": [ + { + "name": "AzureWebJobsStorage", + "value": "DefaultEndpointsProtocol=https;AccountName=StorageAccountName;AccountKey=Sanitized;EndpointSuffix=core.windows.net" + }, + { + "name": "FUNCTIONS_EXTENSION_VERSION", + "value": "~4" + }, + { + "name": "APPLICATIONINSIGHTS_CONNECTION_STRING", + "value": "InstrumentationKey=Sanitized;IngestionEndpoint=Sanitized;LiveEndpoint=Sanitized" + } + ] + }, + "functionAppConfig": { + "deployment": { + "storage": { + "type": "blobContainer", + "value": "https://storageAccountName.blob.core.windows.net/containername", + "authentication": { + "type": "StorageAccountConnectionString", + "storageAccountConnectionStringName": "TheAppSettingName" + } + } + }, + "runtime": { + "name": "python", + "version": "3.11" + }, + "scaleAndConcurrency": { + "alwaysReady": [ + { + "name": "http", + "instanceCount": 2 + } + ], + "maximumInstanceCount": 50, + "instanceMemoryMB": 2048, + "triggers": { + "http": { + "perInstanceConcurrency": 16 + } + } + } + } + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.Web/sites/sitef6141", + "name": "sitef6141", + "type": "Microsoft.Web/sites", + "location": "East US", + "properties": { + "state": "Running", + "hostNames": [ + "sitef6141.azurewebsites.net" + ], + "repositorySiteName": "sitef6141", + "usageState": "Normal", + "enabled": true, + "enabledHostNames": [ + "sitef6141.azurewebsites.net", + "sitef6141.scm.azurewebsites.net" + ], + "availabilityState": "Normal", + "hostNameSslStates": [ + { + "name": "sitef6141.azurewebsites.net", + "sslState": "Disabled", + "hostType": "Standard" + }, + { + "name": "sitef6141.scm.azurewebsites.net", + "sslState": "Disabled", + "hostType": "Repository" + } + ], + "serverFarmId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.Web/serverfarms/DefaultAsp", + "reserved": null, + "isXenon": false, + "hyperV": false, + "lastModifiedTimeUtc": "2024-01-09T00:24:54.8", + "vnetRouteAllEnabled": false, + "vnetImagePullEnabled": false, + "vnetContentShareEnabled": false, + "siteConfig": { + "numberOfWorkers": 1, + "netFrameworkVersion": "", + "phpVersion": "", + "pythonVersion": "", + "nodeVersion": "", + "powerShellVersion": "", + "linuxFxVersion": "", + "requestTracingEnabled": false, + "remoteDebuggingEnabled": false, + "httpLoggingEnabled": false, + "acrUseManagedIdentityCreds": false, + "logsDirectorySizeLimit": 35, + "detailedErrorLoggingEnabled": false, + "use32BitWorkerProcess": false, + "webSocketsEnabled": false, + "alwaysOn": false, + "appCommandLine": "", + "managedPipelineMode": "Integrated", + "virtualApplications": [ + { + "virtualPath": "/", + "physicalPath": "site\\wwwroot", + "preloadEnabled": false + } + ], + "loadBalancing": "LeastRequests", + "autoHealEnabled": false, + "vnetName": "", + "vnetRouteAllEnabled": false, + "vnetPrivatePortsCount": 0, + "keyVaultReferenceIdentity": "", + "ipSecurityRestrictions": [ + { + "ipAddress": "Any", + "action": "Allow", + "priority": 2147483647, + "name": "Allow all", + "description": "Allow all access" + } + ], + "scmIpSecurityRestrictions": [ + { + "ipAddress": "Any", + "action": "Allow", + "priority": 2147483647, + "name": "Allow all", + "description": "Allow all access" + } + ], + "http20Enabled": false, + "minTlsVersion": "1.2", + "scmMinTlsVersion": "1.2", + "ftpsState": "AllAllowed", + "functionAppScaleLimit": 0, + "functionsRuntimeScaleMonitoringEnabled": false, + "minimumElasticInstanceCount": 0, + "azureStorageAccounts": {} + }, + "functionAppConfig": { + "deployment": { + "storage": { + "type": "blobContainer", + "value": "https://storageAccountName.blob.core.windows.net/containername", + "authentication": { + "type": "StorageAccountConnectionString", + "storageAccountConnectionStringName": "TheAppSettingName" + } + } + }, + "runtime": { + "name": "python", + "version": "3.11" + }, + "scaleAndConcurrency": { + "alwaysReady": [ + { + "name": "http", + "instanceCount": 2 + } + ], + "maximumInstanceCount": 50, + "instanceMemoryMB": 2048, + "triggers": { + "http": { + "perInstanceConcurrency": 16 + } + } + } + }, + "scmSiteAlsoStopped": false, + "clientAffinityEnabled": false, + "clientCertEnabled": false, + "vnetBackupRestoreEnabled": false, + "resourceConfig": { + "cpu": 1.0, + "memory": "2.0Gi" + }, + "outboundIpAddresses": "70.37.102.201,20.225.43.144", + "possibleOutboundIpAddresses": "70.37.102.201,20.225.43.144,20.225.184.122,20.225.184.188", + "containerSize": 2048, + "dailyMemoryTimeQuota": 0, + "resourceGroup": "testrg123", + "defaultHostName": "sitef6141.azurewebsites.net", + "httpsOnly": true, + "redundancyMode": "None", + "publicNetworkAccess": "Enabled", + "storageAccountRequired": false + } + } + }, + "202": { + "headers": { + "azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/sites/sitef6141/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2023-12-01" + }, + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.Web/sites/sitef6141", + "name": "sitef6141", + "type": "Microsoft.Web/sites", + "location": "East US", + "properties": { + "state": "Running", + "hostNames": [ + "sitef6141.azurewebsites.net" + ], + "repositorySiteName": "sitef6141", + "usageState": "Normal", + "enabled": true, + "enabledHostNames": [ + "sitef6141.azurewebsites.net", + "sitef6141.scm.azurewebsites.net" + ], + "availabilityState": "Normal", + "hostNameSslStates": [ + { + "name": "sitef6141.azurewebsites.net", + "sslState": "Disabled", + "hostType": "Standard" + }, + { + "name": "sitef6141.scm.azurewebsites.net", + "sslState": "Disabled", + "hostType": "Repository" + } + ], + "serverFarmId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.Web/serverfarms/DefaultAsp", + "reserved": null, + "isXenon": false, + "hyperV": false, + "lastModifiedTimeUtc": "2024-01-09T00:24:54.8", + "vnetRouteAllEnabled": false, + "vnetImagePullEnabled": false, + "vnetContentShareEnabled": false, + "siteConfig": { + "numberOfWorkers": 1, + "netFrameworkVersion": "", + "phpVersion": "", + "pythonVersion": "", + "nodeVersion": "", + "powerShellVersion": "", + "linuxFxVersion": "", + "requestTracingEnabled": false, + "remoteDebuggingEnabled": false, + "httpLoggingEnabled": false, + "acrUseManagedIdentityCreds": false, + "logsDirectorySizeLimit": 35, + "detailedErrorLoggingEnabled": false, + "use32BitWorkerProcess": false, + "webSocketsEnabled": false, + "alwaysOn": false, + "appCommandLine": "", + "managedPipelineMode": "Integrated", + "virtualApplications": [ + { + "virtualPath": "/", + "physicalPath": "site\\wwwroot", + "preloadEnabled": false + } + ], + "loadBalancing": "LeastRequests", + "autoHealEnabled": false, + "vnetName": "", + "vnetRouteAllEnabled": false, + "vnetPrivatePortsCount": 0, + "keyVaultReferenceIdentity": "", + "ipSecurityRestrictions": [ + { + "ipAddress": "Any", + "action": "Allow", + "priority": 2147483647, + "name": "Allow all", + "description": "Allow all access" + } + ], + "scmIpSecurityRestrictions": [ + { + "ipAddress": "Any", + "action": "Allow", + "priority": 2147483647, + "name": "Allow all", + "description": "Allow all access" + } + ], + "http20Enabled": false, + "minTlsVersion": "1.2", + "scmMinTlsVersion": "1.2", + "ftpsState": "AllAllowed", + "functionAppScaleLimit": 0, + "functionsRuntimeScaleMonitoringEnabled": false, + "minimumElasticInstanceCount": 0, + "azureStorageAccounts": {} + }, + "functionAppConfig": { + "deployment": { + "storage": { + "type": "blobContainer", + "value": "https://storageAccountName.blob.core.windows.net/containername", + "authentication": { + "type": "StorageAccountConnectionString", + "storageAccountConnectionStringName": "TheAppSettingName" + } + } + }, + "runtime": { + "name": "python", + "version": "3.11" + }, + "scaleAndConcurrency": { + "alwaysReady": [ + { + "name": "http", + "instanceCount": 2 + } + ], + "maximumInstanceCount": 50, + "instanceMemoryMB": 2048, + "triggers": { + "http": { + "perInstanceConcurrency": 16 + } + } + } + }, + "scmSiteAlsoStopped": false, + "clientAffinityEnabled": false, + "clientCertEnabled": false, + "vnetBackupRestoreEnabled": false, + "resourceConfig": { + "cpu": 1.0, + "memory": "2.0Gi" + }, + "outboundIpAddresses": "70.37.102.201,20.225.43.144", + "possibleOutboundIpAddresses": "70.37.102.201,20.225.43.144,20.225.184.122,20.225.184.188", + "containerSize": 2048, + "dailyMemoryTimeQuota": 0, + "resourceGroup": "testrg123", + "defaultHostName": "sitef6141.azurewebsites.net", + "httpsOnly": true, + "redundancyMode": "None", + "publicNetworkAccess": "Enabled", + "storageAccountRequired": false + } + } + } + } +} From d76dd8a1280941be0e15e26cc6ab4dba31ecca22 Mon Sep 17 00:00:00 2001 From: Thiago Almeida Date: Thu, 1 Feb 2024 22:18:46 +0000 Subject: [PATCH 2/3] Adding maximumInstanceCount back --- .../CreateOrUpdateFlexConsumptionFunctionApp.json | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json index 312386c222ea..577722a6ed37 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json @@ -36,6 +36,7 @@ "version": "3.11" }, "scaleAndConcurrency": { + "maximumInstanceCount": 100, "instanceMemoryMB": 2048 } } @@ -159,10 +160,6 @@ }, "scaleAndConcurrency": { "alwaysReady": [ - { - "name": "http", - "instanceCount": 2 - } ], "maximumInstanceCount": 50, "instanceMemoryMB": 2048, @@ -312,16 +309,12 @@ }, "scaleAndConcurrency": { "alwaysReady": [ - { - "name": "http", - "instanceCount": 2 - } ], - "maximumInstanceCount": 50, + "maximumInstanceCount": 100, "instanceMemoryMB": 2048, "triggers": { "http": { - "perInstanceConcurrency": 16 + "perInstanceConcurrency": null } } } From 22b6514c77e4b6c61554df6ec249c04770358f36 Mon Sep 17 00:00:00 2001 From: Thiago Almeida Date: Thu, 1 Feb 2024 22:20:26 +0000 Subject: [PATCH 3/3] Updating maximumInstanceCount to match --- .../examples/CreateOrUpdateFlexConsumptionFunctionApp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json index 577722a6ed37..ba9ef0963a68 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/examples/CreateOrUpdateFlexConsumptionFunctionApp.json @@ -161,7 +161,7 @@ "scaleAndConcurrency": { "alwaysReady": [ ], - "maximumInstanceCount": 50, + "maximumInstanceCount": 100, "instanceMemoryMB": 2048, "triggers": { "http": {