Skip to content

Commit 6886ccc

Browse files
MashaMSFTMashaMSFT
committed
added vm to toc
1 parent 697d108 commit 6886ccc

File tree

3 files changed

+195
-12
lines changed

3 files changed

+195
-12
lines changed

‎articles/azure-sql/database/sql-data-sync-agent-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ These scenarios might cause this issue:
134134

135135
You discover that the agent isn't running on a computer that hosts SQL Server. When you attempt to manually start the agent, you see a dialog box that displays the message, "Error 1069: The service did not start due to a logon failure."
136136

137-
![Data Sync error 1069 dialog box](./mediasql-data-sync-agent-overview/sync-error-1069.png)
137+
![Data Sync error 1069 dialog box](./media/sql-data-sync-agent-overview/sync-error-1069.png)
138138

139139
- **Cause**. A likely cause of this error is that the password on the local server has changed since you created the agent and agent password.
140140

@@ -158,7 +158,7 @@ You discover that the agent isn't running on a computer that hosts SQL Server. W
158158

159159
After you create or re-create a key for an agent, you try to submit the key through the SqlAzureDataSyncAgent application. The submission fails to complete.
160160

161-
![Sync Error dialog box - Can't submit agent key](./mediasql-data-sync-agent-overview/sync-error-cant-submit-agent-key.png)
161+
![Sync Error dialog box - Can't submit agent key](./media/sql-data-sync-agent-overview/sync-error-cant-submit-agent-key.png)
162162

163163
- **Prerequisites**. Before you proceed, check the following prerequisites:
164164

‎articles/azure-sql/toc.yml

Lines changed: 189 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
- name: Try in-memory features
3838
href: in-memory-sample.md
3939

40-
41-
4240
- name: Common SQL DB & SQL MI docs
4341
items:
4442
- name: Common concepts
@@ -449,9 +447,7 @@
449447
- name: ETL for analytics
450448
href: database/saas-multitenantdb-tenant-analytics.md
451449

452-
453-
454-
- name: Azure SQL Database
450+
- name: SQL Database
455451
items:
456452
- name: Azure SQL Database documentation
457453
href: database/index.yml
@@ -700,7 +696,7 @@
700696
- name: Code samples
701697
href: https://azure.microsoft.com/resources/samples/?service=sql-database
702698

703-
- name: Azure SQL Managed Instance
699+
- name: SQL Managed Instance
704700
items:
705701
- name: Overview
706702
items:
@@ -832,6 +828,190 @@
832828
- name: Code samples
833829
href: https://azure.microsoft.com/resources/samples/?service=sql-database
834830

831+
- name: SQL Server on Azure VM
832+
items:
833+
- name: Windows
834+
items:
835+
- name: Overview
836+
items:
837+
- name: What is a SQL Server VM?
838+
href: virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview.md
839+
- name: Doc changes
840+
href: virtual-machines/windows/virtual-machines/windows/doc-changes-updates-release-notes.md
841+
- name: Quickstarts
842+
items:
843+
- name: Create SQL VM - Portal
844+
href: virtual-machines/windows/sql-vm-create-portal-quickstart.md
845+
- name: Create SQL VM - PowerShell
846+
href: virtual-machines/windows/sql-vm-create-powershell-quickstart.md
847+
- name: Concepts
848+
items:
849+
- name: Best practices
850+
items:
851+
- name: Performance best practices
852+
href: virtual-machines/windows/performance-guidelines-best-practices.md
853+
- name: Security considerations
854+
href: virtual-machines/windows/security-considerations-best-practices.md
855+
- name: Application patterns
856+
href: virtual-machines/windows/application-patterns-development-strategies.md
857+
- name: Business Continuity
858+
items:
859+
- name: High availability options
860+
href: virtual-machines/windows/business-continuity-high-availability-disaster-recovery-hadr-overview.md
861+
- name: Always On availability group
862+
href: virtual-machines/windows/availability-group-manually-configure-multiple-regions.md
863+
- name: Backup and restore
864+
href: virtual-machines/windows/backup-restore.md
865+
- name: Automated backup for SQL Server 2014
866+
href: virtual-machines/windows/automated-backup-sql-2014.md
867+
- name: Automated backup for SQL Server 2016+
868+
href: virtual-machines/windows/automated-backup.md
869+
- name: Management
870+
items:
871+
- name: Dedicated host
872+
href: virtual-machines/windows/dedicated-host.md
873+
- name: With the Azure portal
874+
href: virtual-machines/windows/manage-sql-vm-portal.md
875+
- name: Extend support for SQL 2008 & R2
876+
href: virtual-machines/windows/sql-server-2008-extend-end-of-support.md
877+
- name: Connect to a VM
878+
href: virtual-machines/windows/ways-to-connect-to-sql.md
879+
- name: Configure storage
880+
href: virtual-machines/windows/storage-configuration.md
881+
- name: Automate management tasks
882+
items:
883+
- name: Use the SQL Server IaaS Agent Extension
884+
href: virtual-machines/windows/sql-server-iaas-agent-extension-automate-management.md
885+
- name: Automated Patching
886+
href: virtual-machines/windows/automated-patching.md
887+
- name: Configure Azure Key Vault Integration
888+
href: virtual-machines/windows/azure-key-vault-integration-configure.md
889+
- name: How-to guides
890+
items:
891+
- name: Create SQL VM
892+
items:
893+
- name: Use the portal
894+
href: virtual-machines/windows/create-sql-vm-portal.md
895+
- name: Use Azure PowerShell
896+
href: virtual-machines/windows/create-sql-vm-powershell.md
897+
- name: Register with SQL VM RP
898+
displayName: resource provider, registration
899+
items:
900+
- name: Single VM
901+
href: virtual-machines/windows/sql-vm-resource-provider-register.md
902+
- name: Bulk register multiple VMs
903+
href: virtual-machines/windows/sql-vm-resource-provider-bulk-register.md
904+
- name: Manage
905+
items:
906+
- name: Licensing model
907+
displayName: ahb, ahub, payg, change, modify, update
908+
href: virtual-machines/windows/licensing-model-azure-hybrid-benefit-ahb-change.md
909+
- name: Edition
910+
displayName: change, modify, update
911+
href: virtual-machines/windows/change-sql-server-edition.md
912+
- name: Azure Storage for backup & restore
913+
href: virtual-machines/windows/azure-storage-sql-server-backup-restore-use.md
914+
- name: Migrate
915+
items:
916+
- name: SQL Server database to VM
917+
href: virtual-machines/windows/migrate-to-vm-from-sql-server.md
918+
- name: VM to a new region
919+
href: virtual-machines/windows/move-sql-vm-different-region.md
920+
- name: Configure High Availability
921+
items:
922+
- name: Always On availability group
923+
items:
924+
- name: Azure SQL VM CLI
925+
href: virtual-machines/windows/availability-group-az-cli-configure.md
926+
- name: Azure portal template
927+
href: virtual-machines/windows/availability-group-azure-marketplace-template-configure.md
928+
- name: Azure Quickstart templates
929+
href: virtual-machines/windows/availability-group-quickstart-template-configure.md
930+
- name: Multiple regions
931+
href: virtual-machines/windows/availability-group-manually-configure-multiple-regions.md
932+
- name: Domain-independent (workgroup)
933+
href: virtual-machines/windows/availability-group-clusterless-workgroup-configure.md
934+
- name: Configure manually
935+
items:
936+
- name: Prerequisites
937+
href: virtual-machines/windows/availability-group-manually-configure-prerequisites-tutorial.md
938+
- name: Tutorial
939+
href: virtual-machines/windows/availability-group-manually-configure-tutorial.md
940+
- name: Load balancer - Azure portal
941+
href: virtual-machines/windows/availability-group-load-balancer-portal-configure.md
942+
- name: Load balancer - Azure PowerShell
943+
href: virtual-machines/windows/availability-group-listener-powershell-configure.md
944+
- name: Failover Cluster Instance
945+
items:
946+
- name: With Storage Spaces Direct
947+
href: virtual-machines/windows/failover-cluster-instance-storage-spaces-direct-manually-configure.md
948+
- name: With Premium File Share
949+
href: virtual-machines/windows/failover-cluster-instance-premium-file-share-manually-configure.md
950+
- name: Reference
951+
items:
952+
- name: Azure PowerShell
953+
href: /powershell/azure/overview
954+
- name: Azure CLI
955+
href: /cli/azure/
956+
- name: T-SQL
957+
href: https://docs.microsoft.com/sql/t-sql/language-reference
958+
- name: SQL Server Drivers
959+
href: https://docs.microsoft.com/sql/connect/sql-connection-libraries
960+
- name: REST
961+
href: /rest/api/
962+
- name: Resources
963+
items:
964+
- name: FAQ
965+
href: virtual-machines/windows/frequently-asked-questions-faq.md
966+
- name: Pricing
967+
href: virtual-machines/windows/pricing-guidance.md
968+
- name: SQL Server Data Tools (SSDT)
969+
href: /https://docs.microsoft.com/sql/ssdt/download-sql-server-data-tools-ssdt
970+
- name: SQL Server Management Studio (SSMS)
971+
href: https://docs.microsoft.com/sql/ssms/download-sql-server-management-studio-ssms
972+
- name: SQL Server Tools
973+
href: https://docs.microsoft.com/sql/tools/overview-sql-tools
974+
- name: Azure Roadmap
975+
href: https://azure.microsoft.com/roadmap/?category=compute
976+
- name: MSDN forum
977+
href: https://social.msdn.microsoft.com/Forums/en-US/home?forum=WAVirtualMachinesforWindows&filter=alltypes&brandIgnore=True&sort=relevancedesc&searchTerm=SQL+Server
978+
- name: Stack Overflow
979+
href: https://stackoverflow.com/search?q=%5Bazure-virtual-machine%5D+sql+server
980+
- name: Linux
981+
items:
982+
- name: Overview
983+
items:
984+
- name: About Linux SQL Server VMs
985+
href: virtual-machines/linux/sql-server-on-linux-vm-what-is-iaas-overview.md
986+
- name: Quickstarts
987+
items:
988+
- name: Create SQL VM - Portal
989+
href: virtual-machines/linux/provision-virtual-machine.md
990+
- name: Tutorials
991+
items:
992+
- name: Setting up Azure RHEL VM availability group with STONITH
993+
href: virtual-machines/linux/rhel-high-availability-stonith-tutorial.md
994+
- name: Configure availability group listener for SQL Server on RHEL virtual machines in Azure
995+
href: virtual-machines/linux/rhel-high-availability-listener-tutorial.md
996+
- name: Resources
997+
items:
998+
- name: FAQ
999+
href: virtual-machines/linux/frequently-asked-questions-faq.md
1000+
- name: SQL Server on Linux Documentation
1001+
href: https://docs.microsoft.com/sql/linux/sql-server-linux-overview
1002+
- name: SQL Server Data Tools (SSDT)
1003+
href: https://docs.microsoft.com/sql/ssdt/download-sql-server-data-tools-ssdt
1004+
- name: SQL Server Tools
1005+
href: https://docs.microsoft.com/sql/tools/overview-sql-tools
1006+
- name: Azure Roadmap
1007+
href: https://azure.microsoft.com/roadmap/?category=compute
1008+
- name: Stack Overflow
1009+
href: https://stackoverflow.com/search?q=%5Bazure-virtual-machine%5D+sql+server
1010+
1011+
1012+
1013+
1014+
8351015
- name: Reference
8361016
items:
8371017
- name: Azure CLI
@@ -863,6 +1043,9 @@
8631043
href: https://docs.microsoft.com/sql/tools/sqlpackage?toc=/azure/sql-database/toc.json
8641044
- name: SQL Database Management Library package
8651045
href: https://www.nuget.org/packages/Microsoft.Azure.Management.Sql
1046+
- name: SQL Server Drivers
1047+
href: /sql/connect/sql-connection-libraries
1048+
8661049

8671050
- name: Resources
8681051
items:

‎articles/sql-database-edge/tutorial-sync-data-sync.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ This tutorial requires a Windows computer configured with the [Data Sync Agent f
2929

3030
* Create the necessary tables and objects in your Azure SQL Database Edge deployment. For more information, see [Using SQL Database DAC packages with SQL Database Edge](stream-analytics.md).
3131

32-
* Register the Azure SQL Database Edge instance with the Data Sync Agent for Azure SQL Data Sync. For more information, see [Add an on-premises SQL Server database](../azure-sql/database/data-sync-sql-server-configure.md#add-on-prem).
32+
* Register the Azure SQL Database Edge instance with the Data Sync Agent for Azure SQL Data Sync. For more information, see [Add an on-premises SQL Server database](../azure-sql/database/sql-data-sync-sql-server-configure.md#add-on-prem).
3333

3434
## Sync data between an Azure SQL database and SQL Database Edge
3535

3636
Setting up synchronization between an Azure SQL database and a SQL Database Edge instance by using SQL Data Sync involves three key steps:
3737

38-
1. Use the Azure portal to create a sync group. For more information, see [Create a sync group](../azure-sql/database/data-sync-sql-server-configure.md#create-sync-group). You can use a single *hub* database to create multiple sync groups to synchronize data from various SQL Database Edge instances to one or more SQL databases in Azure.
38+
1. Use the Azure portal to create a sync group. For more information, see [Create a sync group](../azure-sql/database/sql-data-sync-sql-server-configure.md#create-sync-group). You can use a single *hub* database to create multiple sync groups to synchronize data from various SQL Database Edge instances to one or more SQL databases in Azure.
3939

40-
2. Add sync members to the sync group. For more information, see [Add sync members](../azure-sql/database/data-sync-sql-server-configure.md#add-sync-members).
40+
2. Add sync members to the sync group. For more information, see [Add sync members](../azure-sql/database/sql-data-sync-sql-server-configure.md#add-sync-members).
4141

42-
3. Set up the sync group to select the tables that will be part of the synchronization. For more information, see [Configure a sync group](../azure-sql/database/data-sync-sql-server-configure.md#add-sync-members).
42+
3. Set up the sync group to select the tables that will be part of the synchronization. For more information, see [Configure a sync group](../azure-sql/database/sql-data-sync-sql-server-configure.md#add-sync-members).
4343

4444
After you complete the preceding steps, you'll have a sync group that includes an Azure SQL database and a SQL Database Edge instance.
4545

0 commit comments

Comments
 (0)