Skip to content

Commit 745d4b0

Browse files
committed
Merge branch 'release-preview-azure-publicmec-withoperator' of https://github.com/MicrosoftDocs/azure-docs-pr into release-preview-azure-publicmec-withoperator
2 parents dfe3996 + 4bf8178 commit 745d4b0

File tree

2,407 files changed

+32972
-16916
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,407 files changed

+32972
-16916
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,6 +884,7 @@
884884
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
885885
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
886886
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
887-
"articles/mysql/.openpublishing.redirection.mysql.json"
887+
"articles/mysql/.openpublishing.redirection.mysql.json",
888+
"articles/container-apps/.openpublishing.redirection.container-apps.json"
888889
]
889890
}

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,11 @@
800800
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
801801
"redirect_document_id": false
802802
},
803+
{
804+
"source_path_from_root": "/articles/active-directory/external-identities/o365-external-user.md",
805+
"redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
806+
"redirect_document_id": false
807+
},
803808
{
804809
"source_path_from_root": "/articles/active-directory/active-directory-b2b-current-preview-limitations.md",
805810
"redirect_url": "/azure/active-directory/active-directory-b2b-current-limitations",

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
2020
"redirect_url": "/azure/service-bus-messaging/service-bus-insights",
2121
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
25+
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
26+
"redirect_document_id": false
2227
}
2328
]
2429
}

.openpublishing.redirection.defender-for-iot.json

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
5-
"redirect_url": "/azure/sentinel/iot-solution",
6-
"redirect_document_id": false
7-
},
83
{
94
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
105
"redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -30,7 +25,17 @@
3025
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3126
"redirect_document_id": false
3227
},
33-
{
28+
{
29+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
30+
"redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
35+
"redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
36+
"redirect_document_id": false
37+
},
38+
{
3439
"source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
3540
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3641
"redirect_document_id": false
@@ -230,11 +235,6 @@
230235
"redirect_url": "/azure/defender-for-iot/organizations/how-to-track-sensor-activity",
231236
"redirect_document_id": false
232237
},
233-
{
234-
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
235-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-configure-with-sentinel",
236-
"redirect_document_id": false
237-
},
238238
{
239239
"source_path_from_root": "/articles/defender-for-iot/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
240240
"redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console",
@@ -564,6 +564,29 @@
564564
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
565565
"redirect_url": "/azure/defender-for-iot/organizations",
566566
"redirect_document_id": false
567+
},
568+
{
569+
"source_path_from_root": "/articles/device-builders/how-to-configure-with-sentinel.md",
570+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
571+
"redirect_document_id": false
572+
},
573+
{
574+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
575+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
576+
"redirect_document_id": false
577+
},
578+
{
579+
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
580+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
581+
"redirect_document_id": false
582+
},
583+
{
584+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-security-agent-authentication.md",
585+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
586+
"redirect_document_id": false
567587
}
568588
]
569-
}
589+
}
590+
591+
592+

