Skip to content

Commit 9d46b99

Browse files
authored
Merge pull request #242938 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 6db6c79 + e1737d1 commit 9d46b99

File tree

40 files changed

+768
-218
lines changed

40 files changed

+768
-218
lines changed

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In this article, learn about MAU and Go Local billing, linking Azure AD B2C tena
2222

2323
## MAU overview
2424

25-
A monthly active user (MAU) is a unique user that performs an authentication within a given month. A user that authenticates multiple times within a given month is counted as one MAU. Customers aren't charged for a MAU’s subsequent authentications during the month, nor for inactive users. Authentications may include:
25+
A monthly active user (MAU) is a unique user that performs an authentication within a given month. A user that authenticates at least once within a given month is counted as one MAU. Customers aren't charged for a MAU’s subsequent authentications during the month, nor for inactive users. Authentications may include:
2626

2727
- Active, interactive sign in by the user. For example, [sign-up or sign in](add-sign-up-and-sign-in-policy.md), [self-service password reset](add-password-reset-policy.md), or any type of [user flow](user-flow-overview.md) or [custom policy](custom-policy-overview.md).
2828
- Passive, non-interactive sign in such as [single sign-on (SSO)](session-behavior.md), or any type of token acquisition. For example, authorization code flow, token refresh, or [resource owner password credentials flow](add-ropc-policy.md).

articles/active-directory/saas-apps/mural-identity-provisioning-tutorial.md

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ This tutorial describes the steps you need to perform in both MURAL Identity and
2222
## Capabilities Supported
2323
> [!div class="checklist"]
2424
> * Create users in MURAL Identity
25+
> * Remove users in MURAL Identity when they do not require access anymore.
2526
> * Keep user attributes synchronized between Azure AD and MURAL Identity
27+
> * Provision groups and group memberships in MURAL Identity.
28+
> * [Single sign-on](mural-identity-tutorial.md) to MURAL Identity (recommended).
2629
2730
## Prerequisites
2831

@@ -35,8 +38,8 @@ The scenario outlined in this tutorial assumes that you already have the followi
3538

3639
## Step 1. Plan your provisioning deployment
3740
1. Learn about [how the provisioning service works](../app-provisioning/user-provisioning.md).
38-
2. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
39-
3. Determine what data to [map between Azure AD and MURAL Identity](../app-provisioning/customize-application-attributes.md).
41+
1. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
42+
1. Determine what data to [map between Azure AD and MURAL Identity](../app-provisioning/customize-application-attributes.md).
4043

4144
## Step 2. Configure MURAL Identity to support provisioning with Azure AD
4245

@@ -65,42 +68,50 @@ This section guides you through the steps to configure the Azure AD provisioning
6568

6669
![Enterprise applications blade](common/enterprise-applications.png)
6770

68-
2. In the applications list, select **MURAL Identity**.
71+
1. In the applications list, select **MURAL Identity**.
6972

7073
![The MURAL Identity link in the Applications list](common/all-applications.png)
7174

72-
3. Select the **Provisioning** tab.
75+
1. Select the **Provisioning** tab.
7376

7477
![Provisioning tab](common/provisioning.png)
7578

76-
4. Set the **Provisioning Mode** to **Automatic**.
79+
1. Set the **Provisioning Mode** to **Automatic**.
7780

7881
![Provisioning](common/provisioning-automatic.png)
7982

80-
5. Under the **Admin Credentials** section, input your MURAL Identity Tenant URL and Secret Token. Click **Test Connection** to ensure Azure AD can connect to MURAL Identity. If the connection fails, ensure your MURAL Identity account has Admin permissions and try again.
83+
1. Under the **Admin Credentials** section, input your MURAL Identity Tenant URL and Secret Token. Click **Test Connection** to ensure Azure AD can connect to MURAL Identity. If the connection fails, ensure your MURAL Identity account has Admin permissions and try again.
8184

8285
![Token](common/provisioning-testconnection-tenanturltoken.png)
8386

84-
6. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications and select the **Send an email notification when a failure occurs** check box.
87+
1. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications and select the **Send an email notification when a failure occurs** check box.
8588

8689
![Notification Email](common/provisioning-notification-email.png)
8790

88-
7. Select **Save**.
91+
1. Select **Save**.
8992

90-
8. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to MURAL Identity**.
93+
1. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to MURAL Identity**.
9194

