Skip to content

Commit caec615

Browse files
Alexander NosovAlexander Nosov
Alexander Nosov
authored and
Alexander Nosov
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into arc-enabled-sql-server
2 parents d9470a6 + b3129af commit caec615

526 files changed

Lines changed: 3017 additions & 2443 deletions

File tree

Some content is hidden

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

‎.openpublishing.redirection.json‎

Lines changed: 101 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58914,6 +58914,106 @@
5891458914
"source_path": "docs/azure-data-studio/azure-sql-managed-instance-extension.md",
5891558915
"redirect_url": "/sql/azure-data-studio/extensions/azure-sql-managed-instance-extension",
5891658916
"redirect_document_id": true
58917-
}
58917+
},
58918+
{
58919+
"source_path": "docs/azure-data-studio/dashboard-extension.md",
58920+
"redirect_url": "/sql/azure-data-studio/extensions/dashboard-extension",
58921+
"redirect_document_id": true
58922+
},
58923+
{
58924+
"source_path": "docs/azure-data-studio/data-virtualization-extension.md",
58925+
"redirect_url": "/sql/azure-data-studio/extensions/data-virtualization-extension",
58926+
"redirect_document_id": true
58927+
},
58928+
{
58929+
"source_path": "docs/azure-data-studio/extension-authoring.md",
58930+
"redirect_url": "/sql/azure-data-studio/extensions/extension-authoring",
58931+
"redirect_document_id": true
58932+
},
58933+
{
58934+
"source_path": "docs/azure-data-studio/extensions.md",
58935+
"redirect_url": "/sql/azure-data-studio/extensions/add-extensions",
58936+
"redirect_document_id": true
58937+
},
58938+
{
58939+
"source_path": "docs/azure-data-studio/postgres-extension.md",
58940+
"redirect_url": "/sql/azure-data-studio/extensions/postgres-extension",
58941+
"redirect_document_id": true
58942+
},
58943+
{
58944+
"source_path": "docs/azure-data-studio/powershell-extension.md",
58945+
"redirect_url": "/sql/azure-data-studio/extensions/powershell-extension",
58946+
"redirect_document_id": true
58947+
},
58948+
{
58949+
"source_path": "docs/azure-data-studio/schema-compare-extension.md",
58950+
"redirect_url": "/sql/azure-data-studio/extensions/schema-compare-extension",
58951+
"redirect_document_id": true
58952+
},
58953+
{
58954+
"source_path": "docs/azure-data-studio/sql-database-project-extension-build-from-command-line.md",
58955+
"redirect_url": "/sql/azure-data-studio/extensions/sql-database-project-extension-build-from-command-line",
58956+
"redirect_document_id": true
58957+
},
58958+
{
58959+
"source_path": "docs/azure-data-studio/sql-database-project-extension-build.md",
58960+
"redirect_url": "/sql/azure-data-studio/extensions/sql-database-project-extension-build",
58961+
"redirect_document_id": true
58962+
},
58963+
{
58964+
"source_path": "docs/azure-data-studio/sql-database-project-extension-getting-started.md",
58965+
"redirect_url": "/sql/azure-data-studio/extensions/sql-database-project-extension-getting-started",
58966+
"redirect_document_id": true
58967+
},
58968+
{
58969+
"source_path": "docs/azure-data-studio/sql-database-project-extension.md",
58970+
"redirect_url": "/sql/azure-data-studio/extensions/sql-database-project-extension",
58971+
"redirect_document_id": true
58972+
},
58973+
{
58974+
"source_path": "docs/azure-data-studio/sql-server-agent-extension.md",
58975+
"redirect_url": "/sql/azure-data-studio/extensions/sql-server-agent-extension",
58976+
"redirect_document_id": true
58977+
},
58978+
{
58979+
"source_path": "docs/azure-data-studio/sql-server-cms-extension.md",
58980+
"redirect_url": "/sql/azure-data-studio/extensions/sql-server-cms-extension",
58981+
"redirect_document_id": true
58982+
},
58983+
{
58984+
"source_path": "docs/azure-data-studio/sql-server-dacpac-extension.md",
58985+
"redirect_url": "/sql/azure-data-studio/extensions/sql-server-dacpac-extension",
58986+
"redirect_document_id": true
58987+
},
58988+
{
58989+
"source_path": "docs/azure-data-studio/sql-server-import-extension.md",
58990+
"redirect_url": "/sql/azure-data-studio/extensions/sql-server-import-extension",
58991+
"redirect_document_id": true
58992+
},
58993+
{
58994+
"source_path": "docs/azure-data-studio/sql-server-profiler-extension.md",
58995+
"redirect_url": "/sql/azure-data-studio/extensions/sql-server-profiler-extension",
58996+
"redirect_document_id": true
58997+
},
58998+
{
58999+
"source_path": "docs/azure-data-studio/machine-learning-extension-import-view-models.md",
59000+
"redirect_url": "/sql/azure-data-studio/extensions/machine-learning-extension-import-view-models",
59001+
"redirect_document_id": true
59002+
},
59003+
{
59004+
"source_path": "docs/azure-data-studio/machine-learning-extension-manage-packages.md",
59005+
"redirect_url": "/sql/azure-data-studio/extensions/machine-learning-extension-manage-packages",
59006+
"redirect_document_id": true
59007+
},
59008+
{
59009+
"source_path": "docs/azure-data-studio/machine-learning-extension-predictions.md",
59010+
"redirect_url": "/sql/azure-data-studio/extensions/machine-learning-extension-predictions",
59011+
"redirect_document_id": true
59012+
},
59013+
{
59014+
"source_path": "docs/azure-data-studio/machine-learning-extension.md",
59015+
"redirect_url": "/sql/azure-data-studio/extensions/machine-learning-extension",
59016+
"redirect_document_id": true
59017+
}
5891859018
]
5891959019
}

