Skip to content

Commit bb38724

Browse files
authored
Merge pull request #218424 from MicrosoftDocs/main
11/15 AM Publish
2 parents 8ab22f7 + 739ce29 commit bb38724

File tree

45 files changed

+240
-155
lines changed

Some content is hidden

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

45 files changed

+240
-155
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ The AADLoginForWindows extension must be installed successfully for the VM to co
297297
1. View the device state by running `dsregcmd /status`. The goal is for the device state to show as `AzureAdJoined : YES`.
298298

299299
> [!NOTE]
300-
> Azure AD join activity is captured in Event Viewer under the *User Device Registration\Admin* log at *Event Viewer (local)\Applications* and *Services Logs\Windows\Microsoft\User Device Registration\Admin*.
300+
> Azure AD join activity is captured in Event Viewer under the *User Device Registration\Admin* log at *Event Viewer (local)\Applications* and *Services Logs\Microsoft\Windows\User Device Registration\Admin*.
301301
302302
If the AADLoginForWindows extension fails with an error code, you can perform the following steps.
303303

articles/active-directory/enterprise-users/licensing-service-plan-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ When managing licenses in [the Azure portal](https://portal.azure.com/#blade/Mic
288288
| Power BI Pro | POWER_BI_PRO | f8a1db68-be16-40ed-86d5-cb42ce701560 | EXCHANGE_S_FOUNDATION (113feb6c-3fe4-4440-bddc-54d774bf0318)<br/>BI_AZURE_P2 (70d33638-9c74-4d01-bfd3-562de28bd4ba) | Exchange Foundation (113feb6c-3fe4-4440-bddc-54d774bf0318)<br/>Power BI Pro (70d33638-9c74-4d01-bfd3-562de28bd4ba) |
289289
| Power BI Pro CE | POWER_BI_PRO_CE | 420af87e-8177-4146-a780-3786adaffbca | EXCHANGE_S_FOUNDATION (113feb6c-3fe4-4440-bddc-54d774bf0318)<br/>BI_AZURE_P2 (70d33638-9c74-4d01-bfd3-562de28bd4ba) | Exchange Foundation (113feb6c-3fe4-4440-bddc-54d774bf0318)<br/>Power BI Pro (70d33638-9c74-4d01-bfd3-562de28bd4ba) |
290290
| Power BI Pro Dept | POWER_BI_PRO_DEPT | 3a6a908c-09c5-406a-8170-8ebb63c42882 | EXCHANGE_S_FOUNDATION (113feb6c-3fe4-4440-bddc-54d774bf0318)<br/>BI_AZURE_P2 (70d33638-9c74-4d01-bfd3-562de28bd4ba) | Exchange Foundation (113feb6c-3fe4-4440-bddc-54d774bf0318)<br/>Power BI Pro (70d33638-9c74-4d01-bfd3-562de28bd4ba) |
291-
| Power BI Pro for GCC | POWERBI_PRO_GOV | f0612879-44ea-47fb-baf0-3d76d9235576 | EXCHANGE_S_FOUNDATION_GOV (922ba911-5694-4e99-a794-73aed9bfeec8)<br/>BI_AZURE_P_2_GOV (944e9726-f011-4353-b654-5f7d2663db76) | Exchange Foundation for Government (922ba911-5694-4e99-a794-73aed9bfeec8)</br>Power BI Pro for Government (944e9726-f011-4353-b654-5f7d2663db76) |
291+
| Power BI Pro for GCC | POWERBI_PRO_GOV | f0612879-44ea-47fb-baf0-3d76d9235576 | EXCHANGE_S_FOUNDATION_GOV (922ba911-5694-4e99-a794-73aed9bfeec8)<br/>BI_AZURE_P_2_GOV (944e9726-f011-4353-b654-5f7d2663db76) | Exchange Foundation for Government (922ba911-5694-4e99-a794-73aed9bfeec8)<br/>Power BI Pro for Government (944e9726-f011-4353-b654-5f7d2663db76) |
292292
| Power Virtual Agent | VIRTUAL_AGENT_BASE | e4e55366-9635-46f4-a907-fc8c3b5ec81f | CDS_VIRTUAL_AGENT_BASE (0a0a23fa-fea1-4195-bb89-b4789cb12f7f)<br/>FLOW_VIRTUAL_AGENT_BASE (4b81a949-69a1-4409-ad34-9791a6ec88aa)<br/>VIRTUAL_AGENT_BASE (f6934f16-83d3-4f3b-ad27-c6e9c187b260) | Common Data Service for Virtual Agent Base (0a0a23fa-fea1-4195-bb89-b4789cb12f7f)<br/>Power Automate for Virtual Agent (4b81a949-69a1-4409-ad34-9791a6ec88aa)<br/>Virtual Agent Base (f6934f16-83d3-4f3b-ad27-c6e9c187b260) |
293293
| Power Virtual Agents Viral Trial | CCIBOTS_PRIVPREV_VIRAL | 606b54a9-78d8-4298-ad8b-df6ef4481c80 | DYN365_CDS_CCI_BOTS (cf7034ed-348f-42eb-8bbd-dddeea43ee81)<br/>CCIBOTS_PRIVPREV_VIRAL (ce312d15-8fdf-44c0-9974-a25a177125ee)<br/>FLOW_CCI_BOTS (5d798708-6473-48ad-9776-3acc301c40af) | Common Data Service for CCI Bots (cf7034ed-348f-42eb-8bbd-dddeea43ee81)<br/>Dynamics 365 AI for Customer Service Virtual Agents Viral (ce312d15-8fdf-44c0-9974-a25a177125ee)<br/>Flow for CCI Bots (5d798708-6473-48ad-9776-3acc301c40af) |
294294
| Project for Office 365 | PROJECTCLIENT | a10d5e58-74da-4312-95c8-76be4e5b75a0 | PROJECT_CLIENT_SUBSCRIPTION (fafd7243-e5c1-4a3a-9e40-495efcb1d3c3) | PROJECT ONLINE DESKTOP CLIENT (fafd7243-e5c1-4a3a-9e40-495efcb1d3c3) |

articles/active-directory/fundamentals/recover-from-deletions.md

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: fundamentals
1010
ms.topic: conceptual
11-
ms.date: 08/26/2022
11+
ms.date: 11/14/2022
1212
ms.author: jricketts
1313
ms.reviewer: jricketts
1414
ms.custom: "it-pro, seodec18"
@@ -89,19 +89,25 @@ The most frequent scenarios for application deletion are:
8989
* An administrator intentionally deletes the application, for example, in response to a support request.
9090
* An automation script in Microsoft Graph or PowerShell triggers the deletion. For example, you might want a process for deleting abandoned applications that are no longer used or managed. In general, create an offboarding process for applications rather than scripting to avoid unintentional deletions.
9191

92-
### Properties maintained with soft delete
92+
When you delete an application, the application registration by default enters the soft-delete state. To understand the relationship between application registrations and service principals, see [Apps and service principals in Azure AD - Microsoft identity platform](../develop/app-objects-and-service-principals.md).
9393

94-
| Object type| Important properties maintained |
95-
| - | - |
96-
| Users (including external users)| *All properties are maintained*, including ObjectID, group memberships, roles, licenses, and application assignments. |
97-
| Microsoft 365 Groups| *All properties are maintained*, including ObjectID, group memberships, licenses, and application assignments. |
98-
| Application registration| *All properties are maintained.* (See more information after this table.) |
94+
### Administrative units
9995

100-
When you delete an application, the application registration by default enters the soft-delete state. To understand the relationship between application registrations and service principals, see [Apps and service principals in Azure AD - Microsoft identity platform](../develop/app-objects-and-service-principals.md).
96+
The most common scenario for deletions is when administrative units (AU) are deleted by accident, although still needed.
10197

10298
## Recover from soft deletion
10399

104-
You can restore soft-deleted items in the Azure portal or with Microsoft Graph.
100+
You can restore soft-deleted items in the administrative portal, or by using Microsoft Graph. Not all object classes can manage soft-delete capabilities in the portal, some are only listed, viewed, hard deleted, or restored using the deletedItems Microsoft Graph API.
101+
102+
### Properties maintained with soft delete
103+
104+
|Object type|Important properties maintained|
105+
|---|---|
106+
|Users (including external users)|All properties maintained, including ObjectID, group memberships, roles, licenses, and application assignments|
107+
|Microsoft 365 Groups|All properties maintained, including ObjectID, group memberships, licenses, and application assignments|
108+
|Application registration | All properties maintained. See more information after this table.|
109+
|Service principal|All properties maintained|
110+
|Administrative unit (AU)|All properties maintained|
105111

106112
### Users
107113

@@ -125,15 +131,19 @@ For more information on how to restore soft-deleted Microsoft 365 Groups, see th
125131
* To restore from the Azure portal, see [Restore a deleted Microsoft 365 Group](../enterprise-users/groups-restore-deleted.md).
126132
* To restore by using Microsoft Graph, see [Restore deleted item – Microsoft Graph v1.0](/graph/api/directory-deleteditems-restore?tabs=http).
127133

128-
### Applications
134+
### Applications and service principals
129135

130136
Applications have two objects: the application registration and the service principal. For more information on the differences between the registration and the service principal, see [Apps and service principals in Azure AD](../develop/app-objects-and-service-principals.md).
131137

132138
To restore an application from the Azure portal, select **App registrations** > **Deleted applications**. Select the application registration to restore, and then select **Restore app registration**.
133139

134140
[![Screenshot that shows the app registration restore process in the azure portal.](./media/recoverability/deletion-restore-application.png)](./media/recoverability/deletion-restore-application.png#lightbox)
135141

136-
To restore applications using Microsoft Graph, see [Restore deleted item - Microsoft Graph v1.0.](/graph/api/directory-deleteditems-restore?tabs=http)
142+
Currently, service principals can be listed, viewed, hard deleted, or restored via the deletedItems Microsoft Graph API. To restore applications using Microsoft Graph, see [Restore deleted item - Microsoft Graph v1.0.](/graph/api/directory-deleteditems-restore?tabs=http).
143+
144+
### Administrative units
145+
146+
AUs can be listed, viewed, hard deleted, or restored via the deletedItems Microsoft Graph API. To restore AUs using Microsoft Graph, see [Restore deleted item - Microsoft Graph v1.0.](/graph/api/directory-deleteditems-restore?tabs=http).
137147

138148
## Hard deletions
139149

@@ -150,7 +160,7 @@ A hard deletion is the permanent removal of an object from your Azure AD tenant.
150160
151161
### When hard deletes usually occur
152162

153-
Hard deletes most often occur in the following circumstances.
163+
Hard deletes might occur in the following circumstances.
154164

155165
Moving from soft to hard delete:
156166

articles/active-directory/hybrid/how-to-connect-fed-o365-certs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The token signing and token decrypting certificates are usually self-signed cert
4242
>
4343
>
4444
45-
Azure AD attempts to monitor the federation metadata, and update the token signing certificates as indicated by this metadata. 30 days before the expiration of the token signing certificates, Azure AD checks if new certificates are available by polling the federation metadata.
45+
Azure AD attempts to monitor the federation metadata, and update the token signing certificates as indicated by this metadata. 35 days before the expiration of the token signing certificates, Azure AD checks if new certificates are available by polling the federation metadata.
4646

4747
* If it can successfully poll the federation metadata and retrieve the new certificates, no email notification is issued to the user.
4848
* If it cannot retrieve the new token signing certificates, either because the federation metadata is not reachable or automatic certificate rollover is not enabled, Azure AD issues an email.
@@ -101,13 +101,13 @@ Get-MsolFederationProperty -DomainName <domain.name> | FL Source, TokenSigningCe
101101
If the thumbprints in both the outputs match, your certificates are in sync with Azure AD.
102102

103103
### Step 3: Check if your certificate is about to expire
104-
In the output of either Get-MsolFederationProperty or Get-AdfsCertificate, check for the date under "Not After." If the date is less than 30 days away, you should take action.
104+
In the output of either Get-MsolFederationProperty or Get-AdfsCertificate, check for the date under "Not After." If the date is less than 35 days away, you should take action.
105105

106106
| AutoCertificateRollover | Certificates in sync with Azure AD | Federation metadata is publicly accessible | Validity | Action |
107107
|:---:|:---:|:---:|:---:|:---:|
108108
| Yes |Yes |Yes |- |No action needed. See [Renew token signing certificate automatically](#autorenew). |
109109
| Yes |No |- |Less than 15 days |Renew immediately. See [Renew token signing certificate manually](#manualrenew). |
110-
| No |- |- |Less than 30 days |Renew immediately. See [Renew token signing certificate manually](#manualrenew). |
110+
| No |- |- |Less than 35 days |Renew immediately. See [Renew token signing certificate manually](#manualrenew). |
111111

112112
\[-] Does not matter
113113

@@ -187,6 +187,6 @@ Token signing certificates are standard X509 certificates that are used to secur
187187

188188
By default, AD FS is configured to generate token signing and token decryption certificates automatically, both at the initial configuration time and when the certificates are approaching their expiration date.
189189

190-
Azure AD tries to retrieve a new certificate from your federation service metadata 30 days before the expiry of the current certificate. In case a new certificate is not available at that time, Azure AD will continue to monitor the metadata on regular daily intervals. As soon as the new certificate is available in the metadata, the federation settings for the domain are updated with the new certificate information. You can use `Get-MsolDomainFederationSettings` to verify if you see the new certificate in the NextSigningCertificate / SigningCertificate.
190+
Azure AD tries to retrieve a new certificate from your federation service metadata 35 days before the expiry of the current certificate. In case a new certificate is not available at that time, Azure AD will continue to monitor the metadata on regular daily intervals. As soon as the new certificate is available in the metadata, the federation settings for the domain are updated with the new certificate information. You can use `Get-MsolDomainFederationSettings` to verify if you see the new certificate in the NextSigningCertificate / SigningCertificate.
191191

192192
For more information on Token Signing certificates in AD FS see [Obtain and Configure Token Signing and Token Decryption Certificates for AD FS](/windows-server/identity/ad-fs/operations/configure-ts-td-certs-ad-fs)

articles/azure-monitor/alerts/alerts-manage-alert-rules.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ Manage your alert rules in the Azure portal, or using the CLI or PowerShell.
2828
## Enable recommended alert rules in the Azure portal (preview)
2929

3030
> [!NOTE]
31-
> The alert rule recommendations feature is currently in preview and is only enabled for VMs.
31+
> The alert rule recommendations feature is currently in preview and is only enabled for unmonitored:
32+
> - Virtual machines
33+
> - AKS resources
34+
> - Log Analytics workspaces
3235
3336
If you don't have alert rules defined for the selected resource, either individually or as part of a resource group or subscription, you can [create a new alert rule](alerts-log.md#create-a-new-log-alert-rule-in-the-azure-portal), or enable recommended out-of-the-box alert rules in the Azure portal.
3437

articles/azure-monitor/alerts/alerts-overview.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Once an alert is triggered, the alert is made up of:
4242
- The **user response** is set by the user and doesn’t change until the user changes it.
4343

4444
You can see all alert instances in all your Azure resources generated in the last 30 days on the **[Alerts page](alerts-page.md)** in the Azure portal.
45+
4546
## Types of alerts
4647

4748
There are four types of alerts. This table provides a brief description of each alert type.
@@ -53,12 +54,16 @@ See [this article](alerts-types.md) for detailed information about each alert ty
5354
|[Log alerts](alerts-types.md#log-alerts)|Log alerts allow users to use a Log Analytics query to evaluate resource logs at a predefined frequency.|
5455
|[Activity log alerts](alerts-types.md#activity-log-alerts)|Activity log alerts are triggered when a new activity log event occurs that matches the defined conditions.|
5556
|[Smart detection alerts](alerts-types.md#smart-detection-alerts)|Smart detection on an Application Insights resource automatically warns you of potential performance problems and failure anomalies in your web application. You can migrate smart detection on your Application Insights resource to create alert rules for the different smart detection modules.|
57+
5658
## Out-of-the-box alert rules (preview)
5759

5860
If you don't have alert rules defined for the selected resource, you can [enable recommended out-of-the-box alert rules in the Azure portal](alerts-manage-alert-rules.md#enable-recommended-alert-rules-in-the-azure-portal-preview).
5961

6062
> [!NOTE]
61-
> The alert rule recommendations feature is currently in preview and is only enabled for VMs.
63+
> The alert rule recommendations feature is currently in preview and is only enabled for unmonitored:
64+
> - Virtual machines
65+
> - AKS resources
66+
> - Log Analytics workspaces
6267
6368
## Azure role-based access control (Azure RBAC) for alerts
6469

articles/azure-monitor/app/java-jmx-metrics-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: How to configure JMX metrics - Azure Monitor application insights for Java
3-
description: Configure additional JMX metrics collection for Azure Monitor application insights Java agent
3+
description: Configure additional JMX metrics collection for Azure Monitor Application Insights Java agent
44
ms.topic: conceptual
55
ms.date: 03/16/2021
66
ms.devlang: java

articles/azure-monitor/change/change-analysis.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.topic: conceptual
55
ms.author: hannahhunter
66
author: hhunter-ms
77
ms.contributor: cawa
8-
ms.date: 08/23/2022
8+
ms.date: 11/15/2022
99
ms.subservice: change-analysis
1010
ms.custom: devx-track-azurepowershell, ignite-2022
1111
---
@@ -32,7 +32,7 @@ Change Analysis detects various types of changes, from the infrastructure layer
3232

3333
The following diagram illustrates the architecture of Change Analysis:
3434

35-
![Architecture diagram of how Change Analysis gets change data and provides it to client tools](./media/change-analysis/overview.png)
35+
:::image type="content" source="./media/change-analysis/architecture-overview.png" alt-text="Architecture diagram of how Change Analysis gets change data and provides it to client tools.":::
3636

3737
## Supported resource types
3838

@@ -126,6 +126,8 @@ Currently the following dependencies are supported in **Web App Diagnose and sol
126126
- **App Services file changes**: File changes take up to 30 minutes to display.
127127
- **App Services configuration changes**: Due to the snapshot approach to configuration changes, timestamps of configuration changes could take up to 6 hours to display from when the change actually happened.
128128
- **Web app deployment and configuration changes**: Since these changes are collected by a site extension and stored on disk space owned by your application, data collection and storage is subject to your application's behavior. Check to see if a misbehaving application is affecting the results.
129+
- **Snapshot retention for all changes**: The Change Analysis data for resources is tracked by Azure Resource Graphs (ARG). ARG keeps snapshot history of tracked resources only for 14 days.
130+
129131

130132
## Next steps
131133

71 KB
Loading

articles/azure-resource-manager/bicep/loops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Using loops in Bicep has these limitations:
6666
- Bicep loops only work with values that can be determined at the start of deployment.
6767
- Loop iterations can't be a negative number or exceed 800 iterations.
6868
- Can't loop a resource with nested child resources. Change the child resources to top-level resources. See [Iteration for a child resource](#iteration-for-a-child-resource).
69-
- To loop on multiple levels of properties, use [lambda map function](./bicep-functions-lambda.md#map).
69+
- To loop on multiple levels of properties, use the [lambda map function](./bicep-functions-lambda.md#map).
7070

7171
## Integer index
7272

0 commit comments

Comments
 (0)