92-
9. Review the user attributes that are synchronized from Azure AD to MURAL Identity in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in MURAL Identity for update operations. If you choose to change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you will need to ensure that the MURAL Identity API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
95+
1. Review the user attributes that are synchronized from Azure AD to MURAL Identity in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in MURAL Identity for update operations. If you choose to change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you will need to ensure that the MURAL Identity API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
9396

94-
|Attribute|Type|Supported for filtering|
95-
|---|---|---|
96-
|userName|String|✓
97-
|active|Boolean|
98-
|emails[type eq "work"].value|String|
99-
|name.givenName|String|
100-
|name.familyName|String|
101-
|externalId|String|
97+
|Attribute|Type|Supported for filtering|Required by MURAL Identity
98+
|---|---|---|---
99+
|userName|String|✓|✓
100+
|emails[type eq "work"].value|String||✓
101+
|active|Boolean||
102+
|name.givenName|String||
103+
|name.familyName|String||
104+
|externalId|String||
102105

106+
1. Under the **Mappings** section, select **Synchronize Azure Active Directory Groups to MURAL Identity**.
103107

108+
1. Review the group attributes that are synchronized from Azure AD to MURAL Identity in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the groups in MURAL Identity for update operations. Select the **Save** button to commit any changes.
109+
110+
|Attribute|Type|Supported for filtering|Required by MURAL Identity|
111+
|---|---|---|---|
112+
|displayName|String|✓|✓
113+
|members|Reference||
114+
|externalId|String||
104115
10. To configure scoping filters, refer to the following instructions provided in the [Scoping filter tutorial](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
105116

106117
11. To enable the Azure AD provisioning service for MURAL Identity, change the **Provisioning Status** to **On** in the **Settings** section.
@@ -120,15 +131,18 @@ This operation starts the initial synchronization cycle of all users and groups
120131
## Step 6. Monitor your deployment
121132
Once you've configured provisioning, use the following resources to monitor your deployment:
122133

123-
1. Use the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md) to determine which users have been provisioned successfully or unsuccessfully
124-
2. Check the [progress bar](../app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user.md) to see the status of the provisioning cycle and how close it is to completion
125-
3. If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
134+
* Use the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md) to determine which users have been provisioned successfully or unsuccessfully
135+
* Check the [progress bar](../app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user.md) to see the status of the provisioning cycle and how close it is to completion
136+
* If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
126137

127138
## Troubleshooting Tips
128139
* When provisioning a user keep in mind that at MURAL we do not support numbers in the name fields (i.e. givenName or familyName).
129140
* When filtering on **userName** in the GET endpoint make sure that the email address is all lowercase otherwise you will get an empty result. This is because we convert email addresses to lowercase while provisioning accounts.
130141
* When de-provisioning an end-user (setting the active attribute to false), user will be soft-deleted and lose access to all their workspaces. When that same de-provisioned end-user is later activated again (setting the active attribute to true), user will not have access to the workspaces user previously belonged to. The end-user will see an error message "You’ve been deactivated from this workspace", with an option to request reactivation which the workspace admin must approve.
131-
* If you have any other issues, please reach out to [MURAL Identity support team](mailto:[email protected])
142+
* If you have any other issues, please reach out to [MURAL Identity support team](mailto:[email protected]).
143+
144+
## Change log
145+
06/22/2023 - Added support for **Group Provisioning**.
132146

133147
## More resources
134148

articles/active-directory/saas-apps/shopify-plus-provisioning-tutorial.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,13 @@ This section guides you through the steps to configure the Azure AD provisioning
101101

102102
9. Review the user attributes that are synchronized from Azure AD to Shopify Plus in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in Shopify Plus for update operations. If you choose to change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you will need to ensure that the Shopify Plus API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
103103

104-
|Attribute|Type|Supported for Filtering|
105-
|---|---|---|
106-
|userName|String|✓|
104+
|Attribute|Type|Supported for Filtering|Required by Shopify Plus
105+
|---|---|---|---
106+
|userName|String|✓|✓
107+
|roles|String||
107108
|active|Boolean|
108-
|name.givenName|String|
109-
|name.familyName|String|
109+
|name.givenName|String||✓
110+
|name.familyName|String||✓
110111

111112

112113
10. To configure scoping filters, refer to the following instructions provided in the [Scoping filter tutorial](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
@@ -130,7 +131,10 @@ Once you've configured provisioning, use the following resources to monitor your
130131

131132
1. Use the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md) to determine which users have been provisioned successfully or unsuccessfully
132133
2. Check the [progress bar](../app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user.md) to see the status of the provisioning cycle and how close it is to completion
133-
3. If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
134+
3. If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).
135+
136+
## Change log
137+
06/22/2023 - Added support for **roles**.
134138

