Skip to content

Commit dc5fa81

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ade-manage-env-developer-portal
2 parents 9cfeb55 + af5018c commit dc5fa81

File tree

180 files changed

+4265
-3974
lines changed

Some content is hidden

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

180 files changed

+4265
-3974
lines changed

.openpublishing.redirection.json

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,44 @@
11
{
22
"redirections": [
3-
{
4-
"source_path": "articles/virtual-machines/h-series.md",
5-
"redirect_url": "/previous-versions/azure/virtual-machines/articles/virtual-machines/h-series",
6-
"redirect_document_id": false
7-
},
8-
{
9-
"source_path": "articles/virtual-machines/h-series-retirement.md",
10-
"redirect_url": "/previous-versions/azure/virtual-machines/articles/virtual-machines/h-series-retirement",
11-
"redirect_document_id": false
3+
{
4+
"source_path": "articles/cloudfoundry/index.yml",
5+
"redirect_url": "https://docs.pivotal.io/pivotalcf/1-11/customizing/pcf_azure.html",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/cloudfoundry/cloudfoundry-deploy-your-first-app.md",
10+
"redirect_url": "/previous-versions/azure/cloudfoundry/cloudfoundry-deploy-your-first-app",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/cloudfoundry/cloudfoundry-get-started.md",
15+
"redirect_url": "/previous-versions/azure/cloudfoundry/cloudfoundry-get-started",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/cloudfoundry/cloudfoundry-oms-nozzle.md",
20+
"redirect_url": "/previous-versions/azure/cloudfoundry/cloudfoundry-oms-nozzle",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/cloudfoundry/create-cloud-foundry-on-azure.md",
25+
"redirect_url": "/previous-versions/azure/cloudfoundry/create-cloud-foundry-on-azure",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/cloudfoundry/how-cloud-foundry-integrates-with-azure.md",
30+
"redirect_url": "/previous-versions/azure/cloudfoundry/how-cloud-foundry-integrates-with-azure",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/virtual-machines/h-series.md",
35+
"redirect_url": "/previous-versions/azure/virtual-machines/articles/virtual-machines/h-series",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/virtual-machines/h-series-retirement.md",
40+
"redirect_url": "/previous-versions/azure/virtual-machines/articles/virtual-machines/h-series-retirement",
41+
"redirect_document_id": false
1242
},
1343
{
1444
"source_path": "articles/security/develop/security-code-analysis-customize.md",
@@ -21981,6 +22011,32 @@
2198122011
"redirect_URL": "/azure/private-5g-core",
2198222012
"redirect_document_id": false
2198322013
},
22014+
{
22015+
"source_path": "articles/virtual-machines/linux/openshift-container-platform-3x-marketplace-self-managed.md",
22016+
"redirect_url": "/previous-versions/azure/virtual-machines/linux/openshift-container-platform-3x-marketplace-self-managed",
22017+
"redirect_document_id": false
22018+
},
22019+
{
22020+
"source_path": "articles/virtual-machines/linux/openshift-container-platform-3x-post-deployment.md",
22021+
"redirect_url": "/previous-versions/azure/virtual-machines/linux/openshift-container-platform-3x-post-deployment",
22022+
"redirect_document_id": false
22023+
},
22024+
{
22025+
"source_path": "articles/virtual-machines/linux/openshift-container-platform-3x-prerequisites.md",
22026+
"redirect_url": "/previous-versions/azure/virtual-machines/linux/openshift-container-platform-3x-prerequisites",
22027+
"redirect_document_id": false
22028+
},
22029+
{
22030+
"source_path": "articles/virtual-machines/linux/openshift-container-platform-3x-troubleshooting.md",
22031+
"redirect_url": "/previous-versions/azure/virtual-machines/linux/openshift-container-platform-3x-troubleshooting",
22032+
"redirect_document_id": false
22033+
},
22034+
{
22035+
"source_path": "articles/virtual-machines/linux/openshift-container-platform-3x.md",
22036+
"redirect_url": "/previous-versions/azure/virtual-machines/linux/openshift-container-platform-3x",
22037+
"redirect_document_id": false
22038+
},
22039+
2198422040
{
2198522041
"source_path": "articles/private-multi-access-edge-compute-mec/metaswitch-fusion-core-overview.md",
2198622042
"redirect_URL": "/azure/private-5g-core",

articles/active-directory/app-provisioning/application-provisioning-quarantine-status.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,16 @@ A job can go into quarantine regardless of failure counts for issues such as adm
7575

7676
The logic documented here may be different for certain connectors to ensure best customer experience, but we generally have the below retry cycles after a failure:
7777

78-
After the first failure, the first retry happens within the next 2 hours (usually in the next sync cycle).
79-
- The second retry happens 6 hours after the first failure.
80-
- The third retry happens 12 hours after the first failure.
81-
- The fourth retry happens 24 hours after the first failure.
82-
- The fifth retry happens 48 hours after the first failure.
83-
- The sixth retry happens 72 hours after the first failure.
84-
- The seventh retry happens 96 hours after the first failure.
85-
- The eighth retry happens 120 hours after the first failure.
86-
87-
This cycle is repeated every 24 hours until the 30th day when retries are stopped and the job is disabled.
78+
After the failure, the first retry will happen in 6 hours.
79+
- The second retry happens 12 hours after the first failure.
80+
- The third retry happens 24 hours after the first failure.
81+
- The fourth retry happens 48 hours after the first failure.
82+
- The fifth retry happens 96 hours after the first failure.
83+
- The sixth retry happens 192 hours after the first failure.
84+
- The seventh retry happens 384 hours after the first failure.
85+
- The eighth retry happens 768 hours after the first failure.
86+
87+
The retries are stopped after the 8th retry and the escrow entry is removed. The job will continue unless it hits the escrow thresholds from the section above
8888

8989

9090
## How do I get my application out of quarantine?

articles/active-directory/conditional-access/resilience-defaults.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ If the required controls of a policy weren't previously satisfied, the policy is
5454
- Country location (resolving new IP or GPS coordinates)
5555
- Authentication strengths
5656

57-
When active, the Backup Authentication Service doesn't evaluate authentication methods required by [authentication strengths](../authentication/concept-authentication-strengths.md). If you used a non-phishing-resistant authentication method before an outage, during an outage you aren't be prompted for multifactor authentication even if accessing a resource protected by a Conditional Access policy with a phishing-resistant authentication strength.
57+
When active, the Backup Authentication Service doesn't evaluate authentication methods required by [authentication strengths](../authentication/concept-authentication-strengths.md). If you used a non-phishing-resistant authentication method before an outage, during an outage you aren't prompted for multifactor authentication even if accessing a resource protected by a Conditional Access policy with a phishing-resistant authentication strength.
5858

5959
## Resilience defaults enabled
6060

articles/active-directory/devices/howto-vm-sign-in-azure-ad-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The following Linux distributions are currently supported for deployments in a s
4343
| CentOS | CentOS 7, CentOS 8 |
4444
| Debian | Debian 9, Debian 10, Debian 11 |
4545
| openSUSE | openSUSE Leap 42.3, openSUSE Leap 15.1+ |
46-
| RedHat Enterprise Linux (RHEL) | RHEL 7.4 to RHEL 7.10, RHEL 8.3+ |
46+
| RedHat Enterprise Linux (RHEL) | RHEL 7.4 to RHEL 7.9, RHEL 8.3+ |
4747
| SUSE Linux Enterprise Server (SLES) | SLES 12, SLES 15.1+ |
4848
| Ubuntu Server | Ubuntu Server 16.04 to Ubuntu Server 22.04 |
4949

articles/active-directory/fundamentals/data-protection-considerations.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ For more information about Secret encryption at rest, see the following table.
8383

8484
* [Microsoft Service Trust Documents](https://servicetrust.microsoft.com/Documents/TrustDocuments)
8585
* [Microsoft Azure Trust Center](https://azure.microsoft.com/overview/trusted-cloud/)
86-
* [Where is my data? - Office 365 documentation](http://o365datacentermap.azurewebsites.net/)
8786
* [Recover from deletions in Azure Active Directory](recover-from-deletions.md)
8887

8988
## Next steps

articles/active-directory/managed-identities-azure-resources/how-to-use-vm-sdk.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,10 @@ This article provides a list of SDK samples, which demonstrate use of their resp
3737
| .NET Core | [Call Azure services from a Linux VM using managed identities for Azure resources](https://github.com/Azure-Samples/linuxvm-msi-keyvault-arm-dotnet/) |
3838
| Go | [Azure identity client module for Go](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azidentity#ManagedIdentityCredential)
3939
| Node.js | [Manage resources using managed identities for Azure resources](https://github.com/Azure-Samples/resources-node-manage-resources-with-msi) |
40-
| Python | [Use managed identities for Azure resources to authenticate simply from inside a VM](https://azure.microsoft.com/resources/samples/resource-manager-python-manage-resources-with-msi/) |
40+
| Python | Use managed identities for Azure resources to authenticate simply from inside a VM |
4141
| Ruby | [Manage resources from a VM with managed identities for Azure resources enabled](https://github.com/Azure-Samples/resources-ruby-manage-resources-with-msi/) |
4242

4343
## Next steps
4444

4545
- See [Azure SDKs](https://azure.microsoft.com/downloads/) for the full list of Azure SDK resources, including library downloads, documentation, and more.
4646
- To enable managed identities for Azure resources on an Azure VM, see [Configure managed identities for Azure resources on a VM using the Azure portal](qs-configure-portal-windows-vm.md).
47-
48-
49-
50-
51-
52-
53-
54-
16.3 KB
Loading
-1.67 KB
Loading

articles/active-directory/reports-monitoring/overview-recommendations.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.topic: overview
99
ms.tgt_pltfrm: na
1010
ms.workload: identity
1111
ms.subservice: report-monitor
12-
ms.date: 02/16/2023
12+
ms.date: 02/24/2023
1313
ms.author: sarahlipsey
1414
ms.reviewer: hafowler
1515
ms.collection: M365-identity-device-management
@@ -48,9 +48,9 @@ Each recommendation contains a description, a summary of the value of addressing
4848

4949
Each recommendation provides the same set of details that explain what the recommendation is, why it's important, and how to fix it.
5050

51-
The **Status** of a recommendation can be updated manually or automatically. If all resources are addressed according to the action plan, the status will automatically change to *Completed* the next time the recommendations service runs. The recommendation service runs every 24-48 hours, depending on the recommendation.
51+
The **Status** of a recommendation can be updated manually or automatically by the system. If all resources are addressed according to the action plan, the status automatically changes to *Completed* the next time the recommendations service runs. The recommendation service runs every 24-48 hours, depending on the recommendation.
5252

53-
![Screenshot of the Mark as options.](./media/overview-recommendations/recommendations-object.png)
53+
![Screenshot of the Mark as options.](./media/overview-recommendations/recommendation-mark-as-options.png)
5454

5555
The **Priority** of a recommendation could be low, medium, or high. These values are determined by several factors, such as security implications, health concerns, or potential breaking changes.
5656

@@ -118,17 +118,16 @@ The recommendations listed in the following table are available to all Azure AD
118118

119119
1. The recommendation service automatically marks the recommendation as complete, but if you need to manually change the status of a recommendation, select **Mark as** from the top of the page and select a status.
120120

121-
![Screenshot of the Mark as options, to highlight the difference from the resource menu.](./media/overview-recommendations/recommendations-object.png)
121+
![Screenshot of the Mark as options, to highlight the difference from the resource menu.](./media/overview-recommendations/recommendation-mark-as-options.png)
122122

123-
- Mark a recommendation as **Completed** if all impacted resources have been addressed.
124-
- Active resources may still appear in the list of resources for manually completed recommendations. If the resource is completed, the service will update the status the next time the service runs.
125-
- If the service identifies an active resource for a manually completed recommendation the next time the service runs, the recommendation will automatically change back to **Active**.
126-
- Completing a recommendation is the only action collected in the audit log. To view these logs, go to **Azure AD** > **Audit logs** and filter the service to "Azure AD recommendations."
127123
- Mark a recommendation as **Dismissed** if you think the recommendation is irrelevant or the data is wrong.
128-
- Azure AD will ask for a reason why you dismissed the recommendation so we can improve the service.
124+
- Azure AD asks for a reason why you dismissed the recommendation so we can improve the service.
129125
- Mark a recommendation as **Postponed** if you want to address the recommendation at a later time.
130-
- The recommendation will become **Active** when the selected date occurs.
126+
- The recommendation becomes **Active** when the selected date occurs.
131127
- You can reactivate a completed or postponed recommendation to keep it top of mind and reassess the resources.
128+
- Recommendations change to **Completed** if all impacted resources have been addressed.
129+
- If the service identifies an active resource for a completed recommendation the next time the service runs, the recommendation will automatically change back to **Active**.
130+
- Completing a recommendation is the only action collected in the audit log. To view these logs, go to **Azure AD** > **Audit logs** and filter the service to "Azure AD recommendations."
132131

133132
Continue to monitor the recommendations in your tenant for changes.
134133

0 commit comments

Comments
 (0)