Skip to content

Commit ca8aa3f

Browse files
authored
Merge pull request #111070 from yossi-y/patch-69
edits
2 parents 1d6cb8d + 54e4691 commit ca8aa3f

File tree

1 file changed

+21
-19
lines changed

1 file changed

+21
-19
lines changed

articles/azure-monitor/platform/customer-managed-keys.md

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -144,23 +144,23 @@ Some of the operations in this configuration procedure run asynchronously becaus
144144

145145
You can check the status of the asynchronous operation by sending a GET request to the *Azure-AsyncOperation* header value:
146146
```rst
147-
GET "https://management.azure.com/subscriptions/ subscription-id/providers/Microsoft.OperationalInsights/locations/region-name/operationStatuses/operation-id?api-version=2015-11-01-preview
147+
GET https://management.azure.com/subscriptions/ subscription-id/providers/Microsoft.OperationalInsights/locations/region-name/operationStatuses/operation-id?api-version=2015-11-01-preview
148148
Authorization: Bearer <token>
149149
```
150150

151-
The body of the response from the operation contains information about the operation and the *Status* property indicates its state. The asynchronous operations in this configuration procedure and their statuses are:
151+
The body of the response from the operation contains information about the operation including *Status*. The asynchronous operations in this configuration and their statuses are:
152152

153-
**Creating a *Cluster* resource**
154-
* ProvisioningAccount -- ADX cluster is in provisioning
155-
* Succeeded -- ADX cluster provisioning is completed
153+
* Creating a *Cluster* resource
154+
* ProvisioningAccount -- ADX cluster is in provisioning
155+
* Succeeded -- provisioning is completed
156156

157-
**Granting permissions to your Key Vault**
158-
* Updating -- Key identifier details update is in progress
159-
* Succeeded -- Update completed
157+
* Granting permissions to your Key Vault
158+
* Updating -- Key identifier details update is in progress
159+
* Succeeded -- update completed
160160

161-
**Associating Log Analytics workspaces**
162-
* Linking -- Workspace association to cluster is in progress
163-
* Succeeded -- Association completed
161+
* Associating Log Analytics workspaces
162+
* Linking -- workspace association to cluster is in progress
163+
* Succeeded -- association completed
164164

165165

166166
### Subscription whitelisting
@@ -174,6 +174,8 @@ CMK capability is an early access feature. The subscriptions where you plan to c
174174

175175
Create or use an Azure Key Vault that you already have to generate, or import a key to be used for data encryption. The Azure Key Vault must be configured as recoverable to protect your key and the access to your data in Azure Monitor. You can verify this configuration under properties in your Key Vault, both *Soft delete* and *Purge protection* should be enabled.
176176

177+
![Soft delete and purge protection settings](media/customer-managed-keys/soft-purge-protection.png)
178+
177179
These settings are available via CLI and PowerShell:
178180
- [Soft Delete](https://docs.microsoft.com/azure/key-vault/key-vault-ovw-soft-delete)
179181
- [Purge protection](https://docs.microsoft.com/azure/key-vault/key-vault-ovw-soft-delete#purge-protection) guards against force deletion of the secret / vault even after soft delete
@@ -216,7 +218,7 @@ The identity is assigned to the *Cluster* resource at creation time.
216218
200 OK and header when accepted.
217219
>[!Important]
218220
> During the early access period of the feature, the ADX cluster is provisioned manually. While it takes the provisioning of the underly ADX cluster a while to complete, you can check the provisioning state in two ways:
219-
> 1. Copy the *Azure-AsyncOperation* URL value from the response and use it for the operation status check in [asynchronous operations](#asynchronous-operations-and-status-check)
221+
> 1. Copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
220222
> 2. Send a GET request on the *Cluster* resource and look at the *provisioningState* value. It is *ProvisioningAccount* while provisioning and *Succeeded* when completed.
221223
222224
### Azure Monitor data-store (ADX cluster) provisioning
@@ -318,7 +320,7 @@ Content-type: application/json
318320
200 OK and header when accepted.
319321
>[!Important]
320322
> It takes the propagation of the Key identifier a few minutes to complete. You can check the provisioning state in two ways:
321-
> 1. Copy the *Azure-AsyncOperation* URL value from the response and use it for the operation status check in [asynchronous operations](#asynchronous-operations-and-status-check)
323+
> 1. Copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
322324
> 2. Send a GET request on the *Cluster* resource and look at the *KeyVaultProperties* properties. Your recently updated Key identifier details should return in the response.
323325
324326
A response to GET request on the *Cluster* resource should look like this when Key identifier update is complete:
@@ -385,10 +387,9 @@ Content-type: application/json
385387

386388
200 OK and header when accepted.
387389
>[!Important]
388-
> It can operation up to 90 minutes to complete. Data ingested to your workspaces is stored encrypted with your managed key only after a successful workspaces association.
389-
> To check the workspace association state, copy the *Azure-AsyncOperation* URL value from the response and use it for the operation status check in [asynchronous operations](# asynchronous-operations-and-status-check)
390+
> Ingested data is stored encrypted with your managed key after association operation, which can take up to 90 minutes to complete. To check the workspace association state, copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
390391
391-
You can check the *Cluster* resource associated to your workspace by sending a GET request to [Workspaces – Get](https://docs.microsoft.com/rest/api/loganalytics/workspaces/get) and observing the response. The *clusterResourceId* indicates on the *Cluster* resource ID.
392+
You can verify if your workspace was associated to a Cluster resource by sending a GET request to [Workspaces – Get](https://docs.microsoft.com/rest/api/loganalytics/workspaces/get) and observing the response. The clusterResourceId indicates on the Cluster resource ID.
392393

393394
```rest
394395
GET https://management.azure.com/subscriptions/<subscription-id>/resourcegroups/<resource-group-name>/providers/microsoft.operationalInsights/workspaces/<workspace-name>?api-version=2015-11-01-preview
@@ -609,10 +610,11 @@ Content-type: application/json
609610

610611
**Response**
611612

612-
202 Accepted. This is a standard Resource Manager response for asynchronous operations.
613-
613+
200 OK and header when accepted.
614614
>[!Important]
615-
> It takes the provisioning of the underly ADX cluster a few minutes to complete. You can verify the provisioning state when performing GET REST API call on the *Cluster* resource and looking at the *provisioningState* value. It is *ProvisioningAccount* while provisioning and "Succeeded" when completed.
615+
> During the early access period of the feature, the ADX cluster is provisioned manually. While it takes the provisioning of the underly ADX cluster a while to complete, you can check the provisioning state in two ways:
616+
> 1. Copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
617+
> 2. Send a GET request on the *Cluster* resource and look at the *provisioningState* value. It is *ProvisioningAccount* while provisioning and *Succeeded* when completed.
616618
617619
### Associate a component to a *Cluster* resource using [Components - Create Or Update](https://docs.microsoft.com/rest/api/application-insights/components/createorupdate) API
618620

0 commit comments

Comments
 (0)