Skip to content

Commit 70b6bda

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into overview-rewrite
2 parents bd2d78d + 1ecffd0 commit 70b6bda

File tree

7 files changed

+50
-42
lines changed

7 files changed

+50
-42
lines changed

articles/automation/automation-webhooks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Starting an Azure Automation runbook with a webhook
33
description: A webhook that allows a client to start a runbook in Azure Automation from an HTTP call. This article describes how to create a webhook and how to call one to start a runbook.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 03/19/2019
6+
ms.date: 01/16/2020
77
ms.topic: conceptual
88
---
99
# Starting an Azure Automation runbook with a webhook
@@ -120,7 +120,7 @@ The client can't determine when the runbook job completes or its completion stat
120120

121121
## <a name="renew-webhook"></a>Renew a webhook
122122

123-
When a webhook is created, it has a validity time of one year. After that year time the webhook automatically expires. Once a webhook is expired it can't be reactivated, it must be removed and recreated. If a webhook has not reached its expiry time, it can be extended.
123+
When a webhook is created, it has a validity time of ten years. After that time period, the webhook automatically expires. Once a webhook is expired it can't be reactivated, it must be removed and recreated. If a webhook has not reached its expiry time, it can be extended.
124124

125125
To extend a webhook, navigate to the runbook that contains the webhook. Select **Webhooks** under **Resources**. Click the webhook that you want to extend, this action opens the **Webhook** page. Choose a new expiration date and time and click **Save**.
126126

articles/azure-monitor/platform/metrics-supported-export-diagnostic-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,10 +683,10 @@ Yes | Microsoft.Devices/IotHubs | d2c.endpoints.latency.eventHubs | Routing: mes
683683
Yes | Microsoft.Devices/IotHubs | d2c.endpoints.latency.serviceBusQueues | Routing: message latency for Service Bus Queue | Milliseconds | Average
684684
Yes | Microsoft.Devices/IotHubs | d2c.endpoints.latency.serviceBusTopics | Routing: message latency for Service Bus Topic | Milliseconds | Average
685685
Yes | Microsoft.Devices/IotHubs | d2c.endpoints.latency.storage | Routing: message latency for storage | Milliseconds | Average
686-
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.egress.dropped | Routing: telemetry messages dropped | Count | Total
686+
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.egress.dropped | Routing: telemetry messages dropped | Count | Total
687687
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.egress.fallback | Routing: messages delivered to fallback | Count | Total
688688
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.egress.invalid | Routing: telemetry messages incompatible | Count | Total
689-
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.egress.orphaned | Routing: telemetry messages orphaned | Count | Total
689+
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.egress.orphaned | Routing: telemetry messages orphaned | Count | Total
690690
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.egress.success | Routing: telemetry messages delivered | Count | Total
691691
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.ingress.allProtocol | Telemetry message send attempts | Count | Total
692692
Yes | Microsoft.Devices/IotHubs | d2c.telemetry.ingress.sendThrottle | Number of throttling errors | Count | Total

articles/backup/backup-azure-backup-server-vmware.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ If you have secure boundaries within your organization, and don't want to use th
9090

9191
1. Copy and paste the following text into a .txt file.
9292

93-
```text
94-
Windows Registry Editor Version 5.00
95-
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Data Protection Manager\VMWare]
96-
"IgnoreCertificateValidation"=dword:00000001
97-
```
93+
```text
94+
Windows Registry Editor Version 5.00
95+
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft Data Protection Manager\VMWare]
96+
"IgnoreCertificateValidation"=dword:00000001
97+
```
9898

9999
2. Save the file on the Azure Backup Server machine with the name **DisableSecureAuthentication.reg**.
100100

@@ -335,31 +335,31 @@ Add VMware VMs for backup. Protection groups gather multiple VMs and apply the s
335335
To back up vSphere 6.7, do the following:
336336

337337
- Enable TLS 1.2 on DPM Server
338-
>[!Note]
339-
>VMWare 6.7 onwards had enabled TLS as communication protocol.
338+
339+
>[!NOTE]
340+
>VMWare 6.7 onwards had TLS enabled as communication protocol.
340341
341342
- Set the registry keys as follows:
342343

