Skip to content

Commit 163055c

Browse files
authored
Merge pull request #209725 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b35024b + c8d160d commit 163055c

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

articles/azure-arc/kubernetes/cluster-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ A conceptual overview of this feature is available in [Cluster connect - Azure A
186186
```
187187

188188
```console
189-
TOKEN=$(kubectl get secret demo-user-secret -o jsonpath='{$.data.token}' | base64 -d | sed $'s/$/\\\n/g')
189+
TOKEN=$(kubectl get secret demo-user-secret -o jsonpath='{$.data.token}' | base64 -d | sed 's/$/\\\n/g')
190190
```
191191
1. Get the token to output to console
192192

articles/azure-vmware/concepts-identity.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The CloudAdmin role in Azure VMware Solution has the following privileges on vCe
3333
| Privilege | Description |
3434
| --------- | ----------- |
3535
| **Alarms** | Acknowledge alarm<br />Create alarm<br />Disable alarm action<br />Modify alarm<br />Remove alarm<br />Set alarm status |
36-
| **Content Library** | Add library item<br />Create a subscription for a published library<br />Create local library<br />Create subscribed library<br />Delete library item<br />Delete local library<br />Delete subscribed library<br />Delete subscription of a published library<br />Download files<br />Evict library items<br />Evict subscribed library<br />Import storage<br />Probe subscription information<br />Publish a library item to its subscribers<br />Publish a library to its subscribers<br />Read storage<br />Sync library item<br />Sync subscribed library<br />Type introspection<br />Update configuration settings<br />Update files<br />Update library<br />Update library item<br />Update local library<br />Update subscribed library<br />Update subscription of a published library<br />View configuration settings |
36+
| **Content Library** | Add library item<br />Add root certificate to trust store<br />Check in a template<br />Check out a template<br />Create a subscription for a published library<br />Create local library<br />Create or delete a Harbor registry<br />Create subscribed library<br />Create, delete or purge a Harbor registry project<br />Delete library item<br />Delete local library<br />Delete root certificate from trust store<br />Delete subscribed library<br />Delete subscription of a published library<br />Download files<br />Evict library items<br />Evict subscribed library<br />Import storage<br />Manage Harbor registry resources on specified compute resource<br />Probe subscription information<br />Publish a library item to its subscribers<br />Publish a library to its subscribers<br />Read storage<br />Sync library item<br />Sync subscribed library<br />Type introspection<br />Update configuration settings<br />Update files<br />Update library<br />Update library item<br />Update local library<br />Update subscribed library<br />Update subscription of a published library<br />View configuration settings |
3737
| **Cryptographic operations** | Direct access |
3838
| **Datastore** | Allocate space<br />Browse datastore<br />Configure datastore<br />Low-level file operations<br />Remove files<br />Update virtual machine metadata |
3939
| **Folder** | Create folder<br />Delete folder<br />Move folder<br />Rename folder |
@@ -53,9 +53,10 @@ The CloudAdmin role in Azure VMware Solution has the following privileges on vCe
5353

5454
### Create custom roles on vCenter Server
5555

56-
Azure VMware Solution supports the use of custom roles with equal or lesser privileges than the CloudAdmin role.
56+
Azure VMware Solution supports the use of custom roles with equal or lesser privileges than the CloudAdmin role. You'll use the CloudAdmin role to create, modify, or delete custom roles with privileges lesser than or equal to their current role.
5757

58-
You'll use the CloudAdmin role to create, modify, or delete custom roles with privileges lesser than or equal to their current role. You can create roles with privileges greater than CloudAdmin. You can't assign the role to any users or groups or delete the role.
58+
>[!NOTE]
59+
>You can create roles with privileges greater than CloudAdmin. However, you can't assign the role to any users or groups or delete the role. Roles that have privileges greater than that of CloudAdmin is unsupported.
5960
6061
To prevent creating roles that can't be assigned or deleted, clone the CloudAdmin role as the basis for creating new custom roles.
6162

@@ -71,7 +72,7 @@ To prevent creating roles that can't be assigned or deleted, clone the CloudAdmi
7172
7273
1. Provide the name you want for the cloned role.
7374

74-
1. Add or remove privileges for the role and select **OK**. The cloned role is visible in the **Roles** list.
75+
1. Remove privileges for the role and select **OK**. The cloned role is visible in the **Roles** list.
7576

7677
#### Apply a custom role
7778

@@ -84,9 +85,12 @@ To prevent creating roles that can't be assigned or deleted, clone the CloudAdmi
8485
1. Search for the user or group after selecting the Identity Source under the **User** section.
8586

8687
1. Select the role that you want to apply to the user or group.
88+
>[!NOTE]
89+
>Attempting to apply a user or group to a role that has privileges greater than that of CloudAdmin will result in errors.
8790
8891
1. Check the **Propagate to children** if needed, and select **OK**. The added permission displays in the **Permissions** section.
8992

93+
9094
## NSX-T Manager access and identity
9195

9296
When a private cloud is provisioned using Azure portal, software-defined data center (SDDC) management components like vCenter Server and NSX-T Manager are provisioned for customers.

articles/data-factory/wrangling-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 07/29/2021
1313

1414
[!INCLUDE[appliesto-adf-xxx-md](includes/appliesto-adf-xxx-md.md)]
1515

16-
Organizations need to the ability to explore their critical business data for data preparation and wrangling in order to provide accurate analysis of complex data that continues to grow every day. Data preparation is required so that organizations can use the data in various business processes and reduce the time to value.
16+
Organizations need to have the ability to explore their critical business data for data preparation and wrangling in order to provide accurate analysis of complex data that continues to grow every day. Data preparation is required so that organizations can use the data in various business processes and reduce the time to value.
1717

1818
Data Factory empowers you with code-free data preparation at cloud scale iteratively using Power Query. Data Factory integrates with [Power Query Online](/power-query/) and makes Power Query M functions available as a pipeline activity.
1919

articles/governance/resource-graph/tutorials/logic-app-calling-arg.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Keep the query above handy as we will need it later when we configure our Logic
4444
1. From the portal menu, select **Logic Apps**, or use the Azure search box at the top of all
4545
pages to search for and select **Logic Apps**.
4646

47-
2. Click the **Create** button on upper left of your screen and continue with creating your Logic App.
47+
2. Click the **Add** button on upper left of your screen and continue with creating your Logic App.
4848

4949
## Setup a Managed Identity
5050

articles/machine-learning/how-to-use-batch-endpoint-sdk-v2.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ A deployment is a set of resources required for hosting the model that does the
202202

203203
Using the `MLClient` created earlier, we'll get a handle to the endpoint. The endpoint can be invoked using the `invoke` command with the following parameters:
204204

205-
* `name` - Name of the endpoint
205+
* `endpoint_name` - Name of the endpoint
206206
* `input` - Path where input data is present
207207
* `deployment_name` - Name of the specific deployment to test in an endpoint
208208

@@ -242,6 +242,12 @@ Delete endpoint
242242
ml_client.batch_endpoints.begin_delete(name=batch_endpoint_name)
243243
```
244244

245+
Delete compute: optional, as you may choose to reuse your compute cluster with later deployments.
246+
247+
```python
248+
ml_client.compute.begin_delete(name=compute_name)
249+
```
250+
245251
## Next steps
246252

247253
If you encounter problems using batch endpoints, see [Troubleshooting batch endpoints](how-to-troubleshoot-batch-endpoints.md).

0 commit comments

Comments
 (0)