Skip to content

Commit c1b1959

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into gh32740
2 parents 34d43bc + b96b7ec commit c1b1959

29 files changed

+164
-154
lines changed

articles/app-service/configure-language-java.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ You can use [Azure Web App Plugin for Maven](/java/api/overview/azure/maven/azur
2525
Otherwise, your deployment method will depend on your archive type:
2626

2727
- To deploy .war files to Tomcat, use the `/api/wardeploy/` endpoint to POST your archive file. For more information on this API, please see [this documentation](https://docs.microsoft.com/azure/app-service/deploy-zip#deploy-war-file).
28+
- To deploy .jar files to Java SE, use the `/api/zipdeploy/` endpoint of the Kudu site. For more information on this API, please see [this documentation](https://docs.microsoft.com/azure/app-service/deploy-zip#rest).
2829

2930
Do not deploy your .war using FTP. The FTP tool is designed to upload startup scripts, dependencies, or other runtime files. It is not the optimal choice for deploying web apps.
3031

@@ -283,6 +284,10 @@ To edit Tomcat's `server.xml` or other configuration files, first take a note of
283284
284285
Finally, restart your App Service. Your deployments should go to `D:\home\site\wwwroot\webapps` just as before.
285286
287+
## Configure Java SE
288+
289+
When running a .JAR application on Java SE on Windows, `server.port` is passed as a command line option as your application starts. You can manually resolve the HTTP port from the environment variable, `HTTP_PLATFORM_PORT`. The value of this environment variable will be the HTTP port your application should listen on.
290+
286291
## Java runtime statement of support
287292
288293
### JDK versions and maintenance
@@ -297,6 +302,8 @@ Supported JDKs are automatically patched on a quarterly basis in January, April,
297302

298303
Patches and fixes for major security vulnerabilities will be released as soon as they become available from Azul Systems. A "major" vulnerability is defined by a base score of 9.0 or higher on the [NIST Common Vulnerability Scoring System, version 2](https://nvd.nist.gov/cvss.cfm).
299304

305+
Tomcat 8.0 has reached [End of Life (EOL) as of September 30, 2018](https://tomcat.apache.org/tomcat-80-eol.html). While the runtime is still avialable on Azure App Service, Azure will not apply security updates to Tomcat 8.0. If possible, migrate your applications to Tomcat 8.5 or 9.0. Both Tomcat 8.5 and 9.0 are available on Azure App Service. See the [official Tomcat site](https://tomcat.apache.org/whichversion.html) for more information.
306+
300307
### Deprecation and retirement
301308

302309
If a supported Java runtime will be retired, Azure developers using the affected runtime will be given a deprecation notice at least six months before the runtime is retired.

articles/azure-monitor/insights/container-insights-livedata-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The Azure portal prompts you to validate your login credentials for an Azure Act
4444
4545
## Using clusterMonitoringUser with RBAC-enabled clusters
4646

47-
To eliminate the need to apply additional configuration changes to allow the Kubernetes user rule binding **clusterUser** access to the Live Data (preview) feature after [enabling RBAC](#configure-kubernetes-rbac-authorization) authorization, AKS has added a new Kubernetes cluster role binding called **clusterMonitoringUser**. This cluster role binding has all the necessary permissions out-of-the-box to access the Kubernetes API and the endpoints for utilizing the Live Data (preview) feature.
47+
To eliminate the need to apply additional configuration changes to allow the Kubernetes user role binding **clusterUser** access to the Live Data (preview) feature after [enabling RBAC](#configure-kubernetes-rbac-authorization) authorization, AKS has added a new Kubernetes cluster role binding called **clusterMonitoringUser**. This cluster role binding has all the necessary permissions out-of-the-box to access the Kubernetes API and the endpoints for utilizing the Live Data (preview) feature.
4848

4949
In order to utilize the Live Data (preview) feature with this new user, you need to be a member of the [Contributor](../../role-based-access-control/built-in-roles.md#contributor) role on the AKS cluster resource. Azure Monitor for containers, when enabled, is configured to authenticate using this user by default. If the clusterMonitoringUser role binding does not exist on a cluster, **clusterUser** is used for authentication instead.
5050

articles/azure-resource-manager/templates/error-sku-not-available.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title: SKU not available errors
33
description: Describes how to troubleshoot the SKU not available error when deploying resources with Azure Resource Manager.
44
ms.topic: troubleshooting
5-
ms.date: 10/19/2018
5+
ms.date: 02/18/2020
66
---
77
# Resolve errors for SKU not available
88

9-
This article describes how to resolve the **SkuNotAvailable** error. If you're unable to find a suitable SKU in that region or an alternative region that meets your business needs, submit a [SKU request](https://aka.ms/skurestriction) to Azure Support.
9+
This article describes how to resolve the **SkuNotAvailable** error. If you're unable to find a suitable SKU in that region/zone or an alternative region/zone that meets your business needs, submit a [SKU request](https://aka.ms/skurestriction) to Azure Support.
1010

1111
[!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
1212

@@ -16,7 +16,7 @@ When deploying a resource (typically a virtual machine), you receive the followi
1616

1717
```
1818
Code: SkuNotAvailable
19-
Message: The requested tier for resource '<resource>' is currently not available in location '<location>'
19+
Message: The requested tier for resource '<resource>' is currently not available in location '<location>'
2020
for subscription '<subscriptionID>'. Please try another tier or deploy to a different location.
2121
```
2222

@@ -28,7 +28,7 @@ If you are deploying an Azure Spot VM or Spot scale set instance, there isn't an
2828

2929
## Solution 1 - PowerShell
3030

31-
To determine which SKUs are available in a region, use the [Get-AzComputeResourceSku](/powershell/module/az.compute/get-azcomputeresourcesku) command. Filter the results by location. You must have the latest version of PowerShell for this command.
31+
To determine which SKUs are available in a region/zone, use the [Get-AzComputeResourceSku](/powershell/module/az.compute/get-azcomputeresourcesku) command. Filter the results by location. You must have the latest version of PowerShell for this command.
3232

3333
```azurepowershell-interactive
3434
Get-AzComputeResourceSku | where {$_.Locations -icontains "centralus"}
@@ -37,13 +37,23 @@ Get-AzComputeResourceSku | where {$_.Locations -icontains "centralus"}
3737
The results include a list of SKUs for the location and any restrictions for that SKU. Notice that a SKU might be listed as `NotAvailableForSubscription`.
3838

3939
```powershell
40-
ResourceType Name Locations Restriction Capability Value
41-
------------ ---- --------- ----------- ---------- -----
42-
virtualMachines Standard_A0 centralus NotAvailableForSubscription MaxResourceVolumeMB 20480
43-
virtualMachines Standard_A1 centralus NotAvailableForSubscription MaxResourceVolumeMB 71680
44-
virtualMachines Standard_A2 centralus NotAvailableForSubscription MaxResourceVolumeMB 138240
40+
ResourceType Name Locations Zone Restriction Capability Value
41+
------------ ---- --------- ---- ----------- ---------- -----
42+
virtualMachines Standard_A0 centralus NotAvailableForSubscription MaxResourceVolumeMB 20480
43+
virtualMachines Standard_A1 centralus NotAvailableForSubscription MaxResourceVolumeMB 71680
44+
virtualMachines Standard_A2 centralus NotAvailableForSubscription MaxResourceVolumeMB 138240
45+
virtualMachines Standard_D1_v2 centralus {2, 1, 3} MaxResourceVolumeMB
4546
```
4647

48+
Some additional samples:
49+
50+
```azurepowershell-interactive
51+
Get-AzComputeResourceSku | where {$_.Locations.Contains("centralus") -and $_.ResourceType.Contains("virtualMachines") -and $_.Name.Contains("Standard_DS14_v2")}
52+
Get-AzComputeResourceSku | where {$_.Locations.Contains("centralus") -and $_.ResourceType.Contains("virtualMachines") -and $_.Name.Contains("v3")} | fc
53+
```
54+
55+
Appending “fc” at the end returns more details.
56+
4757
## Solution 2 - Azure CLI
4858

4959
To determine which SKUs are available in a region, use the `az vm list-skus` command. Use the `--location` parameter to filter output to location you are using. Use the `--size` parameter to search by a partial size name.

articles/cosmos-db/concepts-limits.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ Cosmos DB automatically takes backups of your data at regular intervals. For det
7272
| Resource | Default limit |
7373
| --- | --- |
7474
| Maximum number of databases | Unlimited |
75-
| Maximum number of containers that can be provisioned in a database with shared throughput |25 |
75+
| Maximum number of containers per database with shared throughput |25 |
76+
| Maximum number of containers per database or account with dedicated throughput |unlimited |
7677
| Maximum number of regions | No limit (All Azure regions) |
7778

7879
## Per-container limits
@@ -98,7 +99,7 @@ Depending on which API you use, an Azure Cosmos item can represent either a docu
9899
| --- | --- |
99100
| Maximum size of an item | 2 MB (UTF-8 length of JSON representation) |
100101
| Maximum length of partition key value | 2048 bytes |
101-
| Maximum length of id value | 1024 bytes |
102+
| Maximum length of id value | 1023 bytes |
102103
| Maximum number of properties per item | No practical limit |
103104
| Maximum nesting depth | No practical limit |
104105
| Maximum length of property name | No practical limit |

articles/cosmos-db/faq.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,13 @@ To fix an issue with your account, file a [support request](https://ms.portal.az
7373

7474
## <a id="try-cosmos-db"></a>Try Azure Cosmos DB subscriptions
7575

76-
You can now enjoy a time-limited Azure Cosmos DB experience without a subscription, free of charge and commitments. To sign up for a Try Azure Cosmos DB subscription, go to [Try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/). This subscription is separate from the [Azure Free Trial](https://azure.microsoft.com/free/), and can be used along with an Azure Free Trial or an Azure paid subscription.
76+
You can now enjoy a time-limited Azure Cosmos DB experience without a subscription, free of charge and commitments. To sign up for a Try Azure Cosmos DB subscription, go to [Try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/) and use any personal Microsoft account (MSA). This subscription is separate from the [Azure Free Trial](https://azure.microsoft.com/free/), and can be used along with an Azure Free Trial or an Azure paid subscription.
7777

7878
Try Azure Cosmos DB subscriptions appear in the Azure portal next other subscriptions associated with your user ID.
7979

8080
The following conditions apply to Try Azure Cosmos DB subscriptions:
8181

82+
* Account access can be granted to personal Microsoft accounts (MSA). Avoid using Active Directory (AAD) accounts or accounts belonging to corporate AAD Tenants, they might have limitations in place that could block access granting.
8283
* One [throughput provisioned container](./set-throughput.md#set-throughput-on-a-container) per subscription for SQL, Gremlin API, and Table accounts.
8384
* Up to three [throughput provisioned collections](./set-throughput.md#set-throughput-on-a-container) per subscription for MongoDB accounts.
8485
* One [throughput provisioned database](./set-throughput.md#set-throughput-on-a-database) per subscription. Throughput provisioned databases can contain any number of containers inside.

articles/data-factory/data-flow-tutorials.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,5 @@ As updates are constantly made to the product, some features have added or diffe
133133
## Data flow expressions
134134

135135
[Date/Time expressions](https://www.youtube.com/watch?v=uboyCZ25r_E&feature=youtu.be&hd=1)
136+
137+
[Splitting Arrays and Case Statement](https://www.youtube.com/watch?v=DHNH8ZO7YjI)

articles/event-hubs/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
href: event-hubs-python-get-started-send.md
5151
- name: JavaScript (azure/event-hubs version 2)
5252
href: event-hubs-node-get-started-send.md
53-
- name: .NET Framework (Microsoft.Azure.EventHubs)
53+
- name: .NET Framework (Microsoft.ServiceBus)
5454
href: event-hubs-dotnet-framework-getstarted-send.md
5555
- name: Capture events
5656
items:

articles/firewall/firewall-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: firewall
55
author: vhorne
66
ms.service: firewall
77
ms.topic: conceptual
8-
ms.date: 01/29/2020
8+
ms.date: 02/18/2020
99
ms.author: victorh
1010
---
1111

@@ -161,7 +161,7 @@ No. Azure Firewall doesn't need a subnet bigger than /26.
161161

162162
## How can I increase my firewall throughput?
163163

164-
Azure Firewall's initial throughput capacity is 2.5 - 3 Gbps. Currently, scale out is based on CPU usage only. In some cases, a firewall with network rules only won't scale up to increase throughput because the network rules don't significantly impact CPU usage. If you need higher throughput for your firewall, contact Support to increase your firewall's initial throughput capacity.
164+
Azure Firewall's initial throughput capacity is 2.5 - 3 Gbps. Currently, scale out is based on CPU usage and throughput. In some cases, a firewall with network rules only won't scale up to increase throughput because the network rules don't significantly impact CPU usage. If you need higher throughput for your firewall, contact Support to increase your firewall's initial throughput capacity.
165165

166166
## How long does it take for Azure Firewall to scale out?
167167

articles/iot-hub/quickstart-device-streams-echo-c.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ For this quickstart, you use the [Azure IoT device SDK for C](iot-hub-device-sdk
109109
110110
## Create an IoT hub
111111
112-
[!INCLUDE [iot-hub-include-create-hub-device-streams](../../includes/iot-hub-include-create-hub-device-streams.md)]
112+
[!INCLUDE [iot-hub-include-create-hub](../../includes/iot-hub-include-create-hub.md)]
113113
114114
## Register a device
115115

articles/iot-hub/quickstart-device-streams-echo-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you don’t have an Azure subscription, create a [free account](https://azure
4949
5050
## Create an IoT hub
5151
52-
[!INCLUDE [iot-hub-include-create-hub-device-streams](../../includes/iot-hub-include-create-hub-device-streams.md)]
52+
[!INCLUDE [iot-hub-include-create-hub](../../includes/iot-hub-include-create-hub.md)]
5353
5454
## Register a device
5555

0 commit comments

Comments
 (0)