343-
```text
344-
345-
Windows Registry Editor Version 5.00
346-
347-
[HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\.NETFramework\v2.0.50727]
348-
"SystemDefaultTlsVersions"=dword:00000001
349-
"SchUseStrongCrypto"=dword:00000001
350-
351-
[HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\.NETFramework\v4.0.30319]
352-
"SystemDefaultTlsVersions"=dword:00000001
353-
"SchUseStrongCrypto"=dword:00000001
354-
355-
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v2.0.50727]
356-
"SystemDefaultTlsVersions"=dword:00000001
357-
"SchUseStrongCrypto"=dword:00000001
358-
359-
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319]
360-
"SystemDefaultTlsVersions"=dword:00000001
361-
"SchUseStrongCrypto"=dword:00000001
362-
```
344+
```text
345+
Windows Registry Editor Version 5.00
346+
347+
[HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\.NETFramework\v2.0.50727]
348+
"SystemDefaultTlsVersions"=dword:00000001
349+
"SchUseStrongCrypto"=dword:00000001
350+
351+
[HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\.NETFramework\v4.0.30319]
352+
"SystemDefaultTlsVersions"=dword:00000001
353+
"SchUseStrongCrypto"=dword:00000001
354+
355+
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v2.0.50727]
356+
"SystemDefaultTlsVersions"=dword:00000001
357+
"SchUseStrongCrypto"=dword:00000001
358+
359+
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319]
360+
"SystemDefaultTlsVersions"=dword:00000001
361+
"SchUseStrongCrypto"=dword:00000001
362+
```
363363

364364
## Next steps
365365

articles/mariadb/concepts-firewall-rules.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 01/15/2020
99
---
1010

1111
# Azure Database for MariaDB server firewall rules
@@ -30,10 +30,12 @@ If the IP address of the request is within one of the ranges specified in the se
3030
If the IP address of the request is outside the ranges specified in any of the database-level or server-level firewall rules, then the connection request fails.
3131

