Skip to content

Commit 9a557a1

Browse files
committed
merge conflicts
2 parents 9ea224d + 5c9563d commit 9a557a1

File tree

11,113 files changed

+16909
-678746
lines changed

Some content is hidden

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

11,113 files changed

+16909
-678746
lines changed

.openpublishing.publish.config.json

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

.openpublishing.redirection.ai-services-from-applied.json

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

.openpublishing.redirection.ai-services-from-cog.json

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

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6893,6 +6893,11 @@
68936893
"source_path_from_root": "/articles/azure-monitor/essentials/private-link-data-ingestion.md",
68946894
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-private-link",
68956895
"redirect_document_id": false
6896+
},
6897+
{
6898+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-custom-metrics.md",
6899+
"redirect_url": "/previous-versions/azure/azure-monitor/containers/container-insights-custom-metrics",
6900+
"redirect_document_id": false
68966901
}
68976902
]
68986903
}

.openpublishing.redirection.json

Lines changed: 243 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,248 @@
11
{
22
"redirections": [
33
{
4-
"source_path": "articles/ai-studio/how-to/commitment-tier.md",
5-
"redirect_url": "/azure/ai-services/commitment-tier.md",
4+
"source_path": "articles/azure-app-configuration/rest-api-postman.md",
5+
"redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-postman",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/azure-app-configuration/rest-api-fiddler.md",
10+
"redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-fiddler",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/kinect-dk/index.yml",
15+
"redirect_url": "/previous-versions/azure/kinect-dk/index",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/kinect-dk/about-azure-kinect-dk.md",
20+
"redirect_url": "/previous-versions/azure/kinect-dk/about-azure-kinect-dk",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/kinect-dk/about-sensor-sdk.md",
25+
"redirect_url": "/previous-versions/azure/kinect-dk/about-sensor-sdk",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/kinect-dk/access-data-body-frame.md",
30+
"redirect_url": "/previous-versions/azure/kinect-dk/access-data-body-frame",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/kinect-dk/access-mics.md",
35+
"redirect_url": "/previous-versions/azure/kinect-dk/access-mics",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/kinect-dk/add-library-to-project.md",
40+
"redirect_url": "/previous-versions/azure/kinect-dk/add-library-to-project",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/kinect-dk/azure-kinect-firmware-tool.md",
45+
"redirect_url": "/previous-versions/azure/kinect-dk/azure-kinect-firmware-tool",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/kinect-dk/azure-kinect-recorder.md",
50+
"redirect_url": "/previous-versions/azure/kinect-dk/azure-kinect-recorder",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/kinect-dk/azure-kinect-viewer.md",
55+
"redirect_url": "/previous-versions/azure/kinect-dk/azure-kinect-viewer",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/kinect-dk/body-index-map.md",
60+
"redirect_url": "/previous-versions/azure/kinect-dk/body-index-map",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/kinect-dk/body-joints.md",
65+
"redirect_url": "/previous-versions/azure/kinect-dk/body-joints",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/kinect-dk/body-sdk-download.md",
70+
"redirect_url": "/previous-versions/azure/kinect-dk/body-sdk-download",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/kinect-dk/body-sdk-setup.md",
75+
"redirect_url": "/previous-versions/azure/kinect-dk/body-sdk-setup",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/kinect-dk/build-first-app.md",
80+
"redirect_url": "/previous-versions/azure/kinect-dk/build-first-app",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/kinect-dk/build-first-body-app.md",
85+
"redirect_url": "/previous-versions/azure/kinect-dk/build-first-body-app",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/kinect-dk/capture-device-synchronization.md",
90+
"redirect_url": "/previous-versions/azure/kinect-dk/capture-device-synchronization",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/kinect-dk/coordinate-systems.md",
95+
"redirect_url": "/previous-versions/azure/kinect-dk/coordinate-systems",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/kinect-dk/depth-camera.md",
100+
"redirect_url": "/previous-versions/azure/kinect-dk/depth-camera",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "articles/kinect-dk/find-then-open-device.md",
105+
"redirect_url": "/previous-versions/azure/kinect-dk/find-then-open-device",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path": "articles/kinect-dk/get-body-tracking-results.md",
110+
"redirect_url": "/previous-versions/azure/kinect-dk/get-body-tracking-results",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path": "articles/kinect-dk/hardware-specification.md",
115+
"redirect_url": "/previous-versions/azure/kinect-dk/hardware-specification",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path": "articles/kinect-dk/multi-camera-sync.md",
120+
"redirect_url": "/previous-versions/azure/kinect-dk/multi-camera-sync",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path": "articles/kinect-dk/record-external-synchronized-units.md",
125+
"redirect_url": "/previous-versions/azure/kinect-dk/record-external-synchronized-units",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path": "articles/kinect-dk/record-file-format.md",
130+
"redirect_url": "/previous-versions/azure/kinect-dk/record-file-format",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path": "articles/kinect-dk/record-playback-api.md",
135+
"redirect_url": "/previous-versions/azure/kinect-dk/record-playback-api",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path": "articles/kinect-dk/record-sensor-streams-file.md",
140+
"redirect_url": "/previous-versions/azure/kinect-dk/record-sensor-streams-file",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path": "articles/kinect-dk/reset-azure-kinect-dk.md",
145+
"redirect_url": "/previous-versions/azure/kinect-dk/reset-azure-kinect-dk",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "articles/kinect-dk/retrieve-images.md",
150+
"redirect_url": "/previous-versions/azure/kinect-dk/retrieve-images",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "articles/kinect-dk/retrieve-imu-samples.md",
155+
"redirect_url": "/previous-versions/azure/kinect-dk/retrieve-imu-samples",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "articles/kinect-dk/sensor-sdk-download.md",
160+
"redirect_url": "/previous-versions/azure/kinect-dk/sensor-sdk-download",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "articles/kinect-dk/set-up-azure-kinect-dk.md",
165+
"redirect_url": "/previous-versions/azure/kinect-dk/set-up-azure-kinect-dk",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "articles/kinect-dk/support.md",
170+
"redirect_url": "/previous-versions/azure/kinect-dk/support",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path": "articles/kinect-dk/system-requirements.md",
175+
"redirect_url": "/previous-versions/azure/kinect-dk/system-requirements",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path": "articles/kinect-dk/troubleshooting.md",
180+
"redirect_url": "/previous-versions/azure/kinect-dk/troubleshooting",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path": "articles/kinect-dk/update-device-firmware.md",
185+
"redirect_url": "/previous-versions/azure/kinect-dk/update-device-firmware",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path": "articles/kinect-dk/use-calibration-functions.md",
190+
"redirect_url": "/previous-versions/azure/kinect-dk/use-calibration-functions",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path": "articles/kinect-dk/use-image-transformation.md",
195+
"redirect_url": "/previous-versions/azure/kinect-dk/use-image-transformation",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path": "articles/kinect-dk/windows-comparison.md",
200+
"redirect_url": "/previous-versions/azure/kinect-dk/windows-comparison",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path": "articles/public-multi-access-edge-compute-mec/considerations-for-deployment.md",
205+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/considerations-for-deployment",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path": "articles/public-multi-access-edge-compute-mec/index.yml",
210+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/index",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path": "articles/public-multi-access-edge-compute-mec/key-concepts.md",
215+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/key-concepts",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path": "articles/public-multi-access-edge-compute-mec/overview.md",
220+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/overview",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path": "articles/public-multi-access-edge-compute-mec/partner-solutions.md",
225+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/partner-solutions",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path": "articles/public-multi-access-edge-compute-mec/quickstart-create-vm-azure-resource-manager-template.md",
230+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/quickstart-create-vm-azure-resource-manager-template",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path": "articles/public-multi-access-edge-compute-mec/quickstart-create-vm-cli.md",
235+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/quickstart-create-vm-cli",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path": "articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-go-sdk.md",
240+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-go-sdk",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path": "articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
245+
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
6246
"redirect_document_id": false
7247
},
8248
{
@@ -2880,16 +3120,6 @@
28803120
"redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
28813121
"redirect_document_id": false
28823122
},
2883-
{
2884-
"source_path_from_root": "/articles/open-datasets/service/how-to-create-dataset-from-open-dataset.md",
2885-
"redirect_url": "/azure/open-datasets/how-to-create-azure-machine-learning-dataset-from-open-dataset",
2886-
"redirect_document_id": false
2887-
},
2888-
{
2889-
"source_path_from_root": "/articles/open-datasets/tutorial-opendatasets-automl.md",
2890-
"redirect_url": "/azure/machine-learning/tutorial-auto-train-models",
2891-
"redirect_document_id": false
2892-
},
28933123
{
28943124
"source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
28953125
"redirect_url": "/azure/openshift/howto-byok",
@@ -4516,4 +4746,4 @@
45164746
"redirect_document_id": false
45174747
}
45184748
]
4519-
}
4749+
}

