Skip to content

Commit 8ccbcb9

Browse files
Merge branch 'main' into repo_sync_working_branch
2 parents 5db0d84 + 6fd84ef commit 8ccbcb9

File tree

46 files changed

+665
-283
lines changed

Some content is hidden

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

46 files changed

+665
-283
lines changed

.github/policies/disallow-edits.yml

Lines changed: 74 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -10,129 +10,80 @@ configuration:
1010
- payloadType: Pull_Request
1111
- isAction:
1212
action: Opened
13-
- or:
14-
- includesModifiedFiles:
15-
files:
16-
- articles/aks/*
17-
- includesModifiedFiles:
18-
files:
19-
- articles/defender-for-cloud/*
20-
- includesModifiedFiles:
21-
files:
22-
- articles/attestation/*
23-
- includesModifiedFiles:
24-
files:
25-
- articles/confidential-ledger/*
26-
- includesModifiedFiles:
27-
files:
28-
- articles/dedicated-hsm/*
29-
- includesModifiedFiles:
30-
files:
31-
- articles/key-vault/*
32-
- includesModifiedFiles:
33-
files:
34-
- articles/payment-hsm/*
35-
- includesModifiedFiles:
36-
files:
37-
- articles/postgresql/*
38-
- includesModifiedFiles:
39-
files:
40-
- articles/cosmos-db/*
41-
- includesModifiedFiles:
42-
files:
43-
- articles/dms/*
44-
- includesModifiedFiles:
45-
files:
46-
- articles/mariadb/*
47-
- includesModifiedFiles:
48-
files:
49-
- articles/mysql/*
50-
- includesModifiedFiles:
51-
files:
52-
- articles/managed-instance-apache-cassandra/*
53-
- includesModifiedFiles:
54-
files:
55-
- articles/virtual-machines/*
56-
- includesModifiedFiles:
57-
files:
58-
- articles/virtual-machines-scale-sets/*
59-
- includesModifiedFiles:
60-
files:
61-
- articles/container-instances/*
62-
- includesModifiedFiles:
63-
files:
64-
- articles/service-fabric/*
65-
- includesModifiedFiles:
66-
files:
67-
- articles/machine-learning/*
68-
- includesModifiedFiles:
69-
files:
70-
- articles/ai-studio/*
71-
- includesModifiedFiles:
72-
files:
73-
- articles/ai-services/*
74-
- includesModifiedFiles:
75-
files:
76-
- articles/genomics/*
77-
- includesModifiedFiles:
78-
files:
79-
- articles/open-datasets/*
80-
- includesModifiedFiles:
81-
files:
82-
- articles/search/*
83-
- includesModifiedFiles:
84-
files:
85-
- articles/azure-monitor/*
86-
- includesModifiedFiles:
87-
files:
88-
- articles/advisor/*
89-
- includesModifiedFiles:
90-
files:
91-
- articles/chaos-studio/*
92-
- includesModifiedFiles:
93-
files:
94-
- articles/service-health/*
95-
- includesModifiedFiles:
96-
files:
97-
- articles/azure-arc/*
98-
- includesModifiedFiles:
99-
files:
100-
- articles/azure-linux/*
101-
- includesModifiedFiles:
102-
files:
103-
- articles/azure-portal/*
104-
- includesModifiedFiles:
105-
files:
106-
- articles/copilot/*
107-
- includesModifiedFiles:
108-
files:
109-
- articles/lighthouse/*
110-
- includesModifiedFiles:
111-
files:
112-
- articles/quotas/*
113-
- includesModifiedFiles:
114-
files:
115-
- articles/container-registry/*
116-
- includesModifiedFiles:
117-
files:
118-
- articles/kubernetes-fleet/*
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/*
11984
then:
12085
- addReply:
12186
reply: >-
122-
@${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.
123-
- if:
124-
- or:
125-
- activitySenderHasPermission:
126-
permission: None
127-
- activitySenderHasPermission:
128-
permission: Read
129-
- activitySenderHasPermission:
130-
permission: Write
131-
- activitySenderHasPermission:
132-
permission: Triage
133-
- activitySenderHasPermission:
134-
permission: Maintain
135-
- activitySenderHasPermission:
136-
permission: Admin
137-
then:
138-
- closePullRequest
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/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/batch/monitor-batch-reference.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ See [Monitor Azure Batch](monitor-batch.md) for details on the data you can coll
1919
### Supported metrics for Microsoft.Batch/batchaccounts
2020
The following table lists the metrics available for the Microsoft.Batch/batchaccounts resource type.
2121
[!INCLUDE [horz-monitor-ref-metrics-tableheader](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-tableheader.md)]
22-
[!INCLUDE [Microsoft.Batch/batchaccounts](~/azure-reference-other-repo/azure-monitor-ref/supported-metrics/includes/microsoft-batch-batchaccounts-metrics-include.md)]
22+
[!INCLUDE [Microsoft.Batch/batchaccounts](~/reusable-content/ce-skilling/azure/includes/azure-monitor/reference/metrics/microsoft-batch-batchaccounts-metrics-include.md)]
23+
2324

2425
[!INCLUDE [horz-monitor-ref-metrics-dimensions-intro](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions-intro.md)]
2526

@@ -31,7 +32,7 @@ The following table lists the metrics available for the Microsoft.Batch/batchacc
3132
[!INCLUDE [horz-monitor-ref-resource-logs](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-resource-logs.md)]
3233

3334
### Supported resource logs for Microsoft.Batch/batchaccounts
34-
[!INCLUDE [Microsoft.Batch/batchaccounts](~/azure-reference-other-repo/azure-monitor-ref/supported-logs/includes/microsoft-batch-batchaccounts-logs-include.md)]
35+
[!INCLUDE [Microsoft.Batch/batchaccounts](~/reusable-content/ce-skilling/azure/includes/azure-monitor/reference/logs/microsoft-batch-batchaccounts-logs-include.md)]
3536

3637
### Service log events
3738

articles/container-apps/plans.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,10 @@ You can select from general purpose or specialized compute
3131

3232
Use the Dedicated plan when you need any of the following in a single environment:
3333

34-
- **Secure outbound traffic**: You can assign single outbound network path to systems protected by firewalls or other network appliances.
35-
36-
- **Environment isolation**: Dedicated workload profiles provide access to dedicated hardware with a single tenant guarantee.
34+
- **Compute isolation**: Dedicated workload profiles provide access to dedicated hardware with a single tenant guarantee.
3735

3836
- **Customized compute**: Select from many types and sizes of workload profiles based on your apps requirements. You can deploy many apps to each workload profile. Each workload profile can scale independently as more apps are added or removed or as apps scale their replicas up or down.
3937

40-
41-
- **Cost control**: Traditional serverless compute options optimize for scale in response to events and may not provide cost control options. Dedicated workload profiles let you set minimum and maximum scaling to help you better control costs.
42-
4338
The Dedicated plan can be more cost effective when you're running higher scale deployments with steady throughput.
4439

4540
> [!NOTE]

articles/cost-management-billing/understand/pay-bill.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: lishepar
77
ms.service: cost-management-billing
88
ms.subservice: billing
99
ms.topic: how-to
10-
ms.date: 10/04/2024
10+
ms.date: 10/08/2024
1111
ms.author: banders
1212
---
1313

@@ -116,9 +116,12 @@ Although you can generally use debit cards to pay your Azure bill, consider thes
116116

117117
If the default payment method of your billing profile is wire transfer, follow the payment instructions on your invoice PDF file.
118118

119+
> [!NOTE]
120+
> When you pay your bill by wire transfer, the payment might take up to 10 business days to get processed.
121+
119122
Alternatively, if your invoice is under the threshold amount for your currency, you can make a one-time payment in the Azure portal with a credit or debit card by using **Pay now**. If your invoice amount exceeds the threshold, you can't pay your invoice with a credit or debit card. You'll find the threshold amount for your currency in the Azure portal after you select **Pay now**.
120123

121-
> [!NOTE]
124+
>[!NOTE]
122125
> When multiple invoices are remitted in a single wire transfer, you must specify the invoice numbers for all of the invoices.
123126
124127
### Bank details used to send wire transfer payments

0 commit comments

Comments
 (0)