Skip to content

Commit f2211e8

Browse files
committed
Merge branch 'main' of https://github.com/anaharris-ms/azure-docs-pr into rel-china-redirect
2 parents 283d6cf + 1522861 commit f2211e8

File tree

2,892 files changed

+28400
-19300
lines changed

Some content is hidden

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

2,892 files changed

+28400
-19300
lines changed

.github/policies/disallow-edits.yml

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ configuration:
1010
- payloadType: Pull_Request
1111
- isAction:
1212
action: Opened
13-
- or:
13+
- or:
1414
- filesMatchPattern:
1515
matchAny: true
1616
pattern: articles/aks/*
@@ -121,4 +121,74 @@ configuration:
121121
reply: >-
122122
@${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.
123123
- closePullRequest
124+
125+
- description: Alert authors to edits in the /articles/reliability folder.
126+
if:
127+
# If a PR in the articles/reliability folder is opened, and the PR author isn't Anastasia or John...
128+
- payloadType: Pull_Request
129+
- filesMatchPattern:
130+
matchAny: true
131+
pattern: articles/reliability/*
132+
- isAction:
133+
action: Opened
134+
- not:
135+
or:
136+
- isActivitySender:
137+
user: anaharris-ms
138+
- isActivitySender:
139+
user: johndowns
140+
then:
141+
# Mention Anastasia and John, add a reply asking the PR author not to sign off on the PR, and add the needs-human-review label.
142+
- mentionUsers:
143+
mentionees:
144+
- anaharris-ms
145+
- johndowns
146+
replyTemplate: >-
147+
Tagging authors for this folder: ${mentionees}
148+
- addReply:
149+
reply: >-
150+
@${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
151+
- addLabel:
152+
label: needs-human-review
153+
154+
- description: Disallow sign-off for articles in the /articles/reliability folder.
155+
if:
156+
# If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
157+
- payloadType: Issue_Comment
158+
- isPullRequest
159+
- filesMatchPattern:
160+
matchAny: true
161+
pattern: articles/reliability/*
162+
- commentContains:
163+
pattern: \#sign-off
164+
isRegex: false
165+
- not:
166+
or:
167+
- isActivitySender:
168+
user: anaharris-ms
169+
- isActivitySender:
170+
user: johndowns
171+
then:
172+
# Add the do-not-merge label, remove the ready-to-merge label, and add a reply asking the PR author not to sign off on the PR.
173+
- addReply:
174+
reply: >-
175+
@${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
176+
- addLabel:
177+
label: do-not-merge
178+
- removeLabel:
179+
label: ready-to-merge
180+
181+
- description: Write a message if the breadcrumb file is modified in the azure-docs-pr repository.
182+
if:
183+
- payloadType: Pull_Request
184+
- isAction:
185+
action: Opened
186+
- filesMatchPattern:
187+
matchAny: true
188+
pattern: bread/*
189+
190+
then:
191+
- addReply:
192+
reply: >-
193+
@${issueAuthor} - This PR modifies the breadcrumb file for the entire repository: bread/toc.yml. This file supports the on-site navigation for 100s of services. Please make sure your changes to the breadcrumb file are intentional. Do not delete this file.
124194

.github/workflows/stale.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Mark stale pull requests
2+
3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "0 */6 * * *"
10+
11+
jobs:
12+
stale:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/stale@v3
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
days-before-pr-stale: 14
21+
days-before-pr-close: 90
22+
stale-pr-label: inactive
23+
close-pr-label: auto-close
24+
exempt-pr-labels: keep-open
25+
operations-per-run: 1300
26+
ascending: false
27+
# start-date: '2021-03-19'
28+
stale-pr-message: >
29+
This pull request has been inactive for at least 14 days.
30+
31+
If you are finished with your changes, don't forget to sign off. See the [platform guide](https://review.learn.microsoft.com/help/platform/prmerger-hashtag-commands?branch=main) for instructions.
32+
33+
[Get Help](https://review.learn.microsoft.com/help/platform/help-options?branch=main)
34+
35+
[Learn Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
36+
37+
[Resolve Merge Conflicts](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
38+
close-pr-message: >
39+
This pull request has been inactive for 90 days, and an `auto-close` label has been added. At this time, the system is closing the PR automatically. If you decide to continue working on your changes, scroll to the bottom of the pull request comments and select the **Reopen pull request** button.
40+
<br/>

.openpublishing.redirection.json

Lines changed: 81 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/databox-online/azure-stack-edge-gpu-deploy-sample-module-marketplace.md",
5+
"redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?page=1",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/partner-solutions/logzio/create.md",
510
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/create",
@@ -23,7 +28,47 @@
2328
{
2429
"source_path": "articles/partner-solutions/logzio/troubleshoot.md",
2530
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
26-
"redirect_document_id": false
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/hdinsight-aks/index.yml",
35+
"redirect_url": "/previous-versions/azure/hdinsight-aks",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/hdinsight-aks/flink/index.md",
40+
"redirect_url": "/previous-versions/azure/hdinsight-aks/flink/flink-overview",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/hdinsight-aks/prerequisites-subscription.md",
45+
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-subscription",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/hdinsight-aks/release-notes/index.md",
50+
"redirect_url": "/previous-versions/azure/hdinsight-aks/release-notes/hdinsight-aks-release-notes",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/hdinsight-aks/prerequisites-resources.md",
55+
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-resources",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/hdinsight-aks/spark/index.md",
60+
"redirect_url": "/previous-versions/azure/hdinsight-aks/spark/hdinsight-on-aks-spark-overview",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/hdinsight-aks/get-started.md",
65+
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-get-started",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/hdinsight-aks/trino/index.md",
70+
"redirect_url": "/previous-versions/azure/hdinsight-aks/trino/trino-overview ",
71+
"redirect_document_id": false
2772
},
2873
{
2974
"source_path": "articles/hdinsight-aks/cluster-storage.md",
@@ -993,7 +1038,7 @@
9931038
{
9941039
"source_path": "articles/defender-for-iot/organizations/legacy-central-management/how-to-troubleshoot-on-premises-management-console.md",
9951040
"redirect_url": "/previous-versions/azure/defender-for-iot/organizations/legacy-central-management/how-to-troubleshoot-on-premises-management-console",
996-
"redirect_document_id": false
1041+
"redirect_document_id": false
9971042
},
9981043
{
9991044
"source_path": "articles/defender-for-iot/organizations/legacy-central-management/legacy-air-gapped-deploy.md",
@@ -1485,7 +1530,7 @@
14851530
"redirect_url": "/previous-versions/azure/partner-solutions/split-experimentation/troubleshoot",
14861531
"redirect_document_id": false
14871532
},
1488-
{
1533+
{
14891534
"source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/classic-retirement.md",
14901535
"redirect_url": "/previous-versions/azure/virtual-desktop-classic/classic-retirement",
14911536
"redirect_document_id": false
@@ -2994,7 +3039,8 @@
29943039
"source_path_from_root": "/articles/ddos-protection/telemetry-monitoring-alerting.md",
29953040
"redirect_url": "/azure/ddos-protection/telemetry",
29963041
"redirect_document_id": false
2997-
}, {
3042+
},
3043+
{
29983044
"source_path_from_root": "/articles/ddos-protection/telemetry.md",
29993045
"redirect_url": "/azure/ddos-protection/monitor-ddos-protection",
30003046
"redirect_document_id": false
@@ -3288,7 +3334,7 @@
32883334
"source_path_from_root": "/articles/dns/dns-alerts-metrics.md",
32893335
"redirect_url": "/azure/dns/monitor-dns",
32903336
"redirect_document_id": false
3291-
},
3337+
},
32923338
{
32933339
"source_path_from_root": "/articles/docker/index.yml",
32943340
"redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
@@ -5199,6 +5245,11 @@
51995245
"redirect_url": "/azure/virtual-wan/virtual-wan-about",
52005246
"redirect_document_id": false
52015247
},
5248+
{
5249+
"source_path_from_root": "/articles/virtual-wan/openvpn-azure-ad-client.md",
5250+
"redirect_url": "/azure/virtual-wan/point-to-site-entra-vpn-client-windows",
5251+
"redirect_document_id": false
5252+
},
52025253
{
52035254
"source_path_from_root": "/articles/virtual-wan/high-availability-vpn-client.md",
52045255
"redirect_url": "/azure/virtual-wan/global-hub-profile",
@@ -5214,6 +5265,11 @@
52145265
"redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
52155266
"redirect_document_id": false
52165267
},
5268+
{
5269+
"source_path_from_root": "/articles/virtual-wan/openvpn-azure-ad-client-mac.md",
5270+
"redirect_url": "/azure/virtual-wan/point-to-site-entra-vpn-client-mac",
5271+
"redirect_document_id": false
5272+
},
52175273
{
52185274
"source_path_from_root": "/articles/virtual-wan/monitoring-best-practices.md",
52195275
"redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
@@ -5653,8 +5709,8 @@
56535709
"source_path_from_root": "/articles/defender-for-iot/device-builders/defender-iot-firmware-analysis-rbac.md",
56545710
"redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
56555711
"redirect_document_id": false
5656-
},
5657-
{
5712+
},
5713+
{
56585714
"source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-portal.md",
56595715
"redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
56605716
"redirect_document_id": false
@@ -5708,7 +5764,7 @@
57085764
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-powershell.md",
57095765
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
57105766
"redirect_document_id": false
5711-
},
5767+
},
57125768
{
57135769
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
57145770
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
@@ -5817,7 +5873,7 @@
58175873
{
58185874
"source_path": "articles/virtual-desktop/troubleshoot-management-issues.md",
58195875
"redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-management-issues",
5820-
"redirect_document_id": false
5876+
"redirect_document_id": false
58215877
},
58225878
{
58235879
"source_path": "articles/virtual-desktop/troubleshoot-multimedia-redirection.md",
@@ -5883,6 +5939,21 @@
58835939
"source_path_from_root": "/articles/reliability/sovereign-cloud-china.md",
58845940
"redirect_url": "/azure/china/concepts-service-availability",
58855941
"redirect_document_id": false
5942+
},
5943+
{
5944+
"source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
5945+
"redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
5946+
"redirect_document_id": false
5947+
},
5948+
{
5949+
"source_path_from_root": "/articles/managed-grafana/how-to-share-grafana-workspace.md",
5950+
"redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
5951+
"redirect_document_id": false
5952+
},
5953+
{
5954+
"source_path": "articles/sentinel/resources.md",
5955+
"redirect_url": "/azure/sentinel/overview",
5956+
"redirect_document_id": false
58865957
}
58875958
]
5888-
}
5959+
}

articles/active-directory-b2c/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: azure-active-directory
99

1010
ms.topic: concept-article
11-
ms.date: 01/11/2024
11+
ms.date: 02/17/2025
1212
ms.author: kengaderdus
1313
ms.subservice: b2c
1414

0 commit comments

Comments
 (0)