Skip to content

Commit 73ebb78

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-qsrt1720714
2 parents 886ebf8 + a5e1991 commit 73ebb78

File tree

9 files changed

+24
-25
lines changed

9 files changed

+24
-25
lines changed

articles/azure-resource-manager/templates/template-functions-resource.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Template functions - resources
33
description: Describes the functions to use in an Azure Resource Manager template to retrieve values about resources.
44
ms.topic: conceptual
5-
ms.date: 04/28/2020
5+
ms.date: 05/20/2020
66
---
77
# Resource functions for ARM templates
88

@@ -102,7 +102,7 @@ The following example returns the resource ID for a resource group lock.
102102

103103
`list{Value}(resourceName or resourceIdentifier, apiVersion, functionValues)`
104104

105-
The syntax for this function varies by name of the list operations. Each implementation returns values for the resource type that supports a list operation. The operation name must start with `list`. Some common usages are `listKeys` and `listSecrets`.
105+
The syntax for this function varies by name of the list operations. Each implementation returns values for the resource type that supports a list operation. The operation name must start with `list`. Some common usages are `listKeys`, `listKeyValue` and `listSecrets`.
106106

107107
### Parameters
108108

@@ -123,6 +123,7 @@ The possible uses of list* are shown in the following table.
123123
| Resource type | Function name |
124124
| ------------- | ------------- |
125125
| Microsoft.AnalysisServices/servers | [listGatewayStatus](/rest/api/analysisservices/servers/listgatewaystatus) |
126+
| Microsoft.AppConfiguration] | [ListKeyValue](/rest/api/appconfiguration/configurationstores/listkeyvalue) |
126127
| Microsoft.AppConfiguration/configurationStores | ListKeys |
127128
| Microsoft.Automation/automationAccounts | [listKeys](/rest/api/automation/keys/listbyautomationaccount) |
128129
| Microsoft.Batch/batchAccounts | [listkeys](/rest/api/batchmanagement/batchaccount/getkeys) |

articles/event-grid/auth0-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ms.author: babanisa
1212

1313
# Auth0 Partner Topics
1414
![Auth0 Logo](./media/auth0-overview/auth0-logo.png)
15+
1516
Auth0, the identity platform for application builders, provides developers and enterprises with the building blocks they need to secure their applications.
1617

1718
The Auth0 Partner Topic allows you to use events that are emitted by Auth0’s system to accomplish a number of tasks. Engage with users in meaningful ways after the authentication or automate security and infrastructure tasks.
2.96 KB
Loading
3.04 KB
Loading
6.52 KB
Loading
9.75 KB
Loading

articles/event-grid/partner-onboarding-overview.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ Partner topics allow you to publish events to Azure Event Grid for multitenant c
3030
#### Partner flow
3131

