Skip to content

Commit 8115bcf

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-roles-reservations
2 parents ed6fa2e + 8c0a55c commit 8115bcf

32 files changed

+607
-1605
lines changed
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/certification/resources-glossary.md",
5+
"redirect_url": "/azure/certification/overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/certification/how-to-software-levels.md",
10+
"redirect_url": "/azure/certification/overview",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/certification/how-to-test-device-update.md",
15+
"redirect_url": "/azure/certification/overview",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/certification/how-to-using-the-components-feature.md",
20+
"redirect_url": "/azure/certification/overview",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/certification/program-requirements-azure-certified-device.md",
25+
"redirect_url": "/azure/certification/overview",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/certification/program-requirements-edge-managed.md",
30+
"redirect_url": "/azure/certification/overview",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/certification/tutorial-00-selecting-your-certification.md",
35+
"redirect_url": "/azure/certification/overview",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/certification/tutorial-01-creating-your-project.md",
40+
"redirect_url": "/azure/certification/overview",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/certification/tutorial-02-adding-device-details.md",
45+
"redirect_url": "/azure/certification/overview",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/certification/tutorial-03-testing-your-device.md",
50+
"redirect_url": "/azure/certification/overview",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/certification/tutorial-04-publishing-your-device.md",
55+
"redirect_url": "/azure/certification/overview",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/certification/concepts-legacy.md",
60+
"redirect_url": "/azure/certification/overview",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/certification/concepts-marketing.md",
65+
"redirect_url": "/azure/certification/overview",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/certification/how-to-edit-published-device.md",
70+
"redirect_url": "/azure/certification/overview",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/certification/how-to-indirectly-connected-devices.md",
75+
"redirect_url": "/azure/certification/overview",
76+
"redirect_document_id": false
77+
}
78+
]
79+
}

articles/aks/TOC.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@
744744
- name: Create containerized app with Draft
745745
href: draft.md
746746
- name: Build Django app with PostgreSQL
747-
href: ../postgresql/flexible-server/tutorial-django-aks-database.md
747+
href: ../postgresql/flexible-server/tutorial-django-aks-database.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
748748
- name: Build Java app with WebSphere Liberty or Open Liberty
749749
href: howto-deploy-java-liberty-app.md
750750
- name: Build Java app with WebLogic Server
@@ -754,7 +754,7 @@
754754
- name: Build WordPress app with MySQL
755755
href: ../mysql/flexible-server/tutorial-deploy-wordpress-on-aks.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
756756
- name: Azure API Management
757-
href: ../api-management/api-management-kubernetes.md
757+
href: ../api-management/api-management-kubernetes.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
758758
- name: Deploy Kubernetes applications
759759
items:
760760
- name: Deploy Kubernetes applications from Azure Marketplace
@@ -774,7 +774,7 @@
774774
- name: Deploy and run workflows with the Dapr extension
775775
href: dapr-workflow.md
776776
- name: Troubleshoot the Dapr extension
777-
href: dapr-troubleshooting.md
777+
href: /troubleshoot/azure/azure-kubernetes/troubleshoot-dapr-extension-installation-errors?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
778778
- name: GitOps
779779
href: ../azure-arc/kubernetes/tutorial-use-gitops-flux2.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
780780
- name: Deploy Intelligent Apps on AKS
@@ -786,11 +786,11 @@
786786
- name: DevOps
787787
items:
788788
- name: Azure DevOps Project
789-
href: ../devops-project/azure-devops-project-aks.md
789+
href: ../devops-project/azure-devops-project-aks.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
790790
- name: CI/CD with Azure Pipelines
791-
href: ../aks/devops-pipeline.md
791+
href: devops-pipeline.md
792792
- name: GitHub Actions for Kubernetes
793-
href: ../aks/kubernetes-action.md
793+
href: kubernetes-action.md
794794
- name: Configure automated deployments
795795
href: automated-deployments.md
796796
- name: Jenkins continuous deployment

articles/azure-monitor/app/convert-classic-resource.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,9 @@ If you don't wish to have your classic resource automatically migrated to a work
295295

296296
### Is there any implication on the cost from migration?
297297

298-
There's usually no difference, with a couple of exceptions:
298+
There's usually no difference, with one exeception - Application Insights resources that were receiving 1 GB per month free via legacy Application Insights pricing model will no longer receive the free data.
299299