135139
## Additional resources
136140

articles/aks/start-stop-cluster.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ You may not need to continuously run your Azure Kubernetes Service (AKS) workloa
1212

1313
To better optimize your costs during these periods, you can turn off, or stop, your cluster. This action stops your control plane and agent nodes, allowing you to save on all the compute costs, while maintaining all objects except standalone pods. The cluster state is stored for when you start it again, allowing you to pick up where you left off.
1414

15+
> [!NOTE]
16+
> AKS start operations will restore all objects from ETCD with the exception of standalone pods with the same names and ages. meaning that a pod's age will continue to be calculated from its original creation time. This count will keep increasing over time, regardless of whether the cluster is in a stopped state.
17+
1518
## Before you begin
1619

1720
This article assumes you have an existing AKS cluster. If you need an AKS cluster, you can create one using [Azure CLI][aks-quickstart-cli], [Azure PowerShell][aks-quickstart-powershell], or the [Azure portal][aks-quickstart-portal].

articles/azure-monitor/logs/basic-logs-configure.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ Configure a table for Basic logs if:
5050
| API Management | [ApiManagementGatewayLogs](/azure/azure-monitor/reference/tables/ApiManagementGatewayLogs)<br>[ApiManagementWebSocketConnectionLogs](/azure/azure-monitor/reference/tables/ApiManagementWebSocketConnectionLogs) |
5151
| Application Insights | [AppTraces](/azure/azure-monitor/reference/tables/apptraces) |
5252
| Chaos Experiments | [ChaosStudioExperimentEventLogs](/azure/azure-monitor/reference/tables/ChaosStudioExperimentEventLogs) |
53+
| Cloud HSM | [CHSMManagementAuditLogs](/azure/azure-monitor/reference/tables/CHSMManagementAuditLogs) |
5354
| Container Apps | [ContainerAppConsoleLogs](/azure/azure-monitor/reference/tables/containerappconsoleLogs) |
5455
| Container Insights | [ContainerLogV2](/azure/azure-monitor/reference/tables/containerlogv2) |
5556
| Container Apps Environments | [AppEnvSpringAppConsoleLogs](/azure/azure-monitor/reference/tables/AppEnvSpringAppConsoleLogs) |
5657
| Communication Services | [ACSCallAutomationIncomingOperations](/azure/azure-monitor/reference/tables/ACSCallAutomationIncomingOperations)<br>[ACSCallAutomationMediaSummary](/azure/azure-monitor/reference/tables/ACSCallAutomationMediaSummary)<br>[ACSCallRecordingIncomingOperations](/azure/azure-monitor/reference/tables/ACSCallRecordingIncomingOperations)<br>[ACSCallRecordingSummary](/azure/azure-monitor/reference/tables/ACSCallRecordingSummary)<br>[ACSRoomsIncomingOperations](/azure/azure-monitor/reference/tables/acsroomsincomingoperations) |
5758
| Confidential Ledgers | [CCFApplicationLogs](/azure/azure-monitor/reference/tables/CCFApplicationLogs) |
58-
| Custom tables | All custom tables created with or migrated to the [data collection rule (DCR)-based logs ingestion API.](logs-ingestion-api-overview.md) |
59+
| Custom log tables | All custom tables created with or migrated to the [data collection rule (DCR)-based logs ingestion API.](logs-ingestion-api-overview.md) |
5960
| Data Manager for Energy | [OEPDataplaneLogs](/azure/azure-monitor/reference/tables/OEPDataplaneLogs) |
6061
| Dedicated SQL Pool | [SynapseSqlPoolSqlRequests](/azure/azure-monitor/reference/tables/synapsesqlpoolsqlrequests)<br>[SynapseSqlPoolRequestSteps](/azure/azure-monitor/reference/tables/synapsesqlpoolrequeststeps)<br>[SynapseSqlPoolExecRequests](/azure/azure-monitor/reference/tables/synapsesqlpoolexecrequests)<br>[SynapseSqlPoolDmsWorkers](/azure/azure-monitor/reference/tables/synapsesqlpooldmsworkers)<br>[SynapseSqlPoolWaits](/azure/azure-monitor/reference/tables/synapsesqlpoolwaits) |
6162
| Dev Center | [DevCenterDiagnosticLogs](/azure/azure-monitor/reference/tables/DevCenterDiagnosticLogs) |

