Skip to content

Commit 5655452

Browse files
committed
Merge branch 'master' into central-manage-devices-tutorial
2 parents 34a1555 + 558a388 commit 5655452

8 files changed

+26
-15
lines changed

articles/azure-monitor/platform/alerts-metric-near-real-time.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: Supported resources for metric alerts in Azure Monitor
33
description: Reference on support metrics and logs for metric alerts in Azure Monitor
4-
author: snehithm
4+
author: harelbr
55
services: monitoring
66
ms.service: azure-monitor
77
ms.topic: conceptual
88
ms.date: 07/17/2019
9-
ms.author: snmuvva
9+
ms.author: harelbr
1010
ms.subservice: alerts
1111
---
1212

@@ -29,7 +29,7 @@ Here's the full list of Azure monitor metric sources supported by the newer aler
2929
|Microsoft.ApiManagement/service | Yes | [API Management](../../azure-monitor/platform/metrics-supported.md#microsoftapimanagementservice)|
3030
|Microsoft.Automation/automationAccounts | Yes | [Automation Accounts](../../azure-monitor/platform/metrics-supported.md#microsoftautomationautomationaccounts)|
3131
|Microsoft.Batch/batchAccounts | N/A| [Batch Accounts](../../azure-monitor/platform/metrics-supported.md#microsoftbatchbatchaccounts)|
32-
|Microsoft.Cache/Redis | N/A |[Azure Cache for Redis](../../azure-monitor/platform/metrics-supported.md#microsoftcacheredis)|
32+
|Microsoft.Cache/Redis | Yes |[Azure Cache for Redis](../../azure-monitor/platform/metrics-supported.md#microsoftcacheredis)|
3333
|Microsoft.CognitiveServices/accounts | N/A | [Cognitive Services](../../azure-monitor/platform/metrics-supported.md#microsoftcognitiveservicesaccounts)|
3434
|Microsoft.Compute/virtualMachines | N/A | [Virtual Machines](../../azure-monitor/platform/metrics-supported.md#microsoftcomputevirtualmachines)|
3535
|Microsoft.Compute/virtualMachineScaleSets | N/A |[Virtual machine scale sets](../../azure-monitor/platform/metrics-supported.md#microsoftcomputevirtualmachinescalesets)|
@@ -39,24 +39,29 @@ Here's the full list of Azure monitor metric sources supported by the newer aler
3939
|Microsoft.DataFactory/factories | Yes |[Data Factories V2](../../azure-monitor/platform/metrics-supported.md#microsoftdatafactoryfactories)|
4040
|Microsoft.DBforMySQL/servers | N/A |[DB for MySQL](../../azure-monitor/platform/metrics-supported.md#microsoftdbformysqlservers)|
4141
|Microsoft.DBforPostgreSQL/servers | N/A | [DB for PostgreSQL](../../azure-monitor/platform/metrics-supported.md#microsoftdbforpostgresqlservers)|
42-
|Microsoft.Devices/IotHubs | N/A |[IoT Hub Metrics](../../azure-monitor/platform/metrics-supported.md#microsoftdevicesiothubs)
43-
|Microsoft.Devices/provisioningServices | Yes |[DPS Metrics](../../azure-monitor/platform/metrics-supported.md#microsoftdevicesprovisioningservices)
42+
|Microsoft.Devices/IotHubs | N/A |[IoT Hub Metrics](../../azure-monitor/platform/metrics-supported.md#microsoftdevicesiothubs)|
43+
|Microsoft.Devices/provisioningServices | Yes |[DPS Metrics](../../azure-monitor/platform/metrics-supported.md#microsoftdevicesprovisioningservices)|
44+
|Microsoft.EventGrid/topics | Yes |[Event Grid Topics](../../azure-monitor/platform/metrics-supported.md#microsofteventgridtopics)|
45+
|Microsoft.EventHub/clusters | Yes |[Event Hubs Clusters](../../azure-monitor/platform/metrics-supported.md#microsofteventhubclusters)|
4446
|Microsoft.EventHub/namespaces | Yes |[Event Hubs](../../azure-monitor/platform/metrics-supported.md#microsofteventhubnamespaces)|
4547
|Microsoft.KeyVault/vaults| No | [Vaults](../../azure-monitor/platform/metrics-supported.md#microsoftkeyvaultvaults)|
4648
|Microsoft.Logic/workflows | N/A |[Logic Apps](../../azure-monitor/platform/metrics-supported.md#microsoftlogicworkflows) |
49+
|Microsoft.MachineLearningServices/workspaces | Yes | [Machine Learning](../../azure-monitor/platform/metrics-supported.md#microsoftmachinelearningservicesworkspaces) |
4750
|Microsoft.Network/applicationGateways | N/A | [Application Gateways](../../azure-monitor/platform/metrics-supported.md#microsoftnetworkapplicationgateways) |
4851
|Microsoft.Network/dnsZones | N/A| [DNS Zones](../../azure-monitor/platform/metrics-supported.md#microsoftnetworkdnszones) |
4952
|Microsoft.Network/expressRouteCircuits | N/A | [Express Route Circuits](../../azure-monitor/platform/metrics-supported.md#microsoftnetworkexpressroutecircuits) |
5053
|Microsoft.Network/loadBalancers (only for Standard SKUs)| Yes| [Load Balancers](../../azure-monitor/platform/metrics-supported.md#microsoftnetworkloadbalancers) |
5154
|Microsoft.Network/publicipaddresses | N/A |[Public IP Addresses](../../azure-monitor/platform/metrics-supported.md#microsoftnetworkpublicipaddresses)|
5255
|Microsoft.Network/trafficManagerProfiles | Yes | [Traffic Manager Profiles](../../azure-monitor/platform/metrics-supported.md#microsoftnetworktrafficmanagerprofiles) |
53-
|Microsoft.OperationalInsights/workspaces| Yes|[Log Analytics workspaces](../../azure-monitor/platform/metrics-supported.md#microsoftoperationalinsightsworkspaces)|
56+
|Microsoft.OperationalInsights/workspaces| Yes | [Log Analytics workspaces](../../azure-monitor/platform/metrics-supported.md#microsoftoperationalinsightsworkspaces)|
57+
|Microsoft.Relay/namespaces | Yes | [Relays](../../azure-monitor/platform/metrics-supported.md#microsoftrelaynamespaces)|
5458
|Microsoft.PowerBIDedicated/capacities | N/A | [Capacities](../../azure-monitor/platform/metrics-supported.md#microsoftpowerbidedicatedcapacities)|
5559
|Microsoft.Search/searchServices | N/A |[Search services](../../azure-monitor/platform/metrics-supported.md#microsoftsearchsearchservices)|
5660
|Microsoft.ServiceBus/namespaces | Yes |[Service Bus](../../azure-monitor/platform/metrics-supported.md#microsoftservicebusnamespaces)|
5761
|Microsoft.Storage/storageAccounts | Yes | [Storage Accounts](../../azure-monitor/platform/metrics-supported.md#microsoftstoragestorageaccounts)|
5862
|Microsoft.Storage/storageAccounts/services | Yes | [Blob Services](../../azure-monitor/platform/metrics-supported.md#microsoftstoragestorageaccountsblobservices), [File Services](../../azure-monitor/platform/metrics-supported.md#microsoftstoragestorageaccountsfileservices), [Queue Services](../../azure-monitor/platform/metrics-supported.md#microsoftstoragestorageaccountsqueueservices) and [Table Services](../../azure-monitor/platform/metrics-supported.md#microsoftstoragestorageaccountstableservices)|
5963
|Microsoft.StreamAnalytics/streamingjobs | N/A | [Stream Analytics](../../azure-monitor/platform/metrics-supported.md#microsoftstreamanalyticsstreamingjobs)|
64+
|Microsoft.Microsoft.VMWareCloudSimple/virtualMachines | Yes | [CloudSimple Virtual Machines](../../azure-monitor/platform/metrics-supported.md#microsoftvmwarecloudsimplevirtualmachines)|
6065
| Microsoft.Web/serverfarms | Yes | [App Service Plans](../../azure-monitor/platform/metrics-supported.md#microsoftwebserverfarms) |
6166
| Microsoft.Web/sites | Yes | [App Services](../../azure-monitor/platform/metrics-supported.md#microsoftwebsites-excluding-functions) and [Functions](../../azure-monitor/platform/metrics-supported.md#microsoftwebsites-functions)|
6267
| Microsoft.Web/sites/slots | Yes | [App Service slots](../../azure-monitor/platform/metrics-supported.md#microsoftwebsitesslots)|

articles/sql-database/sql-database-managed-instance-get-started-restore.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ This quickstart:
2929
- Uses resources from the [Create a Managed Instance](sql-database-managed-instance-get-started.md) quickstart.
3030
- Requires your computer have the latest [SQL Server Management Studio](https://docs.microsoft.com/sql/ssms/sql-server-management-studio-ssms) installed.
3131
- Requires using SSMS to connect to your Managed Instance. See these quickstarts on how to connect:
32+
- [Enable public endpoint](sql-database-managed-instance-public-endpoint-configure.md) on Managed Instance - this is recommended approach for this tutorial.
3233
- [Connect to an Azure SQL Database Managed Instance from an Azure VM](sql-database-managed-instance-configure-vm.md)
3334
- [Configure a point-to-site connection to an Azure SQL Database Managed Instance from on-premises](sql-database-managed-instance-configure-p2s.md).
34-
- Requires Azure Blob Storage Account (for example Standard_LRS V2) on **public IP** protected with **SAS credential** that has `rw` permission. [Private IPs for blob storage protected by firewall](https://docs.microsoft.com/azure/storage/common/storage-network-security) and Azure Blob Storage service endpoints are currently not supported.
3535

3636
> [!NOTE]
37-
> For more information on backing up and restoring a SQL Server database using Azure Blob storage and a [Shared Access Signature (SAS) key](https://docs.microsoft.com/azure/storage/common/storage-dotnet-shared-access-signature-part-1), see [SQL Server Backup to URL](https://docs.microsoft.com/en-us/sql/relational-databases/backup-restore/sql-server-backup-to-url?view=sql-server-2017).
37+
> For more information on backing up and restoring a SQL Server database using Azure Blob storage and a [Shared Access Signature (SAS) key](https://docs.microsoft.com/azure/storage/common/storage-dotnet-shared-access-signature-part-1), see [SQL Server Backup to URL](https://docs.microsoft.com/sql/relational-databases/backup-restore/sql-server-backup-to-url?view=sql-server-2017).
3838
3939
## Restore the database from a backup file
4040

@@ -80,7 +80,11 @@ In SSMS, follow these steps to restore the Wide World Importers database to your
8080
WHERE r.command in ('BACKUP DATABASE','RESTORE DATABASE')
8181
```
8282

83-
7. When the restore completes, view it in Object Explorer.
83+
7. When the restore completes, view the database in Object Explorer. You can verify that database restore is completed using [sys.dm_operation_status](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-operation-status-azure-sql-database) view.
84+
85+
> [!NOTE]
86+
> Database restore operation is asynchronous and retriable. You might get some error is SQL Server Management Studio if connection breaks or some time-out expires. Azure SQL Database will keep trying to restore database in the background, and you can track the progress of restore using the [sys.dm_exec_requests](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-exec-requests-transact-sql) and [sys.dm_operation_status](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-operation-status-azure-sql-database) views.
87+
> In some phases of restore process you will see unique identifier instead of actual database name in the system views. Learn about `RESTORE` statement behavior differences [here](https://docs.microsoft.com/azure/sql-database/sql-database-managed-instance-transact-sql-information#restore-statement).
8488
8589
## Next steps
8690

articles/sql-database/sql-database-spark-connector.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import com.microsoft.azure.sqldb.spark.connect._
5959
val config = Config(Map(
6060
"url" -> "mysqlserver.database.windows.net",
6161
"databaseName" -> "MyDatabase",
62-
"dbTable" -> "dbo.Clients"
62+
"dbTable" -> "dbo.Clients",
6363
"user" -> "username",
6464
"password" -> "*********",
6565
"connectTimeout" -> "5", //seconds
@@ -97,7 +97,7 @@ import com.microsoft.azure.sqldb.spark.connect._
9797
val config = Config(Map(
9898
"url" -> "mysqlserver.database.windows.net",
9999
"databaseName" -> "MyDatabase",
100-
"dbTable" -> "dbo.Clients"
100+
"dbTable" -> "dbo.Clients",
101101
"user" -> "username",
102102
"password" -> "*********"
103103
))

articles/sql-database/tutorial-managed-instance-azure-active-directory-migration.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: tutorial
88
author: GitHubMirek
99
ms.author: mireks
1010
ms.reviewer: vanto
11-
ms.date: 10/22/2019
11+
ms.date: 10/30/2019
1212
---
1313

1414
# Tutorial: Migrate SQL Server on-premises Windows users and groups to Azure SQL Database managed instance using T-SQL DDL syntax
@@ -36,6 +36,8 @@ To complete this tutorial, the following prerequisites apply:
3636
- Access to Active Directory to create users/groups.
3737
- An existing SQL Server in your on-premises environment.
3838
- An existing managed instance. See [Quickstart: Create an Azure SQL Database managed instance](sql-database-managed-instance-get-started.md).
39+
- A `sysadmin` in the managed instance must be used to create Azure AD logins.
40+
- [Create an Azure AD admin for managed instance](sql-database-aad-authentication-configure.md#provision-an-azure-active-directory-administrator-for-your-managed-instance).
3941
- You can connect to your managed instance within your network. See the following articles for additional information:
4042
- [Connect your application to Azure SQL Database managed instance](sql-database-managed-instance-connect-app.md)
4143
- [Quickstart: Configure a point-to-site connection to an Azure SQL Database Managed Instance from on-premises](sql-database-managed-instance-configure-p2s.md)
@@ -209,7 +211,7 @@ Follow our [Quickstart: Restore a database to a managed instance](sql-database-m
209211

210212
Execute the ALTER USER command to complete the migration process on managed instance.
211213

212-
1. Sign into your managed instance using the SQL Admin account for managed instance. Then create your Azure AD login in the managed instance using the following syntax:
214+
1. Sign into your managed instance using the SQL Admin account for managed instance. Then create your Azure AD login in the managed instance using the following syntax. For more information, see [Tutorial: Managed instance security in Azure SQL Database using Azure AD server principals (logins)](sql-database-managed-instance-aad-security-tutorial.md).
213215

214216
```sql
215217
use master
156 KB
Loading
333 KB
Loading
105 KB
Loading

articles/terraform/terraform-create-k8s-cluster-with-tf-and-aks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ In this section, you see how to use the `terraform init` command to create the r
338338

339339
![Example of "terraform apply" results](./media/terraform-create-k8s-cluster-with-tf-and-aks/terraform-apply-complete.png)
340340

341-
1. In the Azure portal, select **All services** in the left menu to see the resources created for your new Kubernetes cluster.
341+
1. In the Azure portal, select **All resources** in the left menu to see the resources created for your new Kubernetes cluster.
342342

343-
![Cloud Shell prompt](./media/terraform-create-k8s-cluster-with-tf-and-aks/k8s-resources-created.png)
343+
![All resources in the Azure portal](./media/terraform-create-k8s-cluster-with-tf-and-aks/k8s-resources-created.png)
344344

345345
## Recover from a Cloud Shell timeout
346346

0 commit comments

Comments
 (0)