Skip to content

Commit 972254f

Browse files
authored
Merge pull request #114980 from linda33wj/master
Update ADF content
2 parents 05fa010 + 764b1ec commit 972254f

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

articles/data-factory/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,8 @@
557557
href: data-factory-service-identity.md
558558
- name: Monitor and manage
559559
items:
560+
- name: Monitor visually
561+
href: monitor-visually.md
560562
- name: Monitor with Azure Monitor
561563
href: monitor-using-azure-monitor.md
562564
- name: Monitor with SDKs

articles/data-factory/connector-db2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Typical properties inside the connection string:
9595
"properties": {
9696
"type": "Db2",
9797
"typeProperties": {
98-
"connectionString": "server=<server:port>;database=<database>; authenticationType=Basic;username=<username>; password=<password>; packageCollection=<packagecollection>;certificateCommonName=<certname>;"
98+
"connectionString": "server=<server:port>;database=<database>;authenticationType=Basic;username=<username>;password=<password>;packageCollection=<packagecollection>;certificateCommonName=<certname>;"
9999
},
100100
"connectVia": {
101101
"referenceName": "<name of Integration Runtime>",
@@ -112,7 +112,7 @@ Typical properties inside the connection string:
112112
"properties": {
113113
"type": "Db2",
114114
"typeProperties": {
115-
"connectionString": "server=<server:port>;database=<database>; authenticationType=Basic;username=<username>; packageCollection=<packagecollection>;certificateCommonName=<certname>;",
115+
"connectionString": "server=<server:port>;database=<database>;authenticationType=Basic;username=<username>;packageCollection=<packagecollection>;certificateCommonName=<certname>;",
116116
"password": { 
117117
"type": "AzureKeyVaultSecret", 
118118
"store": { 

articles/data-factory/connector-mysql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: data-services
1212

1313

1414
ms.topic: conceptual
15-
ms.date: 02/19/2020
15+
ms.date: 05/12/2020
1616
ms.author: jingwang
1717

1818
---
@@ -36,7 +36,7 @@ This MySQL connector is supported for the following activities:
3636

3737
You can copy data from MySQL database to any supported sink data store. For a list of data stores that are supported as sources/sinks by the copy activity, see the [Supported data stores](copy-activity-overview.md#supported-data-stores-and-formats) table.
3838

39-
Specifically, this MySQL connector supports MySQL **version 5.6 and 5.7**.
39+
Specifically, this MySQL connector supports MySQL **version 5.6, 5.7 and 8.0**.
4040

4141
## Prerequisites
4242

articles/data-factory/connector-netezza.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: data-services
1212

1313

1414
ms.topic: conceptual
15-
ms.date: 09/02/2019
15+
ms.date: 05/09/2020
1616
ms.author: jingwang
1717

1818
---
@@ -62,7 +62,7 @@ A typical connection string is `Server=<server>;Port=<port>;Database=<database>;
6262

6363
| Property | Description | Required |
6464
|:--- |:--- |:--- |
65-
| SecurityLevel | The level of security (SSL/TLS) that the driver uses for the connection to the data store. Example: `SecurityLevel=preferredSecured`. Supported values are:<br/>- **Only unsecured** (**onlyUnSecured**): The driver doesn't use TLS.<br/>- **Preferred unsecured (preferredUnSecured) (default)**: If the server provides a choice, the driver doesn't use TLS. <br/>- **Preferred secured (preferredSecured)**: If the server provides a choice, the driver uses TLS. <br/>- **Only secured (onlySecured)**: The driver doesn't connect unless an TLS connection is available. | No |
65+
| SecurityLevel | The level of security (SSL/TLS) that the driver uses for the connection to the data store. The driver supports SSL connections with one-way authentication using SSL version 3. <br>Example: `SecurityLevel=preferredSecured`. Supported values are:<br/>- **Only unsecured** (**onlyUnSecured**): The driver doesn't use TLS.<br/>- **Preferred unsecured (preferredUnSecured) (default)**: If the server provides a choice, the driver doesn't use TLS. <br/>- **Preferred secured (preferredSecured)**: If the server provides a choice, the driver uses TLS. <br/>- **Only secured (onlySecured)**: The driver doesn't connect unless an TLS connection is available. | No |
6666
| CaCertFile | The full path to the TLS/SSL certificate that's used by the server. Example: `CaCertFile=<cert path>;`| Yes, if TLS is enabled |
6767

6868
**Example**

0 commit comments

Comments
 (0)