300-
- Migrated Application Insights resources can use [Log Analytics commitment tiers](../logs/cost-logs.md#commitment-tiers) to reduce cost if the data volumes in the workspace are high enough.
301-
- Grandfathered Application Insights resources no longer get 1 GB per month free from the original Application Insights pricing model.
300+
The migration to workspace-based Application Insights offers a number of options to further [optimize cost](../logs/cost-logs.md), including [Log Analytics commitment tiers](../logs/cost-logs.md#commitment-tiers), [dedicated clusters](../logs/cost-logs.md#dedicated-clusters), and [basic logs](../logs/cost-logs.md#basic-logs).
302301

303302
### How will telemetry capping work?
304303

@@ -344,7 +343,7 @@ To avoid this issue, make sure to use the latest version of the Terraform [azure
344343

345344
For backwards compatibility, calls to the old API for creating Application Insights resources will continue to work. Each of these calls will eventually create both a workspace-based Application Insights resource and a Log Analytics workspace to store the data.
346345

347-
We strongly encourage updating to the [new API](https://learn.microsoft.com/azure/azure-monitor/app/resource-manager-app-resource) for better control over resource creation.
346+
We strongly encourage updating to the [new API](resource-manager-app-resource.md) for better control over resource creation.
348347

349348
### Should I migrate diagnostic settings on classic Application Insights before moving to a workspace-based AI?
350349
Yes, we recommend migrating diagnostic settings on classic Application Insights resources before transitioning to a workspace-based Application Insights. It ensures continuity and compatibility of your diagnostic settings.

articles/certification/TOC.yml

Lines changed: 68 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,73 @@
1-
- name: Azure Certified Device documentation
1+
- name: Edge Secured-core documentation
22
href: index.yml
3+
- name: What is Edge Secured-core?
4+
href: overview.md
5+
- name: Program requirements
6+
href: program-requirements-edge-secured-core.md
7+
- name: Get your device certified
8+
href: edge-secured-core-get-certified.md
9+
- name: List of certified devices
10+
href: edge-secured-core-devices.md
11+
# - name: <<< CUT LINE >>
12+
# href: #
13+
# - name: Overview
14+
# items:
15+
# - name: What is the Azure Certified Device program?
16+
# href: overview.md
317

4-
- name: Overview
5-
items:
6-
- name: What is the Azure Certified Device program?
7-
href: overview.md
18+
# - name: Tutorials
19+
# expanded: true
20+
# items:
21+
# - name: 1 - Selecting the right certification
22+
# href: tutorial-00-selecting-your-certification.md
23+
# - name: 2 - Creating your project
24+
# href: tutorial-01-creating-your-project.md
25+
# - name: 3 - Adding device details
26+
# href: tutorial-02-adding-device-details.md
27+
# - name: 4 - Testing your device
28+
# href: tutorial-03-testing-your-device.md
29+
# - name: 5 - Publishing your device
30+
# href: tutorial-04-publishing-your-device.md
831

9-
- name: Tutorials
10-
expanded: true
11-
items:
12-
- name: 1 - Selecting the right certification
13-
href: tutorial-00-selecting-your-certification.md
14-
- name: 2 - Creating your project
15-
href: tutorial-01-creating-your-project.md
16-
- name: 3 - Adding device details
17-
href: tutorial-02-adding-device-details.md
18-
- name: 4 - Testing your device
19-
href: tutorial-03-testing-your-device.md
20-
- name: 5 - Publishing your device
21-
href: tutorial-04-publishing-your-device.md
32+
# - name: Program Requirements
33+
# items:
34+
# - name: Azure Certified Device
35+
# href: program-requirements-azure-certified-device.md
36+
# - name: IoT Plug and Play
37+
# href: program-requirements-pnp.md
38+
# - name: Edge Managed
39+
# href: program-requirements-edge-managed.md
40+
# - name: Edge Secured-core
41+
# href: program-requirements-edge-secured-core.md
42+
# - name: Edge Secured-core devices
43+
# href: edge-secured-core-devices.md
2244

23-
- name: Program Requirements
24-
items:
25-
- name: Azure Certified Device
26-
href: program-requirements-azure-certified-device.md
27-
- name: IoT Plug and Play
28-
href: program-requirements-pnp.md
29-
- name: Edge Managed
30-
href: program-requirements-edge-managed.md
31-
- name: Edge Secured-core
32-
href: program-requirements-edge-secured-core.md
33-
34-
- name: Concepts
35-
items:
36-
- name: Legacy devices
37-
href: concepts-legacy.md
38-
- name: Marketing concepts
39-
href: concepts-marketing.md
40-
- name: Software levels
41-
href: how-to-software-levels.md
45+
# - name: Concepts
46+
# items:
47+
# - name: Legacy devices
48+
# href: concepts-legacy.md
49+
# - name: Marketing concepts
50+
# href: concepts-marketing.md
51+
# - name: Software levels
52+
# href: how-to-software-levels.md
4253

43-
- name: How-to guides
44-
items:
45-
- name: How to edit a published device
46-
href: how-to-edit-published-device.md
47-
- name: How to certify an indirectly connected device
48-
href: how-to-indirectly-connected-devices.md
49-
- name: How to test your IoT Plug and Play device with CLI
50-
href: how-to-test-pnp.md
51-
- name: How to troubleshoot your IoT Plug and Play device
52-
href: how-to-troubleshoot-pnp.md
53-
- name: How to test Device Update in Edge Secured-core certification
54-
href: how-to-test-device-update.md
55-
- name: How to use the components feature
56-
href: how-to-using-the-components-feature.md
57-
- name: Resources
58-
items:
59-
- name: Certification Glossary
60-
href: resources-glossary.md
61-
- name: MPN/Microsoft Partner Network Support
62-
href: /partner-center/
54+
# - name: How-to guides
55+
# items:
56+
# - name: How to edit a published device
57+
# href: how-to-edit-published-device.md
58+
# - name: How to certify an indirectly connected device
59+
# href: how-to-indirectly-connected-devices.md
60+
# - name: How to test your IoT Plug and Play device with CLI
61+
# href: how-to-test-pnp.md
62+
# - name: How to troubleshoot your IoT Plug and Play device
63+
# href: how-to-troubleshoot-pnp.md
64+
# - name: How to test Device Update in Edge Secured-core certification
65+
# href: how-to-test-device-update.md
66+
# - name: How to use the components feature
67+
# href: how-to-using-the-components-feature.md
68+
# - name: Resources
69+
# items:
70+
# - name: Certification Glossary
71+
# href: resources-glossary.md
72+
# - name: MPN/Microsoft Partner Network Support
73+
# href: /partner-center/

articles/certification/concepts-legacy.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)