3232
1. Create an Azure tenant if you don't already have one.
33-
1. Using CLI create a new Event Grid `partnerRegistration`. This resource includes information such as display name, description, setup URI and so on.
34-
![Create Partner Topic](./media/partner-onboarding-how-to/create-partner-registration.png)
33+
1. Using CLI create a new Event Grid `partnerRegistration`. This resource includes information such as display name, description, setup URI and so on.
34+
35+
![Create Partner Topic](./media/partner-onboarding-how-to/create-partner-registration.png)
36+
3537
1. Create one or more `partnerNamespaces` in each region you want to publish events. As part of this, Event Grid service will provision a publishing endpoint (for example, https://contoso.westus-1.eventgrid.azure.net/api/events) and access keys.
36-
![Create Partner Namespace](./media/partner-onboarding-how-to/create-partner-namespace.png)
38+
39+
![Create Partner Namespace](./media/partner-onboarding-how-to/create-partner-namespace.png)
40+
3741
1. Provide a way for customers to register in your system that they would like a partner topic.
3842
1. Contact the Event Grid team to let us know you would like your Partner Topic Type to become public.
3943

@@ -42,9 +46,12 @@ Partner topics allow you to publish events to Azure Event Grid for multitenant c
4246
1. Your customer will visit the Azure portal to note the Azure Subscription ID and Resource Group they would like the Partner Topic created in.
4347
1. The customer will request a Partner Topic via your system. In response, you'll create an Event Tunnel your Partner Namespace.
4448
1. Event Grid will create a **Pending** Partner Topic in the customer's Azure Subscription and Resource Group.
45-
![Create Event Channel](./media/partner-onboarding-how-to/create-event-tunnel-partner-topic.png)
49+
50+
![Create Event Channel](./media/partner-onboarding-how-to/create-event-tunnel-partner-topic.png)
51+
4652
1. The customer activates the Partner Topic via the Azure portal. Events may now flow from your service to the customer's Azure Subscription.
47-
![Activate Partner Topic](./media/partner-onboarding-how-to/activate-partner-topic.png)
53+
54+
![Activate Partner Topic](./media/partner-onboarding-how-to/activate-partner-topic.png)
4855

4956
## Resource Model
5057

@@ -60,21 +67,14 @@ Below is the resource model for Partner Topics.
6067
Only Microsoft approved partnerRegistrations are discoverable by customers.
6168
* Scope: Created in partner's Azure Subscription. Metadata visible to customers once public.
6269

63-
### Event Types
64-
* Resource: `partnerRegistrations/eventTypes`
65-
* Used by: Partners
66-
* Description: Captures metadata about event types supported by a partner registration.
67-
* Scope: Discoverable by customers once made public. Lives in a partner’s subscription as a child resource of Partner Registration.
68-
69-
7070
### Partner Namespaces
7171
* Resource: partnerNamespaces
7272
* Used by: Partners
7373
* Description: Provides a regional resource for publishing customer events to. Each Partner Namespace has a publishing endpoint and auth keys. The namespace is also how the partner requests a Partner Topic for a given customer and lists active customers.
7474
* Scope: Lives in partner’s subscription.
7575

76-
### Event Tunnels
77-
* Resource: `partnerNamespaces/eventTunnels`
76+
### Event Channel
77+
* Resource: `partnerNamespaces/eventChannels`
7878
* Used by: Partners
7979
* Description: The Event Tunnels are a mirror of the customer's Partner Topic. By creating an Event Tunnel and specifying the customer's Azure Subscription and resource Group in the metadata, you're signaling to Event Grid to create a Partner Topic for the customer. Event Grid will issue an ARM call to create a corresponding partnerTopic in the customer’s subscription. The partner topic will be created in a "pending" state. There’s a 1-1 link between each eventTunnel and a partnerTopic.
8080
* Scope: Lives in partner’s subscription.

articles/event-grid/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@
134134
href: event-schema-subscriptions.md
135135
- name: Partner topics
136136
items:
137-
- name: Overview of Partner topics
137+
- name: Overview of partner topics
138138
href: partner-topics-overview.md
139139
- name: Auth0
140140
href: auth0-overview.md
141141
- name: Become and Event Grid Partner
142-
href: partner-onboarding-overview.md
142+
href: partner-onboarding-overview.md
143143
- name: Event Domains
144144
href: event-domains.md
145145
- name: Event schema formats

articles/virtual-network/virtual-networks-udr-overview.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@ titlesuffix: Azure Virtual Network
44
description: Learn how Azure routes virtual network traffic, and how you can customize Azure's routing.
55
services: virtual-network
66
documentationcenter: na
7-
author: malopMSFT
7+
author: KumudD
88
manager:
9-
editor: v-miegge
10-
tags:
11-
129
ms.service: virtual-network
1310
ms.devlang: NA
1411
ms.topic: article
1512
ms.tgt_pltfrm: na
1613
ms.workload: infrastructure-services
1714
ms.date: 10/26/2017
18-
ms.author: malop
19-
ms.reviewer: kumud
15+
ms.author: aldomel
16+
2017
---
2118

2219
# Virtual network traffic routing
@@ -166,7 +163,7 @@ When you override the 0.0.0.0/0 address prefix, in addition to outbound traffic
166163

167164
If your virtual network is connected to an Azure VPN gateway, do not associate a route table to the [gateway subnet](../vpn-gateway/vpn-gateway-about-vpn-gateway-settings.md?toc=%2fazure%2fvirtual-network%2ftoc.json#gwsub) that includes a route with a destination of 0.0.0.0/0. Doing so can prevent the gateway from functioning properly. For details, see the *Why are certain ports opened on my VPN gateway?* question in the [VPN Gateway FAQ](../vpn-gateway/vpn-gateway-vpn-faq.md?toc=%2fazure%2fvirtual-network%2ftoc.json#gatewayports).
168165

169-
See [DMZ between Azure and your on-premises datacenter](/azure/architecture/reference-architectures/dmz/secure-vnet-hybrid?toc=%2fazure%2fvirtual-network%2ftoc.json) and [DMZ between Azure and the Internet](/azure/architecture/reference-architectures/dmz/secure-vnet-dmz?toc=%2fazure%2fvirtual-network%2ftoc.json) for implementation details when using virtual network gateways and virtual appliances between the Internet and Azure.
166+
See [DMZ between Azure and your on-premises datacenter](/azure/architecture/reference-architectures/dmz/secure-vnet-hybrid?toc=%2fazure%2fvirtual-network%2ftoc.json) for implementation details when using virtual network gateways between the Internet and Azure.
170167

171168
## Routing example
172169

0 commit comments

Comments
 (0)