Skip to content

Commit 8b71a4f

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 8c3b984 + df7942b commit 8b71a4f

26 files changed

+293
-576
lines changed

articles/data-factory/enable-aad-authentication-azure-ssis-ir.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ manager: craigg
1515
---
1616
# Enable Azure Active Directory authentication for Azure-SSIS Integration Runtime
1717

18-
This article shows you how to enable Azure Active Directory (Azure AD) authentication with the managed identity for your Azure Data Factory (ADF) and use it instead of SQL authentication to create an Azure-SSIS Integration Runtime (IR) that will in turn provision SSIS catalog database (SSISDB) in Azure SQL Database server/Managed Instance on your behalf.
18+
This article shows you how to enable Azure Active Directory (Azure AD) authentication with the managed identity for your Azure Data Factory (ADF) and use it instead of conventional authentication methods (like SQL authentication) to:
19+
20+
- Create an Azure-SSIS Integration Runtime (IR) that will in turn provision SSIS catalog database (SSISDB) in Azure SQL Database server/Managed Instance on your behalf.
21+
22+
- Connect to various Azure resources when running SSIS packages on Azure-SSIS IR.
1923

2024
For more info about the managed identity for your ADF, see [Managed identiy for Data Factory](https://docs.microsoft.com/azure/data-factory/data-factory-service-identity).
2125

@@ -209,4 +213,14 @@ To provision your Azure-SSIS IR with PowerShell, do the following things:
209213
Start-AzDataFactoryV2IntegrationRuntime -ResourceGroupName $ResourceGroupName `
210214
-DataFactoryName $DataFactoryName `
211215
-Name $AzureSSISName
212-
```
216+
```
217+
218+
## Run SSIS Packages with Managed Identity Authentication
219+
220+
When you run SSIS packages on Azure-SSIS IR, you can use managed identity authentication to connect to various Azure resources. Currently we have already supported managed identity authentication in the following connection managers.
221+
222+
- [OLE DB Connection Manager](https://docs.microsoft.com/sql/integration-services/connection-manager/ole-db-connection-manager#managed-identities-for-azure-resources-authentication)
223+
224+
- [ADO.NET Connection Manager](https://docs.microsoft.com/sql/integration-services/connection-manager/ado-net-connection-manager#managed-identities-for-azure-resources-authentication)
225+
226+
- [Azure Storage Connection Manager](https://docs.microsoft.com/sql/integration-services/connection-manager/azure-storage-connection-manager#managed-identities-for-azure-resources-authentication)

articles/iot-accelerators/howto-opc-twin-deploy-dependencies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ manager: philmea
1212

1313
# Deploying dependencies for local development
1414

15-
This article explains how to deploy only the Azure Platform Services need to do local development and debugging. At the end, you will have a resource group deployed that contains everything you need for local development and debugging.
15+
This article explains how to deploy only the Azure Platform Services needed to do local development and debugging. At the end, you will have a resource group deployed that contains everything you need for local development and debugging.
1616

1717
## Deploy Azure platform services
1818

19-
1. Make sure you have PowerShell and [Azure PowerShell](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-1.1.0) extensions installed. Open a command prompt or terminal and run:
19+
1. Make sure you have PowerShell and [AzureRM PowerShell](https://docs.microsoft.com/powershell/azure/azurerm/install-azurerm-ps) extensions installed. Open a command prompt or terminal and run:
2020

2121
```bash
2222
git clone https://github.com/Azure/azure-iiot-components
@@ -39,7 +39,7 @@ Ensure you use a short and simple resource group name. The name is used also to
3939

4040
### Azure Active Directory (AAD) registration
4141

42-
The deployment script tries to register AAD applications in Azure Active Directory. Depending on your rights to the selected AAD tenant, this might fail. There are 3 options:
42+
The deployment script tries to register AAD applications in Azure Active Directory. Depending on your rights to the selected AAD tenant, this might fail. There are three options:
4343

4444
1. If you chose a AAD tenant from a list of tenants, restart the script and choose a different one from the list.
4545
2. Alternatively, deploy a private AAD tenant, restart the script and select to use it.

articles/storage/blobs/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@
129129
href: ../common/storage-redundancy-zrs.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
130130
- name: Geo-redundant storage
131131
href: ../common/storage-redundancy-grs.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
132+
- name: Geo-zone-redundant storage
133+
href: ../common/storage-redundancy-gzrs.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
132134
- name: Disaster recovery and failover
133135
href: ../common/storage-disaster-recovery-guidance.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
134136
- name: Designing HA Apps using RA-GRS

articles/storage/blobs/data-lake-storage-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ When architecting a system with Data Lake Storage Gen2 or any cloud service, you
4444

4545
### High availability and disaster recovery
4646

47-
High availability (HA) and disaster recovery (DR) can sometimes be combined together, although each has a slightly different strategy, especially when it comes to data. Data Lake Storage Gen2 already handles 3x replication under the hood to guard against localized hardware failures. Additionally, other replication options, such as ZRS improve HA while GRS & RA-GRS improve DR. When building a plan for HA, in the event of a service interruption the workload needs access to the latest data as quickly as possible by switching over to a separately replicated instance locally or in a new region.
47+
High availability (HA) and disaster recovery (DR) can sometimes be combined together, although each has a slightly different strategy, especially when it comes to data. Data Lake Storage Gen2 already handles 3x replication under the hood to guard against localized hardware failures. Additionally, other replication options, such as ZRS or GZRS (preview), improve HA, while GRS & RA-GRS improve DR. When building a plan for HA, in the event of a service interruption the workload needs access to the latest data as quickly as possible by switching over to a separately replicated instance locally or in a new region.
4848

4949
In a DR strategy, to prepare for the unlikely event of a catastrophic failure of a region, it is also important to have data replicated to a different region using GRS or RA-GRS replication. You must also consider your requirements for edge cases such as data corruption where you may want to create periodic snapshots to fall back to. Depending on the importance and size of the data, consider rolling delta snapshots of 1-, 6-, and 24-hour periods, according to risk tolerances.
5050

articles/storage/blobs/data-lake-storage-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ This section describes which Data Lake Storage Gen1 platform capabilities that a
7979
| |Optimized performance for parallel analytics workloads. High Throughput and IOPS. | Optimized performance for parallel analytics workloads. High Throughput and IOPS. | *Available now* |
8080
| Virtual Network (VNet) support | [Using Virtual Network integration](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-network-security) | [Using Service Endpoint for Azure Storage](https://docs.microsoft.com/azure/storage/common/storage-network-security?toc=%2fazure%2fstorage%2fblobs%2ftoc.json) | *Available now* |
8181
| Size limits | No limits on account sizes, file sizes or number of files | No limits on account sizes or number of files. File size limited to 5TB. | *Available now*|
82-
| Geo-redundancy| Locally-redundant (LRS) | Locally redundant (LRS) Zone redundant (ZRS) Globally redundant (GRS) Read-access globally redundant (RA-GRS) See [here](https://docs.microsoft.com/azure/storage/common/storage-redundancy) for more information| *Available now* |
82+
| Geo-redundancy| Locally-redundant (LRS) | Locally redundant (LRS) Zone redundant (ZRS) geo-redundant (GRS) Read-access geo-redundant (RA-GRS) See [here](https://docs.microsoft.com/azure/storage/common/storage-redundancy) for more information| *Available now* |
8383
| Regional availability | See [here](https://azure.microsoft.com/regions/) | All [Azure regions](https://azure.microsoft.com/global-infrastructure/regions/) | *Available now* |
8484
| Price | See [Pricing](https://azure.microsoft.com/pricing/details/data-lake-store/) | See [Pricing](https://azure.microsoft.com/pricing/details/storage/data-lake/) | |
8585
| Availability SLA | [See SLA](https://azure.microsoft.com/support/legal/sla/data-lake-store/v1_0/) | [See SLA](https://azure.microsoft.com/support/legal/sla/storage/v1_3/) | *Available now* |
27.9 KB
Loading

articles/storage/common/storage-azure-cli.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ az storage account create \
191191
* `Standard_LRS`
192192
* `Standard_RAGRS`
193193
* `Standard_ZRS`
194+
* `Standard_GZRS` (preview)
195+
* `Standard_RAGZRS` (preview)
194196

195197
### Set default Azure storage account environment variables
196198

0 commit comments

Comments
 (0)