Skip to content

Commit 57cb73e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ultraShared
2 parents 1e89ec5 + dc800f4 commit 57cb73e

File tree

7 files changed

+135
-18
lines changed

7 files changed

+135
-18
lines changed

articles/active-directory/manage-apps/application-proxy-faq.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ For recommendations, see [High availability and load balancing of your Applicati
4949

5050
The Application Proxy Connector performs certificate-based authentication to Azure. TLS Termination (TLS/HTTPS inspection or acceleration) breaks this authentication method and isn't supported. Traffic from the connector to Azure must bypass any devices that are performing TLS Termination.
5151

52+
### Can I place a forward proxy device between the connector server(s) and the back-end application server?
53+
Yes, this scenario is supported starting from the connector version 1.5.1526.0. See [Work with existing on-premises proxy servers](application-proxy-configure-connectors-with-proxy-servers.md).
54+
5255
### Should I create a dedicated account to register the connector with Azure AD Application Proxy?
5356

5457
There's no reason to. Any global admin or application administrator account will work. The credentials entered during installation aren't used after the registration process. Instead, a certificate is issued to the connector, which is used for authentication from that point on.

articles/lighthouse/how-to/publish-managed-services-offers.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Publish a managed service offer to Azure Marketplace
3-
description: Learn how to publish a managed service offer that onboards customers to Azure delegated resource management.
2+
title: Publish a Managed Service offer to Azure Marketplace
3+
description: Learn how to publish a Managed Service offer that onboards customers to Azure delegated resource management.
44
ms.date: 04/08/2020
55
ms.topic: conceptual
66
---
77

8-
# Publish a managed service offer to Azure Marketplace
8+
# Publish a Managed Service offer to Azure Marketplace
99

1010
> [!IMPORTANT]
11-
> Starting April 14th, 2020, we'll begin moving management of your Managed Service offers to Partner Center. After the migration, you'll create and manage your offers in Partner Center. Follow the instructions in [Create new managed service offers](../../marketplace/partner-center-portal/create-new-managed-service-offer.md) to manage your migrated offers.
11+
> Starting April 13th, 2020, we'll begin moving management of your Managed Service offers to Partner Center. After the migration, you'll create and manage your offers in Partner Center. Follow the instructions in [Create a new Managed Service offer](../../marketplace/partner-center-portal/create-new-managed-service-offer.md) to manage your migrated offers.
1212
13-
In this article, you'll learn how to publish a public or private managed service offer to [Azure Marketplace](https://azuremarketplace.microsoft.com) using [Cloud Partner Portal](https://cloudpartner.azure.com/). Customers who purchase the offer are then able to to onboard subscriptions and resource groups for [Azure delegated resource management](../concepts/azure-delegated-resource-management.md).
13+
In this article, you'll learn how to publish a public or private Managed Service offer to [Azure Marketplace](https://azuremarketplace.microsoft.com) using [Cloud Partner Portal](https://cloudpartner.azure.com/). Customers who purchase the offer are then able to to onboard subscriptions and resource groups for [Azure delegated resource management](../concepts/azure-delegated-resource-management.md).
1414

1515
## Publishing requirements
1616

@@ -23,7 +23,7 @@ Your Microsoft Partner Network (MPN) ID will be [automatically associated](../..
2323
> [!NOTE]
2424
> If you don't want to publish an offer to Azure Marketplace, you can onboard customers manually by using Azure Resource Manager templates. For more info, see [Onboard a customer to Azure delegated resource management](onboard-customer.md).
2525
26-
Publishing a Managed Services offer is similar to publishing any other type of offer to Azure Marketplace. To learn about the general publishing process, see [Azure Marketplace and AppSource Publishing Guide](../../marketplace/marketplace-publishers-guide.md). You should also review the [commercial marketplace certification policies](https://docs.microsoft.com/legal/marketplace/certification-policies), particularly the [Managed Services](https://docs.microsoft.com/legal/marketplace/certification-policies#700-managed-services) section.
26+
Publishing a Managed Service offer is similar to publishing any other type of offer to Azure Marketplace. To learn about the general publishing process, see [Azure Marketplace and AppSource Publishing Guide](../../marketplace/marketplace-publishers-guide.md). You should also review the [commercial marketplace certification policies](https://docs.microsoft.com/legal/marketplace/certification-policies), particularly the [Managed Services](https://docs.microsoft.com/legal/marketplace/certification-policies#700-managed-services) section.
2727

2828
Once a customer adds your offer, they will be able to delegate one or more subscriptions or resource groups, which will then be [onboarded for Azure delegated resource management](#the-customer-onboarding-process).
2929

articles/marketplace/partner-center-portal/create-new-managed-service-offer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 04/08/2020
1313
# Create a new Managed Service offer
1414

1515
> [!IMPORTANT]
16-
> We're moving the management of your managed services offers from Cloud Partner Portal to Partner Center. Until your offers are migrated, please follow the instructions in [Publish a managed service offer to Azure Marketplace](../../lighthouse/how-to/publish-managed-services-offers.md) to manage your offers.
16+
> We're moving the management of your Managed Service offers from Cloud Partner Portal to Partner Center. Until your offers are migrated, please follow the instructions in [Publish a Managed Service offer to Azure Marketplace](../../lighthouse/how-to/publish-managed-services-offers.md) to manage your offers in Cloud Partner Portal.
1717
1818
Managed Service offers help to enable [Azure Lighthouse](../../lighthouse/overview.md) scenarios. When a customer accepts a Managed Service offer, they are then able to onboard resources for [Azure delegated resource management](../../lighthouse/concepts/azure-delegated-resource-management.md).
1919

articles/service-fabric/upgrade-managed-disks.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Upgrade cluster nodes to use Azure managed disks
33
description: Here's how to upgrade an existing Service Fabric cluster to use Azure managed disks with little or no downtime of your cluster.
44
ms.topic: how-to
5-
ms.date: 3/01/2020
5+
ms.date: 4/07/2020
66
---
77
# Upgrade cluster nodes to use Azure managed disks
88

@@ -21,11 +21,11 @@ This article will walk you through the steps of upgrading the primary node type
2121
> [!CAUTION]
2222
> You will experience an outage with this procedure only if you have dependencies on the cluster DNS (such as when accessing [Service Fabric Explorer](service-fabric-visualizing-your-cluster.md)). Architectural [best practice for front-end services](https://docs.microsoft.com/azure/architecture/microservices/design/gateway) is to have some kind of [load balancer](https://docs.microsoft.com/azure/architecture/guide/technology-choices/load-balancing-overview) in front of your node types to make node swapping possible without an outage.
2323
24-
Here are the [templates and cmdlets](https://github.com/erikadoyle/service-fabric-scripts-and-templates/tree/managed-disks/templates/nodetype-upgrade-no-outage) for Azure Resource Manager that we'll use to complete the upgrade scenario. The template changes will be explained in [Deploy an upgraded scale set for the primary node type](#deploy-an-upgraded-scale-set-for-the-primary-node-type) below.
24+
Here are the [templates and cmdlets](https://github.com/microsoft/service-fabric-scripts-and-templates/tree/master/templates/nodetype-upgrade-no-outage) for Azure Resource Manager that we'll use to complete the upgrade scenario. The template changes will be explained in [Deploy an upgraded scale set for the primary node type](#deploy-an-upgraded-scale-set-for-the-primary-node-type) below.
2525

2626
## Set up the test cluster
2727

28-
Let's set up the initial Service Fabric test cluster. First, [download](https://github.com/erikadoyle/service-fabric-scripts-and-templates/tree/managed-disks/templates/nodetype-upgrade-no-outage) the Azure resource manager sample templates that we'll use to complete this scenario.
28+
Let's set up the initial Service Fabric test cluster. First, [download](https://github.com/microsoft/service-fabric-scripts-and-templates/tree/master/templates/nodetype-upgrade-no-outage) the Azure resource manager sample templates that we'll use to complete this scenario.
2929

3030
Next, sign in to your Azure account.
3131

@@ -364,6 +364,6 @@ Learn how to:
364364

365365
See also:
366366

367-
* [Sample: Upgrade cluster nodes to use Azure managed disks](https://github.com/erikadoyle/service-fabric-scripts-and-templates/tree/managed-disks/templates/nodetype-upgrade-no-outage)
367+
* [Sample: Upgrade cluster nodes to use Azure managed disks](https://github.com/microsoft/service-fabric-scripts-and-templates/tree/master/templates/nodetype-upgrade-no-outage)
368368

369369
* [Vertical scaling considerations](service-fabric-best-practices-capacity-scaling.md#vertical-scaling-considerations)
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
---
2+
title: 'Quickstart: Bulk load data using a single T-SQL statement'
3+
description: Bulk load data using the COPY statement
4+
services: synapse-analytics
5+
author: kevinvngo
6+
manager: craigg
7+
ms.service: synapse-analytics
8+
ms.topic: quickstart
9+
ms.subservice:
10+
ms.date: 04/08/2020
11+
ms.author: kevin
12+
ms.reviewer: jrasnick
13+
ms.custom: azure-synapse
14+
---
15+
16+
# Quickstart: Bulk load data using the COPY statement
17+
18+
In this quickstart, you'll bulk load data into your SQL pool using the simple and flexible [COPY statement](https://docs.microsoft.com/sql/t-sql/statements/copy-into-transact-sql?view=azure-sqldw-latest) for high-throughput data ingestion. The COPY statement is the recommended loading utility as it enables you to seamlessly and flexibly load data by providing functionality to:
19+
20+
- Allow lower privileged users to load without needing strict CONTROL permissions on the data warehouse
21+
- Leverage only a single T-SQL statement without having to create any additional database objects
22+
- Leverage a finer permission model without exposing storage account keys using Share Access Signatures (SAS)
23+
- Specify a different storage account for the ERRORFILE location (REJECTED_ROW_LOCATION)
24+
- Customize default values for each target column and specify source data fields to load into specific target columns
25+
- Specify a custom row terminator for CSV files
26+
- Escape string, field, and row delimiters for CSV files
27+
- Leverage SQL Server Date formats for CSV files
28+
- Specify wildcards and multiple files in the storage location path
29+
30+
## Prerequisites
31+
32+
This quickstart assumes you already have a SQL pool. If a SQL pool hasn't been created, use the [Create and Connect - portal](create-data-warehouse-portal.md) quickstart.
33+
34+
## Create the target table
35+
36+
In this example, we'll be loading data from the New York taxi dataset. we'll load a table called Trip that represents taxi trips taken within a single year. Run the following to create the table:
37+
38+
```sql
39+
CREATE TABLE [dbo].[Trip]
40+
(
41+
[DateID] int NOT NULL,
42+
[MedallionID] int NOT NULL,
43+
[HackneyLicenseID] int NOT NULL,
44+
[PickupTimeID] int NOT NULL,
45+
[DropoffTimeID] int NOT NULL,
46+
[PickupGeographyID] int NULL,
47+
[DropoffGeographyID] int NULL,
48+
[PickupLatitude] float NULL,
49+
[PickupLongitude] float NULL,
50+
[PickupLatLong] varchar(50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
51+
[DropoffLatitude] float NULL,
52+
[DropoffLongitude] float NULL,
53+
[DropoffLatLong] varchar(50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
54+
[PassengerCount] int NULL,
55+
[TripDurationSeconds] int NULL,
56+
[TripDistanceMiles] float NULL,
57+
[PaymentType] varchar(50) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
58+
[FareAmount] money NULL,
59+
[SurchargeAmount] money NULL,
60+
[TaxAmount] money NULL,
61+
[TipAmount] money NULL,
62+
[TollsAmount] money NULL,
63+
[TotalAmount] money NULL
64+
)
65+
WITH
66+
(
67+
DISTRIBUTION = ROUND_ROBIN,
68+
CLUSTERED COLUMNSTORE INDEX
69+
);
70+
```
71+
72+
## Run the COPY statement
73+
74+
Run the following COPY statement that will load data from the Azure blob storage account into the Trip table.
75+
76+
```sql
77+
COPY INTO [dbo].[Trip] FROM 'https://nytaxiblob.blob.core.windows.net/2013/Trip2013/'
78+
WITH (
79+
FIELDTERMINATOR='|',
80+
ROWTERMINATOR='0x0A'
81+
) OPTION (LABEL = 'COPY: dbo.trip');
82+
```
83+
84+
## Monitor the load
85+
86+
Check whether your load is making progress by periodically running the following query:
87+
88+
```sql
89+
SELECT r.[request_id]
90+
, r.[status]
91+
, r.resource_class
92+
, r.command
93+
, sum(bytes_processed) AS bytes_processed
94+
, sum(rows_processed) AS rows_processed
95+
FROM sys.dm_pdw_exec_requests r
96+
JOIN sys.dm_pdw_dms_workers w
97+
ON r.[request_id] = w.request_id
98+
WHERE [label] = 'COPY: dbo.trip' and session_id <> session_id() and type = 'WRITER'
99+
GROUP BY r.[request_id]
100+
, r.[status]
101+
, r.resource_class
102+
, r.command;
103+
104+
```
105+
106+
## Next steps
107+
108+
- For best practices on data loading, see [Best Practices for Loading Data](https://docs.microsoft.com/azure/synapse-analytics/sql-data-warehouse/guidance-for-loading-data).
109+
- For information on how to manage the resources for your data loads, see [Workload Isolation](https://docs.microsoft.com/azure/synapse-analytics/sql-data-warehouse/quickstart-configure-workload-isolation-tsql).

articles/synapse-analytics/sql-data-warehouse/toc.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@
3131
href: create-data-warehouse-portal.md
3232
- name: PowerShell
3333
href: create-data-warehouse-powershell.md
34-
- name: Pause and resume
35-
items:
36-
- name: Portal
37-
href: pause-and-resume-compute-portal.md
38-
- name: PowerShell
39-
href: pause-and-resume-compute-powershell.md
34+
- name: Load data
35+
items:
36+
- name: COPY statement
37+
href: quickstart-bulk-load-copy-tsql.md
4038
- name: Scale
4139
items:
4240
- name: Portal
@@ -55,6 +53,12 @@
5553
items:
5654
- name: T-SQL
5755
href: quickstart-configure-workload-isolation-tsql.md
56+
- name: Pause and resume
57+
items:
58+
- name: Portal
59+
href: pause-and-resume-compute-portal.md
60+
- name: PowerShell
61+
href: pause-and-resume-compute-powershell.md
5862
- name: Concepts
5963
items:
6064
- name: Security

includes/maps-limits.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The following table shows the data size limit for Azure Maps. The Azure Maps dat
2121

2222
| Resource | Limit |
2323
|---------------------------------------|:---------------------:|
24-
| Maximum size of data | 1 GB |
24+
| Maximum size of data | 50 MB |
25+
2526

2627
For more information on the Azure Maps pricing tiers, see [Azure Maps pricing](https://azure.microsoft.com/pricing/details/azure-maps/).

0 commit comments

Comments
 (0)