3232
## Connecting from Azure
33-
To allow applications from Azure to connect to your Azure Database for MariaDB server, Azure connections must be enabled. For example, to host an Azure Web Apps application, or an application that runs in an Azure VM, or to connect from an Azure Data Factory data management gateway. The resources do not need to be in the same Virtual Network (VNet) or Resource Group for the firewall rule to enable those connections. When an application from Azure attempts to connect to your database server, the firewall verifies that Azure connections are allowed. There are a couple of methods to enable these types of connections. A firewall setting with starting and ending address equal to 0.0.0.0 indicates these connections are allowed. Alternatively, you can set the **Allow access to Azure services** option to **ON** in the portal from the **Connection security** pane and hit **Save**. If the connection attempt is not allowed, the request does not reach the Azure Database for MariaDB server.
33+
It is recommended that you find the outgoing IP address of any application or service and explicitly allow access to those individual IP addresses or ranges. For example, you can find the outgoing IP address of an Azure App Service or use a public IP tied to a virtual machine or other resource (see below for info on connecting with a virtual machine's private IP over service endpoints).
34+
35+
If a fixed outgoing IP address isn't available for your Azure service, you can consider enabling connections from all Azure datacenter IP addresses. This setting can be enabled from the Azure portal by setting the **Allow access to Azure services** option to **ON** from the **Connection security** pane and hitting **Save**. From the Azure CLI, a firewall rule setting with starting and ending address equal to 0.0.0.0 does the equivalent. If the connection attempt is not allowed, the request does not reach the Azure Database for MariaDB server.
3436

3537
> [!IMPORTANT]
36-
> This option configures the firewall to allow all connections from Azure including connections from the subscriptions of other customers. When selecting this option, make sure your login and user permissions limit access to only authorized users.
38+
> The **Allow access to Azure services** option configures the firewall to allow all connections from Azure including connections from the subscriptions of other customers. When selecting this option, make sure your login and user permissions limit access to only authorized users.
3739
>
3840
3941
![Configure Allow access to Azure services in the portal](./media/concepts-firewall-rules/allow-azure-services.png)

articles/mysql/concepts-firewall-rules.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mysql
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 01/15/2020
99
---
1010

1111
# Azure Database for MySQL server firewall rules
@@ -30,10 +30,12 @@ If the IP address of the request is within one of the ranges specified in the se
3030
If the IP address of the request is outside the ranges specified in any of the database-level or server-level firewall rules, then the connection request fails.
3131

3232
## Connecting from Azure
33-
To allow applications from Azure to connect to your Azure Database for MySQL server, Azure connections must be enabled. For example, to host an Azure Web Apps application, or an application that runs in an Azure VM, or to connect from an Azure Data Factory data management gateway. The resources do not need to be in the same Virtual Network (VNet) or Resource Group for the firewall rule to enable those connections. When an application from Azure attempts to connect to your database server, the firewall verifies that Azure connections are allowed. There are a couple of methods to enable these types of connections. A firewall setting with starting and ending address equal to 0.0.0.0 indicates these connections are allowed. Alternatively, you can set the **Allow access to Azure services** option to **ON** in the portal from the **Connection security** pane and hit **Save**. If the connection attempt is not allowed, the request does not reach the Azure Database for MySQL server.
33+
It is recommended that you find the outgoing IP address of any application or service and explicitly allow access to those individual IP addresses or ranges. For example, you can find the outgoing IP address of an Azure App Service or use a public IP tied to a virtual machine or other resource (see below for info on connecting with a virtual machine's private IP over service endpoints).
34+
35+
If a fixed outgoing IP address isn't available for your Azure service, you can consider enabling connections from all Azure datacenter IP addresses. This setting can be enabled from the Azure portal by setting the **Allow access to Azure services** option to **ON** from the **Connection security** pane and hitting **Save**. From the Azure CLI, a firewall rule setting with starting and ending address equal to 0.0.0.0 does the equivalent. If the connection attempt is not allowed, the request does not reach the Azure Database for MySQL server.
3436

3537
> [!IMPORTANT]
36-
> This option configures the firewall to allow all connections from Azure including connections from the subscriptions of other customers. When selecting this option, make sure your login and user permissions limit access to only authorized users.
38+
> The **Allow access to Azure services** option configures the firewall to allow all connections from Azure including connections from the subscriptions of other customers. When selecting this option, make sure your login and user permissions limit access to only authorized users.
3739
>
3840
3941
![Configure Allow access to Azure services in the portal](./media/concepts-firewall-rules/allow-azure-services.png)

articles/postgresql/concepts-firewall-rules.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: rachel-msft
55
ms.author: raagyema
66
ms.service: postgresql
77
ms.topic: conceptual
8-
ms.date: 10/25/2019
8+
ms.date: 01/15/2020
99
---
1010
# Firewall rules in Azure Database for PostgreSQL - Single Server
1111
Azure Database for PostgreSQL server firewall prevents all access to your database server until you specify which computers have permission. The firewall grants access to the server based on the originating IP address of each request.
@@ -28,10 +28,12 @@ For example, if your application connects with JDBC driver for PostgreSQL, you m
2828
> org.postgresql.util.PSQLException: FATAL: no pg\_hba.conf entry for host "123.45.67.890", user "adminuser", database "postgresql", SSL
2929
3030
## Connecting from Azure
31-
To allow applications from Azure to connect to your Azure Database for PostgreSQL server, Azure connections must be enabled. For example, to host an Azure Web Apps application, or an application that runs in an Azure VM, or to connect from an Azure Data Factory data management gateway. The resources do not need to be in the same Virtual Network (VNet) or Resource Group for the firewall rule to enable those connections. When an application from Azure attempts to connect to your database server, the firewall verifies that Azure connections are allowed. There are a couple of methods to enable these types of connections. A firewall setting with starting and ending address equal to 0.0.0.0 indicates these connections are allowed. Alternatively, you can set the **Allow access to Azure services** option to **ON** in the portal from the **Connection security** pane and hit **save**. If the connection attempt is not allowed, the request does not reach the Azure Database for PostgreSQL server.
31+
It is recommended that you find the outgoing IP address of any application or service and explicitly allow access to those individual IP addresses or ranges. For example, you can find the outgoing IP address of an Azure App Service or use a public IP tied to a virtual machine or other resource (see below for info on connecting with a virtual machine's private IP over service endpoints).
32+
33+
If a fixed outgoing IP address isn't available for your Azure service, you can consider enabling connections from all Azure datacenter IP addresses. This setting can be enabled from the Azure portal by setting the **Allow access to Azure services** option to **ON** from the **Connection security** pane and hitting **Save**. From the Azure CLI, a firewall rule setting with starting and ending address equal to 0.0.0.0 does the equivalent. If the connection attempt is not allowed, the request does not reach the Azure Database for PostgreSQL server.
3234

3335
> [!IMPORTANT]
34-
> This option configures the firewall to allow all connections from Azure including connections from the subscriptions of other customers. When selecting this option, make sure your login and user permissions limit access to only authorized users.
36+
> The **Allow access to Azure services** option configures the firewall to allow all connections from Azure including connections from the subscriptions of other customers. When selecting this option, make sure your login and user permissions limit access to only authorized users.
3537
>
3638
3739
![Configure Allow access to Azure services in the portal](media/concepts-firewall-rules/allow-azure-services.png)

includes/bastion-regions-include.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
author: cherylmc
66
ms.service: bastion
77
ms.topic: include
8-
ms.date: 12/09/2019
8+
ms.date: 01/16/2020
99
ms.author: cherylmc
1010
ms.custom: include file
1111
---
@@ -15,8 +15,10 @@
1515
>
1616
1717
* West US
18+
* West US 2
1819
* East US
20+
* East US 2
1921
* West Europe
2022
* South Central US
2123
* Australia East
22-
* Japan East
24+
* Japan East

0 commit comments

Comments
 (0)