Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit ca65a19

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/sql-docs-pr (branch live)
2 parents fac238a + df21af6 commit ca65a19

55 files changed

Lines changed: 631 additions & 909 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: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,26 @@
13261326
"redirect_url": "/sql/connect/odbc/using-transparent-network-ip-resolution",
13271327
"redirect_document_id": false
13281328
},
1329+
{
1330+
"source_path": "docs/relational-database/policy-based-management/lesson-1-1-create-the-off-by-default-policy.md",
1331+
"redirect_url": "/sql/relational-database/policy-based-management/lesson-1-create-and-apply-an-off-by-default-policy",
1332+
"redirect_document_id": false
1333+
},
1334+
{
1335+
"source_path": "docs/relational-database/policy-based-management/lesson-1-2-configure-a-server-to-run-the-off-by-default-policy.md",
1336+
"redirect_url": "/sql/relational-database/policy-based-management/lesson-1-create-and-apply-an-off-by-default-policy",
1337+
"redirect_document_id": false
1338+
},
1339+
{
1340+
"source_path": "docs/relational-database/policy-based-management/lesson-2-1-create-the-finance-name-policy.md",
1341+
"redirect_url": "/sql/relational-database/policy-based-management/lesson-2-create-and-apply-a-naming-standards-policy",
1342+
"redirect_document_id": false
1343+
},
1344+
{
1345+
"source_path": "docs/relational-database/policy-based-management/lesson-2-2-subscribe-to-and-check-the-finance-name-policy.md",
1346+
"redirect_url": "/sql/relational-database/policy-based-management/lesson-2-2-subscribe-to-and-check-the-finance-name-policy",
1347+
"redirect_document_id": false
1348+
},
13291349
{
13301350
"source_path": "docs/connect/odbc/mac/connection-string-keywords-and-data-source-names-dsns.md",
13311351
"redirect_url": "/sql/connect/odbc/linux-mac/connection-string-keywords-and-data-source-names-dsns",

docs/azure-data-studio/extension-authoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ To publish your new extension to Azure Data Studio:
7070
1. Add your extension to https://github.com/Microsoft/azuredatastudio/blob/release/extensions/extensionsGallery.json
7171
2. We currently don't have support to host third party extensions, so instead of downloading the extension, Azure Data Studio has the option to browse to a download page. To set a download page for your extension, set the value of asset "Microsoft.AzureDataStudio.DownloadPage".
7272
3. Create a PR against release/extensions branch.
73-
4. Send a review request to llali.
73+
4. Send a review request to the team.
7474

7575
Your extension will be reviewed and added to the extension gallery.
7676

docs/azure-data-studio/tutorial-create-extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ In this tutorial, you learned how to:
174174

175175
We hope after reading this you’ll be inspired to build your own extension for Azure Data Studio. We have support for Dashboard Insights (pretty graphs that run against your SQL Server), a number of SQL-specific APIs, and a huge existing set of extension points inherited from Visual Studio Code.
176176

177-
If you have an idea but are not sure how to get started please open an issue or tweet at the team ([azuredatastudio](https://twitter.com/azuredatastudio), [me](https://twitter.com/kevcunnane), [Alan](https://twitter.com/alanyusql), [Abbie](https://twitter.com/ppookpetch)).
177+
If you have an idea but are not sure how to get started, please open an issue or tweet at the team: [azuredatastudio](https://twitter.com/azuredatastudio).
178178

179179
You can always refer to the [Visual Studio Code extension guide](https://code.visualstudio.com/docs/extensions/overview) because it covers all the existing APIs and patterns.
180180

docs/connect/odbc/linux-mac/release-notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Ubuntu 18.04
2525

2626
Data Classification for Azure SQL Database and SQL Server, for more information see [Data Classification](../data-classification.md)
2727

28+
Support UTF-8 server encoding
29+
2830
SQLBrowseConnect
2931

3032
Dynamic dependency on `libcurl`:

docs/connect/odbc/windows/release-notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ manager: kenvh
2626

2727
Data Classification for Azure SQL Database and SQL Server, for more information see [Data Classification](../data-classification.md)
2828

29+
Support for UTF-8 server encoding
30+
2931
[Bug fixes](../bug-fixes.md)
3032

3133
## What's New in the [!INCLUDE[msCoName](../../../includes/msconame_md.md)] ODBC Driver 17.1 for [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] on Windows

docs/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ ms.technology: install
3535
<h4>SQL</h4>
3636
<ul class="noBullet">
3737
<li><a class="barLink" href="https://docs.microsoft.com/azure/sql-database/">Azure SQL Database</a></li>
38-
<li><a class="barLink" href="https://docs.microsoft.com/azure/sql-data-warehouse/sql-data-warehouse-overview-what-is">Azure SQL Data Warehouse</a></li> <li><a class="barLink" href="/sql/sql-server/sql-server-technical-documentation?view=sql-server-2017">SQL Server 2017</a></li>
38+
<li><a class="barLink" href="https://docs.microsoft.com/azure/sql-data-warehouse/sql-data-warehouse-overview-what-is">Azure SQL Data Warehouse</a></li>
39+
<li><a class="barLink" href="/sql/sql-server/what-s-new-in-sql-server-ver15?view=sql-server-ver15">SQL Server 2019 (Preview)</a></li>
40+
<li><a class="barLink" href="/sql/sql-server/sql-server-technical-documentation?view=sql-server-2017">SQL Server 2017</a></li>
3941
<li><a class="barLink" href="/sql/sql-server/sql-server-technical-documentation?view=sql-server-2016">SQL Server 2016</a></li>
4042
<li><a class="barLink" href="/sql/2014-toc/books-online-for-sql-server-2014?view=sql-server-2014">SQL Server 2014</a></li>
4143
<li><a class="barLink" href="https://docs.microsoft.com/en-us/previous-versions/sql/">Previous SQL Server Versions (2005 - 2012)</a></li>

docs/linux/sql-server-ag-kubernetes.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,15 @@ The code for the operator, HA supervisor, and SQL Server is packaged in a Docker
7070

7171
* `mssql-operator`
7272

73-
This process is deployed as a separate Kubernetes deployment. It registers the custom Kubernetes [custom resource](http://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) called `SqlServer` (sqlservers.mssql.microsoft.com). Then it listens for such resources being created or updated in the Kubernetes cluster. For every such event, it creates or updates the Kubernetes resources for the corresponding instance (for example the StatefulSet, or `mssql-server-k8s-init-sql` job).
73+
This process is deployed as a separate Kubernetes deployment. It registers the [Kubernetes custom resource](http://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) called `SqlServer` (sqlservers.mssql.microsoft.com). Then it listens for such resources being created or updated in the Kubernetes cluster. For every such event, it creates or updates the Kubernetes resources for the corresponding instance (for example the StatefulSet, or `mssql-server-k8s-init-sql` job).
7474

75-
* `mssql-server-k8s-sqlhealth-agent`
75+
* `mssql-server-k8s-health-agent`
7676

7777
This web server serves Kubernetes [liveness probes](http://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/) to determine the health of a SQL Server instance. Monitors the health of the local SQL Server instance by calling `sp_server_diagnostics` and comparing the results with your monitor policy.
7878

7979
* `mssql-ha-supervisor`
8080

81-
Contains `mssql-health-monitor`
82-
83-
This process spawns `mssql-server-k8s-ag-agent` and `mssql-server-k8s-sqlhealth-agent` processes as child processes and terminates them as necessary, based on which AGs the local SQL Server instance is meant to be part of.
84-
85-
It also maintains the ag certificate and endpoint.
81+
Maintains the ag certificate and endpoint.
8682

8783
* `mssql-server-k8s-ag-agent`
8884

docs/linux/sql-server-linux-configure-msdtc-docker.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ docker run \
4141
-d mcr.microsoft.com/mssql/server:vNext-CTP2.0-ubuntu
4242
```
4343

44+
The following command shows the same command for Docker on Windows in PowerShell:
45+
4446
```PowerShell
4547
docker run `
4648
-e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>" `
@@ -56,12 +58,11 @@ In this command, the **RPC Endpoint Mapper** service has been bound to port 1350
5658
5759
## Configure the firewall
5860

59-
In order to communicate with and through the host, you must also configure the firewall on the host server for the containers. Open the firewall for all ports that docker container exposes for communication. In the previous example, this would be ports 135, 51433, 13500, and 51000. These are the ports on the host itself and not the ports they map to in the container. So, if RPC Endpoint mapper port 13500 of container was mapped to host port 13501, then port 13501 (not 13500) should be opened in the firewall for communication with the host.
61+
In order to communicate with and through the host, you must also configure the firewall on the host server for the containers. Open the firewall for all ports that docker container exposes for external communication. In the previous example, this would be ports 135, 51433, and 51000. These are the ports on the host itself and not the ports they map to in the container. So, if RPC Endpoint mapper port 51000 of container was mapped to host port 51001, then port 51001 (not 51000) should be opened in the firewall for communication with the host.
6062

6163
The following example shows how to create these rules on Ubuntu.
6264

6365
```bash
64-
sudo ufw allow from any to any port 13500 proto tcp
6566
sudo ufw allow from any to any port 51433 proto tcp
6667
sudo ufw allow from any to any port 51000 proto tcp
6768
sudo ufw allow from any to any port 135 proto tcp
@@ -72,11 +73,14 @@ The following example shows how this could be done on Red Hat Enterprise Linux (
7273
```bash
7374
sudo firewall-cmd --zone=public --add-port=51999/tcp --permanent
7475
sudo firewall-cmd --zone=public --add-port=51433/tcp --permanent
75-
sudo firewall-cmd --zone=public --add-port=13500/tcp --permanent
7676
sudo firewall-cmd --zone=public --add-port=135/tcp --permanent
7777
sudo firewall-cmd --reload
7878
```
7979

80+
## Configure port routing on the host
81+
82+
If the docker container participates in distributed transactions with a server external to the host, then the host must configure port routing. For more information, see [Configure port routing](sql-server-linux-configure-msdtc.md#configure-port-routing).
83+
8084
## Next steps
8185

8286
For more information about MSDTC on Linux, see [How to configure the Microsoft Distributed Transaction Coordinator (MSDTC) on Linux](sql-server-linux-configure-msdtc.md).

docs/linux/sql-server-linux-configure-msdtc.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ The final step is to configure the firewall to allow communication on **rpcport*
8181
The following example shows how to create these rules on Ubuntu.
8282

8383
```bash
84-
sudo ufw allow from any to any port 13500 proto tcp
8584
sudo ufw allow from any to any port 51999 proto tcp
8685
sudo ufw allow from any to any port 135 proto tcp
8786
```
@@ -90,7 +89,6 @@ The following example shows how this could be done on Red Hat Enterprise Linux (
9089

9190
```bash
9291
sudo firewall-cmd --zone=public --add-port=51999/tcp --permanent
93-
sudo firewall-cmd --zone=public --add-port=13500/tcp --permanent
9492
sudo firewall-cmd --zone=public --add-port=135/tcp --permanent
9593
sudo firewall-cmd --reload
9694
```
@@ -124,13 +122,13 @@ Configure the Linux server routing table so that RPC communication on port 135 i
124122
iptables-save > /etc/iptables.conf
125123
```
126124

127-
4. Add the following command to `/etc/rc.local` to reload the rules after a reboot.
125+
4. To reload the rules after a reboot, add the following command to `/etc/rc.local` (for Ubuntu or RHEL) or to `/etc/init.d/after.local` (for SLES):
128126

129127
```bash
130128
iptables-restore < /etc/iptables.conf
131129
```
132130

133-
The **iptables-save** and **iptables-restore** commands provide a basic mechanism to save and restore iptables entries. Depending on your Linux distribution, there might be more advanced or automated options available. For example, an Ubuntu alternative is the **iptables-persistent** package to make entries persistent. Or for Red Hat Linux, you might be able to modify the /etc/sysconfig/iptables-config file to make the entries persistent.
131+
The **iptables-save** and **iptables-restore** commands provide a basic mechanism to save and restore iptables entries. Depending on your Linux distribution, there might be more advanced or automated options available. For example, an Ubuntu alternative is the **iptables-persistent** package to make entries persistent. Or for Red Hat Enterprise Linux, you may be able to use firewalld service (via firewall-cmd configuration utility with –add-forward-port or similar options) to create persistent port forwarding rules instead of using iptables.
134132

135133
> [!IMPORTANT]
136134
> The previous steps assume a fixed IP address. If the IP address for your SQL Server instance changes (due to manual intervention or DHCP), you must remove and recreate the routing rules. If you need to recreate or delete existing routing rules, you can use the following command to remove old `RpcEndPointMapper` rules:

docs/linux/sql-server-linux-kubernetes-connect.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ monikerRange: ">=sql-server-ver15||>=sql-server-linux-ver15||=sqlallproducts-all
1818

1919
To connect to SQL Server instances in containers on a Kubernetes cluster, create a [load balancer service](http://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer). The load balancer forwards requests for the IP address to the pod running the SQL Server instance.
2020

21-
To connect to an availability group replica, create a service for different replica types. You can see examples of services for different types of replicas in [sql-server-samples](https://github.com/Microsoft/sql-server-samples/tree/master/samples/features/high%20availability).
21+
To connect to an availability group replica, create a service for different replica types. You can see examples of services for different types of replicas in [sql-server-samples](https://github.com/Microsoft/sql-server-samples/blob/master/samples/features/high%20availability/Kubernetes/sample-manifest-files/ag-services.yaml).
2222

2323
* `ag1-primary` points to the primary replica.
2424
* `ag1-secondary-sync` points to the synchronous secondary replica.
@@ -28,7 +28,7 @@ If more than one secondary replica of the same type exists, Kubernetes routes yo
2828

2929
## Create a load balancer service
3030

31-
To create a load balancer service for the primary replica, copy `ag1-primary.yaml` and update it for your availability group.
31+
To create a load balancer service for the primary replica, copy `ag1-primary.yaml` from [sql-server-samples]()and update it for your availability group.
3232

3333
The following command applies the .yaml file to your cluster:
3434

0 commit comments

Comments
 (0)