‎docs/ado/guide/data/calling-a-stored-procedure-as-a-method-on-a-connection-object.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ Set objComm.ActiveConnection = objConn
5656
' the active connection object...
5757
' "ALFKI" is the required input parameter,
5858
' objRs is the resultant output variable.
59-
59+
objComm(1) = "ALFKI"
60+
Set objRs = objComm.Execute
61+
6062
' Display the result.
6163
Debug.Print "Results returned from sp_CustOrdersOrders for ALFKI: "
6264
Do While Not objRs.EOF
@@ -74,4 +76,4 @@ Set objComm = Nothing
7476
```
7577

7678
## See Also
77-
[Connection Object (ADO)](../../reference/ado-api/connection-object-ado.md)
79+
[Connection Object (ADO)](../../reference/ado-api/connection-object-ado.md)

‎docs/azdata/install/deploy-install-azdata-installer.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.technology: big-data-cluster
1313

1414
# Install `azdata` to manage [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ss-nover.md)] with Windows Installer
1515

16-
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/sqlserver2019.md)]
16+
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/azdata.md)]
1717

1818
This article describes how to install `azdata` on Windows. Before the Windows Installation was available, the installation of `azdata` required `pip`.
1919

‎docs/azdata/install/deploy-install-azdata-linux-package.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.technology: big-data-cluster
1313

1414
# Install `azdata` with apt
1515

16-
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/sqlserver2019.md)]
16+
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/azdata.md)]
1717

1818
This article describes how to install `azdata` on Linux. Before these package managers were available, the installation of `azdata` required `pip`.
1919

‎docs/azdata/install/deploy-install-azdata-pip.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.technology: big-data-cluster
1313

1414
# Install `azdata` with `pip`
1515

16-
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/sqlserver2019.md)]
16+
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/azdata.md)]
1717

1818
This article describes how to install the `azdata` tool Windows or Linux using `pip`.
1919

‎docs/azdata/install/deploy-install-azdata.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.prod: sql
1212

1313
# Install `azdata`
1414

15-
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/sqlserver2019.md)]
15+
[!INCLUDE[SQL Server 2019](../../includes/applies-to-version/azdata.md)]
1616

1717
`azdata` is a command-line utility written in Python to bootstrap and manage the data services via REST APIs.
1818

‎docs/azdata/reference/reference-azdata-app-template.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Reference article for azdata app template commands.
55
author: MikeRayMSFT
66
ms.author: mikeray
77
ms.reviewer: seanw
8-
ms.date: 06/22/2020
8+
ms.date: 09/22/2020
99
ms.topic: reference
1010
ms.prod: sql
1111
ms.technology: big-data-cluster
@@ -98,3 +98,4 @@ Increase logging verbosity. Use --debug for full debug logs.
9898
For more information about other **azdata** commands, see [azdata reference](reference-azdata.md).
9999

100100
For more information about how to install the **azdata** tool, see [Install azdata](..\install\deploy-install-azdata.md).
101+

‎docs/azdata/reference/reference-azdata-app.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Reference article for azdata app commands.
55
author: MikeRayMSFT
66
ms.author: mikeray
77
ms.reviewer: seanw
8-
ms.date: 06/22/2020
8+
ms.date: 09/22/2020
99
ms.topic: reference
1010
ms.prod: sql
1111
ms.technology: big-data-cluster
@@ -272,6 +272,7 @@ Increase logging verbosity. Use --debug for full debug logs.
272272

273273
## Next steps
274274

275-
For more information about other **azdata** commands, see [azdata reference](reference-azdata.md).
275+
For more information about other **azdata** commands, see [azdata reference](reference-azdata.md).
276276

277277
For more information about how to install the **azdata** tool, see [Install azdata](..\install\deploy-install-azdata.md).
278+

‎docs/azdata/reference/reference-azdata-arc-dc-config.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Reference article for azdata arc dc config commands.
55
author: MikeRayMSFT
66
ms.author: mikeray
77
ms.reviewer: seanw
8-
ms.date: 06/22/2020
8+
ms.date: 09/22/2020
99
ms.topic: reference
1010
ms.prod: sql
1111
ms.technology: big-data-cluster
@@ -48,7 +48,7 @@ azdata arc dc config init --source aks-dev-test --path custom
4848
#### `--path -p`
4949
File path of where you would like the config profile placed, defaults to <cwd>/custom.
5050
#### `--source -s`
51-
Config profile source: ['azure-arc-aks-default-storage', 'azure-arc-eks', 'azure-arc-aks-premium-storage', 'azure-arc-azure-openshift', 'azure-arc-aks-dev-test', 'azure-arc-kubeadm', 'azure-arc-openshift', 'azure-arc-kubeadm-dev-test', 'azure-arc-ake']
51+
Config profile source: ['azure-arc-aks-premium-storage', 'azure-arc-ake', 'azure-arc-openshift', 'azure-arc-gke', 'azure-arc-aks-default-storage', 'azure-arc-aks-dev-test', 'azure-arc-kubeadm', 'azure-arc-kubeadm-dev-test', 'azure-arc-eks', 'azure-arc-azure-openshift', 'azure-arc-aks-hci']
5252
#### `--force -f`
5353
Force overwrite of the target file.
5454
### Global Arguments
@@ -79,7 +79,7 @@ azdata arc dc config list --config-profile aks-dev-test
7979
```
8080
### Optional Parameters
8181
#### `--config-profile -c`
82-
Default config profile: ['azure-arc-aks-default-storage', 'azure-arc-eks', 'azure-arc-aks-premium-storage', 'azure-arc-azure-openshift', 'azure-arc-aks-dev-test', 'azure-arc-kubeadm', 'azure-arc-openshift', 'azure-arc-kubeadm-dev-test', 'azure-arc-ake']
82+
Default config profile: ['azure-arc-aks-premium-storage', 'azure-arc-ake', 'azure-arc-openshift', 'azure-arc-gke', 'azure-arc-aks-default-storage', 'azure-arc-aks-dev-test', 'azure-arc-kubeadm', 'azure-arc-kubeadm-dev-test', 'azure-arc-eks', 'azure-arc-azure-openshift', 'azure-arc-aks-hci']
8383
### Global Arguments
8484
#### `--debug`
8585
Increase logging verbosity to show all debug logs.
@@ -219,3 +219,4 @@ Increase logging verbosity. Use --debug for full debug logs.
219219
For more information about other **azdata** commands, see [azdata reference](reference-azdata.md).
220220