.openpublishing.redirection.json

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15901,8 +15901,13 @@
1590115901
},
1590215902
{
1590315903
"source_path_from_root": "/articles/lab-services/devtest-lab-developer-lab.md",
15904-
"redirect_url": "/azure/devtest-labs/devtest-lab-developer-lab",
15905-
"redirect_document_id": true
15904+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
15905+
"redirect_document_id": false
15906+
},
15907+
{
15908+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-developer-lab.md",
15909+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
15910+
"redirect_document_id": false
1590615911
},
1590715912
{
1590815913
"source_path_from_root": "/articles/lab-services/devtest-lab-dev-ops.md",
@@ -16036,13 +16041,23 @@
1603616041
},
1603716042
{
1603816043
"source_path_from_root": "/articles/lab-services/devtest-lab-test-env.md",
16039-
"redirect_url": "/azure/devtest-labs/devtest-lab-test-env",
16040-
"redirect_document_id": true
16044+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
16045+
"redirect_document_id": false
1604116046
},
1604216047
{
1604316048
"source_path_from_root": "/articles/lab-services/devtest-lab-training-lab.md",
16044-
"redirect_url": "/azure/devtest-labs/devtest-lab-training-lab",
16045-
"redirect_document_id": true
16049+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
16050+
"redirect_document_id": false
16051+
},
16052+
{
16053+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-test-env.md",
16054+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
16055+
"redirect_document_id": false
16056+
},
16057+
{
16058+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-training-lab.md",
16059+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
16060+
"redirect_document_id": false
1604616061
},
1604716062
{
1604816063
"source_path_from_root": "/articles/lab-services/devtest-lab-troubleshoot-apply-artifacts.md",
@@ -19815,9 +19830,9 @@
1981519830
"redirect_document_id": false
1981619831
},
1981719832
{
19818-
"source_path_from_root": "/articles/machine-learning/service/how-to-deploy-app-service.md",
19819-
"redirect_url": "/azure/machine-learning/how-to-deploy-app-service",
19820-
"redirect_document_id": true
19833+
"source_path_from_root": "/articles/machine-learning/how-to-deploy-app-service.md",
19834+
"redirect_url": "/azure/machine-learning/how-to-deploy-managed-online-endpoints",
19835+
"redirect_document_id": false
1982119836
},
1982219837
{
1982319838
"source_path_from_root": "/articles/machine-learning/service/how-to-deploy-azure-container-instance.md",
@@ -19844,6 +19859,11 @@
1984419859
"redirect_url": "/azure/machine-learning/how-to-deploy-and-where",
1984519860
"redirect_document_id": false
1984619861
},
19862+
{
19863+
"source_path_from_root": "/articles/machine-learning/how-to-homomorphic-encryption-seal.md",
19864+
"redirect_url": "/azure/machine-learning/",
19865+
"redirect_document_id": false
19866+
},
1984719867
{
1984819868
"source_path_from_root": "/articles/machine-learning/service/concept-accelerate-with-fpgas.md",
1984919869
"redirect_url": "/azure/machine-learning/how-to-deploy-fpga-web-service",
@@ -19855,9 +19875,14 @@
1985519875
"redirect_document_id": true
1985619876
},
1985719877
{
19858-
"source_path_from_root": "/articles/machine-learning/service/how-to-deploy-functions.md",
19859-
"redirect_url": "/azure/machine-learning/how-to-deploy-functions",
19860-
"redirect_document_id": true
19878+
"source_path_from_root": "/articles/machine-learning/how-to-deploy-functions.md",
19879+
"redirect_url": "/azure/machine-learning/how-to-deploy-managed-online-endpoints",
19880+
"redirect_document_id": false
19881+
},
19882+
{
19883+
"source_path_from_root": "/articles/machine-learning/how-to-deploy-no-code-deployment.md",
19884+
"redirect_url": "/azure/machine-learning/how-to-deploy-mlflow-models-online-endpoints",
19885+
"redirect_document_id": false
1986119886
},
1986219887
{
1986319888
"source_path_from_root": "/articles/machine-learning/service/concept-accelerate-inferencing-with-gpus.md",
@@ -22629,6 +22654,11 @@
2262922654
"redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
2263022655
"redirect_document_id": true
2263122656
},
22657+
{
22658+
"source_path_from_root": "/articles/scheduler/scheduler-intro.md",
22659+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22660+
"redirect_document_id": ""
22661+
},
2263222662
{
2263322663
"source_path_from_root": "/articles/scheduler/scheduler-advanced-complexity.md",
2263422664
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
@@ -39464,11 +39494,6 @@
3946439494
"redirect_url": "/azure/azure-monitor/agents/data-sources-windows-events",
3946539495
"redirect_document_id": false
3946639496
},
39467-
{
39468-
"source_path_from_root": "/articles/azure-monitor/platform/data-collection-rule-overview.md",
39469-
"redirect_url": "/azure/azure-monitor/agents/data-collection-rule-overview",
39470-
"redirect_document_id": false
39471-
},
3947239497
{
3947339498
"source_path_from_root": "/articles/azure-monitor/platform/data-sources.md",
3947439499
"redirect_url": "/azure/azure-monitor/agents/data-sources",

.openpublishing.redirection.media-services.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,11 @@
629629
"source_path_from_root": "/articles/media-services/latest/asset-create-asset-upload-portal-quickstart.md",
630630
"redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",
631631
"redirect_document_id": true
632+
},
633+
{
634+
"source_path_from_root": "/articles/media-services/latest/architecture-design-multi-drm-system.md",
635+
"redirect_url": "/azure/media-services/latest/drm-content-protection-concept",
636+
"redirect_document_id": true
632637
},
633638
{
634639
"source_path_from_root": "/articles/media-services/latest/latest/questions-collection.md",

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thank you for taking the time to contribute to the Microsoft Azure documentation.
44

5-
This guide covers some general topics related to contribution and refers to the [contributors guide](/contribute) for more detailed explanations when required.
5+
This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
66

77
## Code of Conduct
88

@@ -25,4 +25,4 @@ Follow the guidance for [Quick edits to existing documents](/contribute/#quick-e
2525

2626
### Pull Request
2727

28-
Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
28+
Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

articles/active-directory-b2c/azure-monitor.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.topic: how-to
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
14-
ms.date: 02/09/2022
14+
ms.date: 02/23/2022
1515
---
1616

1717
# Monitor Azure AD B2C with Azure Monitor
@@ -147,7 +147,9 @@ After you've deployed the template and waited a few minutes for the resource pro
147147
1. Sign in to the [Azure portal](https://portal.azure.com) with your **Azure AD B2C** administrative account. This account must be a member of the security group you specified in the [Delegate resource management](#3-delegate-resource-management) step.
148148
1. Select the **Directories + subscriptions** icon in the portal toolbar.
149149
1. On the **Portal settings | Directories + subscriptions** page, in the **Directory name** list, find your Azure AD directory that contains the Azure subscription and the _azure-ad-b2c-monitor_ resource group you created, and then select **Switch**.
150-
1. Verify that you've selected the correct directory and subscription.
150+
1. Verify that you've selected the correct directory and your Azure subscription is listed and selected in the **Default subscription filter**.
151+
152+
![Screenshot of the default subscription filter](./media/azure-monitor/default-subscription-filter.png)
151153

152154
## 5. Configure diagnostic settings
153155

@@ -178,6 +180,10 @@ To configure monitoring settings for Azure AD B2C activity logs:
178180
1. Check the box for each destination to send the logs. Select **Configure** to specify their settings **as described in the following table**.
179181
1. Select **Send to Log Analytics**, and then select the **Name of workspace** you created earlier (`AzureAdB2C`).
180182
1. Select **AuditLogs** and **SignInLogs**.
183+
184+
> [!NOTE]
185+
> Only the **AuditLogs** and **SignInLogs** diagnostic settings are currently supported for Azure AD B2C tenants.
186+
181187
1. Select **Save**.
182188

183189
> [!NOTE]

0 commit comments

Comments
 (0)