articles/backup/azure-backup-architecture-for-sap-hana-backup.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Backup Architecture for SAP HANA Backup
33
description: Learn about Azure Backup architecture for SAP HANA backup.
44
ms.topic: conceptual
5-
ms.date: 09/07/2022
5+
ms.date: 06/20/2023
66
ms.service: backup
77
ms.custom: ignite-2022
88
author: jyothisuri
@@ -65,7 +65,7 @@ See the [high-level architecture of Azure Backup for SAP HANA databases](./sap-h
6565

6666
### Backup flow
6767

68-
This section provides you an understanding about the backup process of an HANA database running on an Azure VM.
68+
This section provides you with an understanding about the backup process of an HANA database running on an Azure VM.
6969

7070
1. The scheduled backups are managed by crontab entries created on the HANA VM, while the on-demand backups are directly triggered by the Azure Backup service.
7171

@@ -100,7 +100,7 @@ In the following sections you'll learn about different SAP HANA setups and their
100100

101101
:::image type="content" source="./media/azure-backup-architecture-for-sap-hana-backup/azure-network-with-udr-and-nva-or-azure-firewall-and-private-endpoint-or-service-endpoint.png" alt-text="Diagram showing the SAP HANA setup if Azure network with UDR + NVA / Azure Firewall + Private Endpoint or Service Endpoint.":::
102102

103-
### Backup architecture for database with HANA System Replication (preview)
103+
### Backup architecture for database with HANA System Replication
104104

105105
The backup service resides in both the physical nodes of the HSR setup. Once you confirm that these nodes are in a replication group (using the [pre-registration script](sap-hana-database-with-hana-system-replication-backup.md#run-the-preregistration-script)), Azure Backup groups the nodes logically, and creates a single backup item during protection configuration.
106106

@@ -119,7 +119,7 @@ In the following sections, you'll learn about the backup flow for new/existing m
119119

120120
##### New machines
121121

122-
This section provides you an understanding about the backup process of an HANA database with HANA System replication enabled running on a new Azure VM.
122+
This section provides you with an understanding about the backup process of an HANA database with HANA System replication enabled running on a new Azure VM.
123123

124124
1. Create a custom user and `hdbuserstore` key on all the nodes.
125125
1. Run the pre-registration script on both the nodes with the custom user as the backup user to implement an ID, which indicates that both the nodes belong to a unique/common group.
@@ -128,7 +128,7 @@ This section provides you an understanding about the backup process of an HANA d
128128

129129
##### Existing machines
130130

131-
This section provides you an understanding about the backup process of an HANA database with HANA System replication enabled running on an existing Azure VM.
131+
This section provides you with an understanding about the backup process of an HANA database with HANA System replication enabled running on an existing Azure VM.
132132

133133
1. Stop protection and retain data for both the nodes.
134134
1. Run the pre-registration script on both the nodes with the custom user as the backup user to mention an ID, which indicates that both the nodes belong to a unique/common group.

articles/backup/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ landingContent:
6161
linkLists:
6262
- linkListType: whats-new
6363
links:
64-
- text: Selective disk backup and restore for Azure VMs
65-
url: selective-disk-backup-restore.md
6664
- text: Soft Delete for Azure Backup
6765
url: backup-azure-security-feature-cloud.md
6866
- text: Enhanced soft delete for Azure Backup (preview)
@@ -81,6 +79,8 @@ landingContent:
8179
url: blob-backup-overview.md
8280
- text: Selective Disk backup with Enhanced policy for Azure VM (preview)
8381
url: selective-disk-backup-restore.md
82+
- text: SAP HANA System Replication backup
83+
url: sap-hana-database-about.md#back-up-a-hana-system-with-replication-enabled
8484
# Card
8585
- title: Back up Azure VMs
8686
linkLists:
@@ -129,7 +129,7 @@ landingContent:
129129
links:
130130
- text: Back up SAP HANA databases on Azure VMs
131131
url: backup-azure-sap-hana-database.md
132-
- text: Back up SAP HSR databases on Azure VMs (preview)
132+
- text: Back up SAP HSR databases on Azure VMs
133133
url: sap-hana-database-with-hana-system-replication-backup.md
134134
- text: Back up SAP HANA databases' instance snapshots on Azure VMs (preview)
135135
url: sap-hana-database-instances-backup.md
Loading
38.4 KB
Loading
68.5 KB
Loading

0 commit comments

Comments
 (0)