Skip to content

Commit e33351d

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 2e7ee54 + e0a1a9e commit e33351d

File tree

64 files changed

+591
-519
lines changed

Some content is hidden

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

64 files changed

+591
-519
lines changed

articles/active-directory/manage-apps/application-proxy-integrate-with-sharepoint-server.md

Lines changed: 122 additions & 107 deletions
Large diffs are not rendered by default.
Loading
14.7 KB
Loading
2.9 KB
Loading
Loading

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,7 @@ Graph displayName | Azure portal display name | directoryRoleTemplateId
16001600
Application Administrator | Application administrator | 9B895D92-2CD3-44C7-9D02-A6AC2D5EA5C3
16011601
Application Developer | Application developer | CF1C38E5-3621-4004-A7CB-879624DCED7C
16021602
Authentication Administrator | Authentication administrator | c4e39bd9-1100-46d3-8c65-fb160da0071f
1603+
Azure DevOps Administrator | Azure DevOps administrator | e3973bdf-4987-49ae-837a-ba8e231c7286
16031604
Azure Information Protection Administrator | Azure Information Protection administrator | 7495fdc4-34c4-4d15-a289-98788ce399fd
16041605
B2C User flow Administrator | B2C User flow Administrator | 6e591065-9bad-43ed-90f3-e9424366d2f0
16051606
B2C User Flow Attribute Administrator | B2C User Flow Attribute Administrator | 0f971eea-41eb-4569-a71e-57bb8a3eff1e

articles/application-gateway/application-gateway-end-to-end-ssl-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Using all the preceding steps, create the application gateway. The creation of t
224224
225225
For V1 SKU use the below command
226226
```powershell
227-
$appgw = New-AzApplicationGateway -Name appgateway -SSLCertificates $cert -ResourceGroupName "appgw-rg" -Location "West US" -BackendAddressPools $pool -BackendHttpSettingsCollection $poolSetting01 -FrontendIpConfigurations $fipconfig -GatewayIpConfigurations $gipconfig -FrontendPorts $fp -HttpListeners $listener -RequestRoutingRules $rule -Sku $sku -SSLPolicy $SSLPolicy -AuthenticationCertificates $authcert -Verbose
227+
$appgw = New-AzApplicationGateway -Name appgateway -SSLCertificates $cert -ResourceGroupName "appgw-rg" -Location "West US" -BackendAddressPools $pool -BackendHttpSettingsCollection $poolSetting -FrontendIpConfigurations $fipconfig -GatewayIpConfigurations $gipconfig -FrontendPorts $fp -HttpListeners $listener -RequestRoutingRules $rule -Sku $sku -SSLPolicy $SSLPolicy -AuthenticationCertificates $authcert -Verbose
228228
```
229229

230230
For V2 SKU use the below command

articles/azure-monitor/platform/delete-workspace.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: log-analytics
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: conceptual
14-
ms.date: 05/07/2018
14+
ms.date: 09/26/2019
1515
ms.author: magoedte
1616
---
1717

@@ -36,7 +36,7 @@ The workspace delete operation removes the workspace Resource Manager resource,
3636
> [!NOTE]
3737
> Installed solutions and linked services like Automation account are permanently removed from the workspace at deletion time and can’t be recovered. These should be reconfigured after the recovery operation to bring the workspace to its previous functionality.
3838
39-
You can delete a workspace using [PowerShell](https://docs.microsoft.com/powershell/module/azurerm.operationalinsights/remove-azurermoperationalinsightsworkspace?view=azurermps-6.13.0), [API](https://docs.microsoft.com/rest/api/loganalytics/workspaces/delete), or in [Azure portal](https://portal.azure.com).
39+
You can delete a workspace using [PowerShell](https://docs.microsoft.com/powershell/module/azurerm.operationalinsights/remove-azurermoperationalinsightsworkspace?view=azurermps-6.13.0), [REST API](https://docs.microsoft.com/rest/api/loganalytics/workspaces/delete), or in [Azure portal](https://portal.azure.com).
4040

4141
### Delete workspace in Azure portal
4242
1. To sign in, go to the [Azure portal](https://portal.azure.com).
@@ -49,11 +49,12 @@ You can delete a workspace using [PowerShell](https://docs.microsoft.com/powersh
4949
## Recover workspace
5050
If you have Contributor permissions to the subscription and resource group to where the workspace was associated before the soft-delete operation, you can recover it during its soft-delete period including its data, configuration and connected agents. After the soft-delete period, the workspace is non-recoverable and assigned for permanent deletion.
5151

52-
You can recover a workspace by re-creating the workspace using any of the supported create methods: PowerShell, Azure CLI, or from the Azure portal as long as these properties are populated with the deleted workspace’s details including:
52+
You can recover a workspace by re-creating the workspace using [PowerShell](https://docs.microsoft.com/powershell/module/az.operationalinsights/New-AzOperationalInsightsWorkspace) or [REST API]( https://docs.microsoft.com/rest/api/loganalytics/workspaces/createorupdate) workspace create methods as long as these properties are populated with the deleted workspace’s details including:
5353
1. Subscription ID
5454
2. Resource Group name
5555
3. Workspace name
5656
4. Region
5757

5858
> [!NOTE]
59-
> Names of deleted workspaces are kept preserved for the soft-delete period and they can't be used when creating a new workspace. The workspace names are *released* and available for use for new workspace creation after the soft-delete period has expired.
59+
> * Workspace recovery isn’t supported in the [Azure portal](https://portal.azure.com). Re-creating a workspace during the soft-delete period gives an indication that this workspace name is already in use.
60+
> * Names of deleted workspaces are preserved for the soft-delete period and they can't be used when creating a new workspace.

0 commit comments

Comments
 (0)