221221
For more information about how to install the **azdata** tool, see [Install azdata](..\install\deploy-install-azdata.md).
222+

‎docs/azdata/reference/reference-azdata-arc-dc-debug.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Reference article for azdata arc dc debug commands.
55
author: MikeRayMSFT
66
ms.author: mikeray
77
ms.reviewer: seanw
8-
ms.date: 06/22/2020
8+
ms.date: 09/22/2020
99
ms.topic: reference
1010
ms.prod: sql
1111
ms.technology: big-data-cluster
@@ -33,6 +33,10 @@ azdata arc dc debug copy-logs --namespace -ns
3333

3434
[--pod]
3535

36+
[--resource-kind -rk]
37+
38+
[--resource-name -rn]
39+
3640
[--timeout -t]
3741

3842
[--skip-compress -sc]
@@ -49,6 +53,10 @@ Copy the logs for the containers with similar name, Optional, by default copies
4953
Target folder path to copy logs to. Optional, by default creates the result in the local folder. Cannot be specified multiple times. If specified multiple times, last one will be used
5054
#### `--pod`
5155
Copy the logs for the pods with similar name. Optional, by default copies logs for all pods. Cannot be specified multiple times. If specified multiple times, last one will be used
56+
#### `--resource-kind -rk`
57+
Copy the logs for the resource of a particular kind. Cannot specified multiple times. If specified multiple times, last one will be used. If specified, --resource-name should also be specified to identify the resource.
58+
#### `--resource-name -rn`
59+
Copy the logs for the resource of the specified name. Cannot be specified multiple times. If specified multiple times, last one will be used. If specified, --resource-kind should also be specified to identify the resource.
5260
#### `--timeout -t`
5361
The number of seconds to wait for the command to complete. The default value is 0 which is unlimited
5462
#### `--skip-compress -sc`
@@ -101,3 +109,4 @@ Increase logging verbosity. Use --debug for full debug logs.
101109
For more information about other **azdata** commands, see [azdata reference](reference-azdata.md).
102110

103111
For more information about how to install the **azdata** tool, see [Install azdata](..\install\deploy-install-azdata.md).
112+

0 commit comments

Comments
 (0)