Skip to content

Commit d53bdae

Browse files
wsilveiranzwsilveiranz
authored
Merge branch 'MicrosoftDocs:main' into wsilveiranz-patch-SBConn-Standard
2 parents 4c3151e + ddab9c8 commit d53bdae

File tree

140 files changed

+1388
-1036
lines changed

Some content is hidden

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

140 files changed

+1388
-1036
lines changed

‎.github/policies/disallow-edits.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: GitOps.PullRequestIssueManagement primitive
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Close PRs that contain content for services that have been migrated out of the azure-docs-pr repository.
9+
if:
10+
- payloadType: Pull_Request
11+
- isAction:
12+
action: Opened
13+
- or:
14+
- filesMatchPattern:
15+
pattern: articles/aks/*
16+
- filesMatchPattern:
17+
pattern: articles/defender-for-cloud/*
18+
- filesMatchPattern:
19+
pattern: articles/attestation/*
20+
- filesMatchPattern:
21+
pattern: articles/confidential-ledger/*
22+
- filesMatchPattern:
23+
pattern: articles/dedicated-hsm/*
24+
- filesMatchPattern:
25+
pattern: articles/key-vault/*
26+
- filesMatchPattern:
27+
pattern: articles/payment-hsm/*
28+
- filesMatchPattern:
29+
pattern: articles/postgresql/*
30+
- filesMatchPattern:
31+
pattern: articles/cosmos-db/*
32+
- filesMatchPattern:
33+
pattern: articles/dms/*
34+
- filesMatchPattern:
35+
pattern: articles/mariadb/*
36+
- filesMatchPattern:
37+
pattern: articles/mysql/*
38+
- filesMatchPattern:
39+
pattern: articles/managed-instance-apache-cassandra/*
40+
- filesMatchPattern:
41+
pattern: articles/virtual-machines/*
42+
- filesMatchPattern:
43+
pattern: articles/virtual-machines-scale-sets/*
44+
- filesMatchPattern:
45+
pattern: articles/container-instances/*
46+
- filesMatchPattern:
47+
pattern: articles/service-fabric/*
48+
- filesMatchPattern:
49+
pattern: articles/machine-learning/*
50+
- filesMatchPattern:
51+
pattern: articles/ai-studio/*
52+
- filesMatchPattern:
53+
pattern: articles/ai-services/*
54+
- filesMatchPattern:
55+
pattern: articles/genomics/*
56+
- filesMatchPattern:
57+
pattern: articles/open-datasets/*
58+
- filesMatchPattern:
59+
pattern: articles/search/*
60+
- filesMatchPattern:
61+
pattern: articles/azure-monitor/*
62+
- filesMatchPattern:
63+
pattern: articles/advisor/*
64+
- filesMatchPattern:
65+
pattern: articles/chaos-studio/*
66+
- filesMatchPattern:
67+
pattern: articles/service-health/*
68+
- filesMatchPattern:
69+
pattern: articles/azure-arc/*
70+
- filesMatchPattern:
71+
pattern: articles/azure-linux/*
72+
- filesMatchPattern:
73+
pattern: articles/azure-portal/*
74+
- filesMatchPattern:
75+
pattern: articles/copilot/*
76+
- filesMatchPattern:
77+
pattern: articles/lighthouse/*
78+
- filesMatchPattern:
79+
pattern: articles/quotas/*
80+
- filesMatchPattern:
81+
pattern: articles/container-registry/*
82+
- filesMatchPattern:
83+
pattern: articles/kubernetes-fleet/*
84+
then:
85+
- addReply:
86+
reply: >-
87+
@${issueAuthor} - You tried to add content to a folder path that has been removed from this repository. Your pull request will be automatically closed. Submit your changes to the updated repository, which can be identified by clicking the Edit this Document link at the top of any published article for that product or service.
88+
- closePullRequest
89+

‎.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,6 @@
254254
"branch": "main",
255255
"branch_mapping": {}
256256
},
257-
{
258-
"path_to_root": "azure-reference-other-repo",
259-
"url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
260-
"branch": "main",
261-
"branch_mapping": {}
262-
},
263257
{
264258
"path_to_root": "azure-sdk-for-go-samples",
265259
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",

‎articles/api-management/quota-by-key-policy.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: article
9-
ms.date: 07/23/2024
9+
ms.date: 09/16/2024
1010
ms.author: danlep
1111
---
1212
# Set usage quota by key
@@ -29,6 +29,7 @@ To understand the difference between rate limits and quotas, [see Rate limits an
2929
bandwidth="kilobytes"
3030
renewal-period="seconds"
3131
increment-condition="condition"
32+
increment-count="number"
3233
counter-key="key value"
3334
first-period-start="date-time" />
3435
```
@@ -41,6 +42,7 @@ To understand the difference between rate limits and quotas, [see Rate limits an
4142
| calls | The maximum total number of calls allowed during the time interval specified in the `renewal-period`. Policy expressions aren't allowed. | Either `calls`, `bandwidth`, or both together must be specified. | N/A |
4243
| counter-key | The key to use for the `quota policy`. For each key value, a single counter is used for all scopes at which the policy is configured. Policy expressions are allowed. | Yes | N/A |
4344
| increment-condition | The Boolean expression specifying if the request should be counted towards the quota (`true`). Policy expressions are allowed. | No | N/A |
45+
| increment-count | The number by which the counter is increased per request. Policy expressions are allowed. | No | 1 |
4446
| renewal-period | The length in seconds of the fixed window after which the quota resets. The start of each period is calculated relative to `first-period-start`. Minimum period: 300 seconds. When `renewal-period` is set to 0, the period is set to infinite. Policy expressions aren't allowed. | Yes | N/A |
4547
| first-period-start | The starting date and time for quota renewal periods, in the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard. Policy expressions aren't allowed. | No | `0001-01-01T00:00:00Z` |
4648

‎articles/api-management/sap-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ Also, configure authentication to your backend using an appropriate method for y
139139

140140
## Production considerations
141141

142-
* See an [example end-to-end scenario](https://blogs.sap.com/2021/08/12/.net-speaks-odata-too-how-to-implement-azure-app-service-with-sap-odata-gateway/) to integrate API Management with an SAP gateway.
143-
* Control access to an SAP backend using API Management policies. For example, if the API is imported as an OData API, use the [validate OData request](validate-odata-request-policy.md) policy. See also policy snippets for [SAP principal propagation](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Request%20OAuth2%20access%20token%20from%20SAP%20using%20AAD%20JWT%20token.xml) and [fetching an X-CSRF token](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Get%20X-CSRF%20token%20from%20SAP%20gateway%20using%20send%20request.policy.xml).
142+
* See an [example end-to-end scenario](https://community.powerplatform.com/blogs/post/?postid=c6a609ab-3556-ef11-a317-6045bda95bf0) to integrate API Management with an SAP gateway.
143+
* Control access to an SAP backend using API Management policies. For example, if the API is imported as an OData API, use the [validate OData request](validate-odata-request-policy.md) policy. See also policy snippets for [SAP principal propagation for SAP ECC or S/4HANA](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Request%20OAuth2%20access%20token%20from%20SAP%20using%20AAD%20JWT%20token.xml) or [SAP SuccessFactors](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Request%20OAuth2%20access%20token%20from%20SuccessFactors%20using%20AAD%20JWT%20token.xml) and [fetching an X-CSRF token](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Get%20X-CSRF%20token%20from%20SAP%20gateway%20using%20send%20request.policy.xml).
144144
* For guidance to deploy, manage, and migrate APIs at scale, see:
145145
* [Automated API deployments with APIOps](/azure/architecture/example-scenario/devops/automated-api-deployments-apiops)
146146
* [CI/CD for API Management using Azure Resource Manager templates](devops-api-development-templates.md).

‎articles/api-management/xml-to-json-policy.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: article
9-
ms.date: 07/23/2024
9+
ms.date: 09/06/2024
1010
ms.author: danlep
1111
---
1212

@@ -21,7 +21,7 @@ The `xml-to-json` policy converts a request or response body from XML to JSON. T
2121
## Policy statement
2222

2323
```xml
24-
<xml-to-json kind="javascript-friendly | direct" apply="always | content-type-xml" consider-accept-header="true | false"/>
24+
<xml-to-json kind="javascript-friendly | direct" apply="always | content-type-xml" consider-accept-header="true | false" always-array-children="true | false"/>
2525
```
2626

2727

@@ -32,6 +32,7 @@ The `xml-to-json` policy converts a request or response body from XML to JSON. T
3232
|kind|The attribute must be set to one of the following values.<br /><br /> - `javascript-friendly` - the converted JSON has a form friendly to JavaScript developers.<br />- `direct` - the converted JSON reflects the original XML document's structure.<br/><br/>Policy expressions are allowed.|Yes|N/A|
3333
|apply|The attribute must be set to one of the following values.<br /><br /> - `always` - convert always.<br />- `content-type-xml` - convert only if response Content-Type header indicates presence of XML.<br/><br/>Policy expressions are allowed.|Yes|N/A|
3434
|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> - `true` - apply conversion if JSON is requested in request Accept header.<br />- `false` -always apply conversion.<br/><br/>Policy expressions are allowed.|No|`true`|
35+
|always-array-children|The attribute must be set to one of the following values.<br /><br /> - `true` - Always convert child elements into a JSON array.<br />- `false` - Only convert multiple child elements into a JSON array. Convert a single child element into a JSON object.<br/><br/>Policy expressions are allowed.|No|`false`|
3536

3637
## Usage
3738

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can use Azure Policy to help audit your resources when it comes to minimum T
4545

4646
### Minimum TLS Version and SCM Minimum TLS Version
4747

48-
App Service also allows you to set minimum TLS version for incoming requests to your web app and to SCM site. By default, the minimum TLS version for incoming requests to your web app and to SCM would be set to 1.2 on both portal and API.
48+
App Service also allows you to set minimum TLS version for incoming requests to your web app and to SCM site. By default, the minimum TLS version for incoming requests to your web app and to SCM is set to 1.2 on both portal and API.
4949

5050
### TLS 1.3
5151
A [Minimum TLS Cipher Suite](#minimum-tls-cipher-suite-preview) setting is available with TLS 1.3. This includes two cipher suites at the top of the cipher suite order:
@@ -54,12 +54,12 @@ A [Minimum TLS Cipher Suite](#minimum-tls-cipher-suite-preview) setting is avail
5454

5555
### TLS 1.0 and 1.1
5656

57-
TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. It's generally recommended for customers to use TLS 1.2 or above as the minimum TLS version. When creating a web app, the default minimum TLS version would be TLS 1.2.
57+
TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. It's generally recommended for customers to use TLS 1.2 or above as the minimum TLS version. When creating a web app, the default minimum TLS version is TLS 1.2.
5858

5959
To ensure backward compatibility for TLS 1.0 and TLS 1.1, App Service will continue to support TLS 1.0 and 1.1 for incoming requests to your web app. However, since the default minimum TLS version is set to TLS 1.2, you need to update the minimum TLS version configurations on your web app to either TLS 1.0 or 1.1 so the requests won't be rejected.
6060

6161
> [!IMPORTANT]
62-
> Incoming requests to web apps and incoming requests to Azure are treated differently. App Service will continue to support TLS 1.0 and 1.1 for incoming requests to the web apps. For incoming requests directly to Azure, for example through ARM or API, it's not recommended to use TLS 1.0 or 1.1.
62+
> Incoming requests to web apps and incoming requests to Azure are treated differently. App Service will continue to support TLS 1.0 and 1.1 for incoming requests to the web apps. For incoming requests directly to the Azure control plane, for example through ARM or API calls, it is not recommended to use TLS 1.0 or 1.1.
6363
>
6464
6565
## Minimum TLS cipher suite (preview)

‎articles/application-gateway/for-containers/alb-controller-backend-health-metrics.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: ALB Controller - Backend Health and Metrics
33
description: Identify and troubleshoot issues using ALB Controller's backend health & metrics endpoints for Application Gateway for Containers.
44
services: application-gateway
55
author: greglin
6-
ms.service: azure-application-gateway
7-
ms.subservice: appgw-for-containers
6+
ms.service: azure-appgw-for-containers
87
ms.topic: concept-article
98
ms.date: 06/03/2024
109
ms.author: greglin

‎articles/application-gateway/for-containers/alb-controller-release-notes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: Release notes for ALB Controller
33
description: This article lists updates made to the Application Gateway for Containers ALB Controller.
44
services: application-gateway
55
author: greglin
6-
ms.service: azure-application-gateway
7-
ms.subservice: appgw-for-containers
6+
ms.service: azure-appgw-for-containers
87
ms.topic: release-notes
98
ms.date: 5/9/2024
109
ms.author: greglin

‎articles/application-gateway/for-containers/api-specification-kubernetes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ title: Application Gateway for Containers API Specification for Kubernetes
44
description: This article provides documentation for Application Gateway for Containers' API specification for Kubernetes.
55
services: application-gateway
66
author: greglin
7-
ms.service: azure-application-gateway
8-
ms.subservice: appgw-for-containers
7+
ms.service: azure-appgw-for-containers
98
ms.topic: conceptual
109
ms.date: 9/16/2024
1110
ms.author: greglin

‎articles/application-gateway/for-containers/application-gateway-for-containers-components.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ title: Application Gateway for Containers components
33
description: This article provides information about how Application Gateway for Containers accepts incoming requests and routes them to a backend target.
44
services: application-gateway
55
author: greglin
6-
ms.service: azure-application-gateway
7-
ms.subservice: appgw-for-containers
6+
ms.service: azure-appgw-for-containers
87
ms.topic: conceptual
98
ms.date: 5/9/2024
109
ms.author: greglin

0 commit comments

Comments
 (0)