Skip to content

Commit d3325e1

Browse files
TaojunshenTaojunshen
authored
Merge pull request #284449 from MicrosoftDocs/main
8/12/2024 PM Publish
2 parents 1e73943 + a74e8d8 commit d3325e1

File tree

119 files changed

+8761
-4084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+8761
-4084
lines changed

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4805,6 +4805,11 @@
48054805
"redirect_url": "/azure/vpn-gateway/about-site-to-site-tunneling",
48064806
"redirect_document_id": false
48074807
},
4808+
{
4809+
"source_path_from_root": "/articles/vpn-gateway/openvpn-azure-ad-tenant-multi-app.md",
4810+
"redirect_url": "/azure/vpn-gateway/point-to-site-entra-users-access",
4811+
"redirect_document_id": false
4812+
},
48084813
{
48094814
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-multi-site-to-site-resource-manager-portal.md",
48104815
"redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",

‎.openpublishing.redirection.sentinel.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path": "articles/sentinel/cef-name-mapping.md",
5-
"redirect_url": "/azure/sentinel/cef-syslog-ama-overview",
6-
"redirect_document_id": false
7-
},
83
{
94
"source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
105
"redirect_url": "/azure/sentinel/create-analytics-rule-from-template",

‎articles/ai-services/openai/how-to/batch.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: nitinme
66
ms.service: azure-ai-openai
77
ms.custom:
88
ms.topic: how-to
9-
ms.date: 08/04/2024
9+
ms.date: 08/12/2024
1010
author: mrbullwinkle
1111
ms.author: mbullwin
1212
recommendations: false
@@ -51,8 +51,9 @@ Global batch is currently supported in the following regions:
5151
The following models support global batch:
5252

5353
| Model | Version | Supported |
54-
|---|---|
54+
|---|---|---|
5555
|`gpt-4o` | 2024-05-13 |Yes (text + vision) |
56+
|`gpt-4o-mini` | 2024-07-18 | Yes (text + vision) |
5657
|`gpt-4` | turbo-2024-04-09 | Yes (text only) |
5758
|`gpt-4` | 0613 | Yes |
5859
| `gpt-35-turbo` | 0125 | Yes |

‎articles/ai-services/openai/how-to/deployment-types.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ You can use the following policy to disable access to Azure OpenAI global standa
114114

115115
To learn about creating resources and deploying models refer to the [resource creation guide](./create-resource.md).
116116

117-
## Retrieve batch job output file
118-
119-
120117

121118
## See also
122119

‎articles/ai-services/openai/includes/global-batch-limits.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ The table shows the batch quota limit. Quota values for global batch are represe
2323
|Model|Enterprise agreement|Default| Monthly credit card based subscriptions | MSDN subscriptions | Azure for Students, Free Trials |
2424
|---|---|---|---|---|---|
2525
| `gpt-4o` | 5 B | 50 M | 1.35 M | 90 K | N/A|
26+
| `gpt-4o-mini` | 5 B | 50 M | 1.35 M | 90 K | N/A |
2627
| `gpt-4-turbo` | 300 M | 40 M | 1.35 M | 90 K | N/A |
2728
| `gpt-4` | 150 M | 5 M | 200 K | 100 K | N/A |
2829
| `gpt-35-turbo` | 10 B | 100 M | 5 M | 2 M | 50 K |

‎articles/ai-services/openai/includes/model-matrix/quota.md

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

‎articles/ai-services/openai/includes/model-matrix/standard-gpt-4.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Standard GPT-4 model availability
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 08/01/2024
8+
ms.date: 08/12/2024
99
---
1010

1111
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **vision-preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4o**, **2024-05-13** | **gpt-4o-mini**, **2024-07-18** | **gpt-4-32k**, **0613** |
@@ -23,6 +23,5 @@ ms.date: 08/01/2024
2323
| swedencentral | ✅ | ✅ | - | ✅ | ✅ | ✅ | - | ✅ |
2424
| switzerlandnorth | ✅ | - | - | ✅ | - | - | - | ✅ |
2525
| uksouth | - | ✅ | ✅ | - | - | - | - | - |
26-
| westeurope | - | - | - | - | ✅ | - | - | - |
2726
| westus | - | ✅ | - | ✅ | ✅ | ✅ | - | - |
28-
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - |
27+
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - |

‎articles/ai-services/openai/includes/model-matrix/standard-models.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Quota and limits for Azure OpenAI by region.
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 08/01/2024
8+
ms.date: 08/12/2024
99
---
1010

1111

@@ -26,6 +26,6 @@ ms.date: 08/01/2024
2626
| swedencentral | ✅ | ✅ | - | ✅ | ✅ | ✅ | - | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | - | ✅ | - | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
2727
| switzerlandnorth | ✅ | - | - | ✅ | - | - | - | ✅ | - | ✅ | - | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - | - |
2828
| uksouth | - | ✅ | ✅ | - | - | - | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |
29-
| westeurope | - | - | - | - | ✅ | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | ✅ |
29+
| westeurope | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | ✅ |
3030
| westus | - | ✅ | - | ✅ | ✅ | ✅ | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | - |
31-
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - | - | - | - | - | - | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |
31+
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - | - | - | - | - | - | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |

‎articles/app-service/overview-tls.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@ To ensure backward compatibility for TLS 1.0 and TLS 1.1, App Service will conti
5555
5656
The minimum TLS cipher suite includes a fixed list of cipher suites with an optimal priority order that you cannot change. Reordering or reprioritizing the cipher suites is not recommended as it could expose your web apps to weaker encryption. You also cannot add new or different cipher suites to this list. When you select a minimum cipher suite, the system automatically disables all less secure cipher suites for your web app, without allowing you to selectively disable only some weaker cipher suites.
5757

58-
Follow these steps to change the Minimum TLS cipher suite:
59-
1. Browse to your app in the [Azure portal](https://portal.azure.com/)
60-
1. In the left menu, select **configuration** and then select the **General settings** tab.
61-
1. Under __Minimum Inbound TLS Cipher Suite__, select **change**, and then select the **Minimum TLS Cipher Suite**.
62-
1. Select **Ok**.
63-
1. Select **Save** to save the changes.
64-
6558
### What are cipher suites and how do they work on App Service?
6659

6760
A cipher suite is a set of instructions that contains algorithms and protocols to help secure network connections between clients and servers. By default, the front-end's OS would pick the most secure cipher suite that is supported by both App Service and the client. However, if the client only supports weak cipher suites, then the front-end's OS would end up picking a weak cipher suite that is supported by them both. If your organization has restrictions on what cipher suites should not be allowed, you may update your web app’s minimum TLS cipher suite property to ensure that the weak cipher suites would be disabled for your web app.
@@ -72,13 +65,7 @@ For App Service Environments with `FrontEndSSLCipherSuiteOrder` cluster setting,
7265

7366
## End-to-end TLS Encryption (preview)
7467

75-
End-to-end (E2E) TLS encryption is available in Standard App Service plans and higher. Front-end intra-cluster traffic between App Service front-ends and the workers running application workloads can now be encrypted. Below is a simple diagram to help you understand how it works.
76-
77-
Follow these steps to enable end-to-end TLS encryption:
78-
1. Browse to your app in the [Azure portal](https://portal.azure.com/)
79-
1. In the left menu, select **configuration** and then select the **General settings** tab.
80-
1. Under __End-to-end TLS encryption__, select **on**.
81-
1. Save the changes.
68+
End-to-end (E2E) TLS encryption is available in Standard App Service plans and higher. Front-end intra-cluster traffic between App Service front-ends and the workers running application workloads can now be encrypted.
8269

8370
## Next steps
8471
* [Secure a custom DNS name with a TLS/SSL binding](configure-ssl-bindings.md)

‎articles/application-gateway/for-containers/quickstart-create-application-gateway-for-containers-byo-deployment.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: azure-application-gateway
77
ms.subservice: appgw-for-containers
88
ms.custom: devx-track-azurecli
99
ms.topic: quickstart
10-
ms.date: 02/27/2024
10+
ms.date: 08/12/2024
1111
ms.author: greglin
1212
---
1313

@@ -86,9 +86,6 @@ az network vnet subnet update \
8686
ALB_SUBNET_ID=$(az network vnet subnet list --resource-group $VNET_RESOURCE_GROUP --vnet-name $VNET_NAME --query "[?name=='$ALB_SUBNET_NAME'].id" --output tsv)
8787
echo $ALB_SUBNET_ID
8888
```
89-
90-
> [!NOTE]
91-
> The NSG for the delegated subnet can only use the default rules for incoming traffic. For example: AllowVNetInBound, AllowAzureLoadBalancerInBound, and DenyAllInbound. No other incoming NSG rule is supported.
9289

9390
### Delegate permissions to managed identity
9491

0 commit comments

Comments
 (0)