.openpublishing.redirection.security-benchmark.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@
190190
"redirect_url": "/security/benchmark/azure/baselines/azure-cache-for-redis-security-baseline",
191191
"redirect_document_id": false
192192
},
193-
{
194-
"source_path_from_root": "/articles/search/security-baseline.md",
195-
"redirect_url": "/security/benchmark/azure/baselines/cognitive-search-security-baseline",
196-
"redirect_document_id": false
197-
},
198193
{
199194
"source_path_from_root": "/articles/databox/security-baseline.md",
200195
"redirect_url": "/security/benchmark/azure/baselines/databox-security-baseline",
@@ -265,11 +260,6 @@
265260
"redirect_url": "/security/benchmark/azure/baselines/load-balancer-security-baseline",
266261
"redirect_document_id": false
267262
},
268-
{
269-
"source_path_from_root": "/articles/machine-learning/security-baseline.md",
270-
"redirect_url": "/security/benchmark/azure/baselines/machine-learning-security-baseline",
271-
"redirect_document_id": false
272-
},
273263
{
274264
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/security-baseline.md",
275265
"redirect_url": "/security/benchmark/azure/baselines/managed-applications-security-baseline",

.openpublishing.redirection.sentinel.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/sentinel/best-practices-workspace-architecture.md",
5+
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/sentinel/design-your-workspace-architecture.md",
10+
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/sentinel/notebooks-troubleshoot.md",
515
"redirect_url": "/azure/sentinel/notebooks-hunt",

CODEOWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,10 @@
1919
/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
2020
/articles/container-instances @jasonwhowell @thomps23
2121
/articles/service-fabric @jasonwhowell @thomps23
22+
/articles/machine-learning @jasonwhowell @thomps23
23+
/articles/ai-studio @jasonwhowell @thomps23
24+
/articles/ai-services @jasonwhowell @thomps23
25+
/articles/genomics @jasonwhowell @thomps23
26+
/articles/open-datasets @jasonwhowell @thomps23
27+
/articles/search @jasonwhowell @thomps23
28+

articles/advisor/advisor-assessments.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Use Well Architected Framework assessments in Azure Advisor
33
description: Azure Advisor offers Well Architected Framework assessments (curated and focused Advisor optimization reports) through the Assessments entry in the left menu of the Azure Advisor Portal.
44
ms.service: azure
55
ms.topic: article
6-
ms.date: 02/18/2024
6+
ms.date: 08/22/2024
77

88
#customer intent: As an Advisor user, I want WAF assessments so that I can better understand recommendations.
99

@@ -30,15 +30,7 @@ To see all Microsoft assessment choices, go to the [Learn platform > Assessments
3030

3131
## Prerequisites
3232

33-
You can manage access to Advisor WAF assessments using built-in roles. The permissions vary by role.
34-
35-
> [!NOTE]
36-
> These roles must be configured for the relevant subscription to create the assessment and view the corresponding recommendations.
37-
38-
| **Name** | **Description** |
39-
|---|:---:|
40-
|Reader|View assessments for a subscription or workload and the corresponding recommendations|
41-
|Contributor|Create assessments for a subscription or workload and triage the corresponding recommendations|
33+
[!INCLUDE [View and manage assessments](./includes/advisor-permissions-waf-assessments.md)]
4234

4335
## Access Azure Advisor WAF assessments
4436

articles/advisor/advisor-resiliency-reviews.md

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Advisor resiliency reviews
33
description: Optimize resource resiliency with custom recommendation reviews.
44
ms.service: azure
55
ms.topic: article
6-
ms.date: 03/8/2024
6+
ms.date: 08/22/2024
77

88
---
99

@@ -45,24 +45,7 @@ Your Microsoft account team works with you to collect information about the work
4545

4646
To view or triage recommendations, or to manage recommendations' lifecycles, requires specific role permissions. For definitions, see [Terminology](#terminology).
4747

48-
### Prerequisites to view and triage recommendations
49-
50-
You can manage access to Advisor reviews using built-in roles. The [permissions](/azure/advisor/permissions) vary by role. These roles need to be configured for the subscription that was used to publish the review.
51-
52-
| **Name** | **Description** | **Targeted Subscription** |
53-
|---|:---:|:---:|
54-
|Advisor Reviews Reader|View reviews for a workload and recommendations linked to them.| You need this role for the one subscription your account team used to publish review.|
55-
|Advisor Reviews Contributor|View reviews for a workload and triage recommendations linked to them.| You need this role for the one subscription your account team used to publish review.|
56-
57-
You can manage access to Advisor personalized recommendations using the following roles. These roles need to be configured for the subscriptions included in the workload under a review.
58-
59-
| **Name** | **Description** |
60-
|---|:---:|
61-
|Subscription Reader|View reviews for a workload and recommendations linked to them.|
62-
|Subscription Owner<br>Subscription Contributor|View reviews for a workload, triage recommendations linked to those reviews, manage the recommendation lifecycle.|
63-
|Advisor Recommendations Contributor (Assessments and Reviews)|View accepted recommendations, and manage the recommendation lifecycle.|
64-
65-
You can find detailed instructions on how to assign a role using the Azure portal - [Assign Azure roles using the Azure portal - Azure RBAC](/azure/role-based-access-control/role-assignments-portal?tabs=delegate-condition). Additional information is available in [Steps to assign an Azure role - Azure RBAC](/azure/role-based-access-control/role-assignments-steps).
48+
[!INCLUDE [Reviews and personalized recommendations](./includes/advisor-permissions-review-recommendations.md)]
6649

6750
### Access reviews
6851

0 commit comments

Comments
 (0)