Skip to content

Commit dbc5e32

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-custom-roles-assignable-scopes
2 parents c163ba9 + 5ec526d commit dbc5e32

15 files changed

+76
-66
lines changed

articles/api-management/developer-portal-integrate-application-insights.md

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure API Management
44
description: Learn how to integrate Application Insights into your managed or self-hosted developer portal.
55
author: dlepow
66
ms.author: danlep
7-
ms.date: 03/25/2021
7+
ms.date: 08/16/2022
88
ms.service: api-management
99
ms.topic: how-to
1010
---
@@ -18,7 +18,7 @@ A popular feature of Azure Monitor is Application Insights. It's an extensible A
1818
Follow these steps to plug Application Insights into your managed or self-hosted developer portal.
1919

2020
> [!IMPORTANT]
21-
> Steps 1 and 2 are not required for managed portals. If you have a managed portal, skip to step 4.
21+
> Steps 1 -3 are not required for managed portals. If you have a managed portal, skip to step 4.
2222
2323
1. Set up a [local environment](developer-portal-self-host.md#step-1-set-up-local-environment) for the latest release of the developer portal.
2424

@@ -28,23 +28,33 @@ Follow these steps to plug Application Insights into your managed or self-hosted
2828
npm install @paperbits/azure --save
2929
```
3030

31-
1. In the `startup.publish.ts` file in the `src` folder, import and register the Application Insights module:
31+
1. In the `startup.publish.ts` file in the `src` folder, import and register the Application Insights module. Add the `AppInsightsPublishModule` after the existing modules in the dependency injection container:
3232

3333
```typescript
3434
import { AppInsightsPublishModule } from "@paperbits/azure";
3535
...
36+
const injector = new InversifyInjector();
37+
injector.bindModule(new CoreModule());
38+
...
3639
injector.bindModule(new AppInsightsPublishModule());
40+
injector.resolve("autostart");
3741
```
3842

39-
1. Retrieve the portal's configuration:
43+
1. Retrieve the portal's configuration using the [Content Item - Get](/rest/api/apimanagement/current-ga/content-item/get) REST API:
4044

4145
```http
42-
GET /contentTypes/document/contentItems/configuration
46+
GET https://management.azure.com/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/Microsoft.ApiManagement/service/{api-management-service-name}/contentTypes/document/contentItems/configuration?api-version=2021-08-01
4347
```
48+
49+
Output is similar to:
4450

4551
```json
4652
{
47-
"nodes": [
53+
"id": "/contentTypes/document/contentItems/configuration",
54+
"type": "Microsoft.ApiManagement/service/contentTypes/contentItems",
55+
"name": "configuration",
56+
"properties": {
57+
"nodes": [
4858
{
4959
"site": {
5060
"title": "Microsoft Azure API Management - developer portal",
@@ -55,17 +65,23 @@ Follow these steps to plug Application Insights into your managed or self-hosted
5565
}
5666
}
5767
]
68+
}
5869
}
5970
```
6071

61-
1. Extend the site configuration from the previous step with Application Insights configuration:
72+
1. Extend the site configuration from the previous step with Application Insights configuration. Update the configuration using the [Content Item - Create or Update](/rest/api/apimanagement/current-ga/content-item/create-or-update) REST API. Pass the Application Insights instrumentation key in an `integration` node in the request body.
73+
6274

6375
```http
64-
PUT /contentTypes/document/contentItems/configuration
76+
PUT https://management.azure.com/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/Microsoft.ApiManagement/service/{api-management-service-name}/contentTypes/document/contentItems/configuration?api-version=2021-08-01
6577
```
6678

6779
```json
6880
{
81+
"id": "/contentTypes/document/contentItems/configuration",
82+
"type": "Microsoft.ApiManagement/service/contentTypes/contentItems",
83+
"name": "configuration",
84+
"properties": {
6985
"nodes": [
7086
{
7187
"site": { ... },
@@ -76,9 +92,12 @@ Follow these steps to plug Application Insights into your managed or self-hosted
7692
}
7793
}
7894
]
95+
}
7996
}
8097
```
8198

99+
1. After you update the configuration, [republish the portal](api-management-howto-developer-portal-customize.md#publish) for the changes to take effect.
100+
82101
## Next steps
83102

84103
Learn more about the developer portal:

articles/api-management/developer-portal-integrate-google-tag-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Follow the steps in this article to plug Google Tag Manager into your managed or
2020
Follow these steps to plug Google Tag Manager into your managed or self-hosted developer portal.
2121

2222
> [!IMPORTANT]
23-
> Steps 1 and 2 are not required for managed portals. If you have a managed portal, skip to step 4.
23+
> Steps 1 - 3 are not required for managed portals. If you have a managed portal, skip to step 4.
2424
2525
1. Set up a [local environment](developer-portal-self-host.md#step-1-set-up-local-environment) for the latest release of the developer portal.
2626

articles/cosmos-db/cassandra/cli-samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: seesharprun
55
ms.service: cosmos-db
66
ms.subservice: cosmosdb-cassandra
77
ms.topic: sample
8-
ms.date: 02/21/2022
8+
ms.date: 08/19/2022
99
ms.author: sidandrews
1010
ms.reviewer: mjbrown
1111
ms.custom: devx-track-azurecli
@@ -41,6 +41,7 @@ These samples apply to all Azure Cosmos DB APIs. These samples use a SQL (Core)
4141
| [Secure with IP firewall](../scripts/cli/common/ipfirewall.md)| Create a Cosmos account with IP firewall configured.|
4242
| [Secure new account with service endpoints](../scripts/cli/common/service-endpoints.md)| Create a Cosmos account and secure with service-endpoints.|
4343
| [Secure existing account with service endpoints](../scripts/cli/common/service-endpoints-ignore-missing-vnet.md)| Update a Cosmos account to secure with service-endpoints when the subnet is eventually configured.|
44+
| [Find existing free-tier account](../scripts/cli/common/free-tier.md)| Find whether there is an existing free-tier account in your subscription.|
4445
|||
4546

4647
## Next steps

articles/cosmos-db/graph/cli-samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: seesharprun
55
ms.service: cosmos-db
66
ms.subservice: cosmosdb-graph
77
ms.topic: sample
8-
ms.date: 02/21/2022
8+
ms.date: 08/19/2022
99
ms.author: sidandrews
1010
ms.reviewer: mjbrown
1111
ms.custom: devx-track-azurecli
@@ -41,6 +41,7 @@ These samples apply to all Azure Cosmos DB APIs. These samples use a SQL (Core)
4141
| [Secure with IP firewall](../scripts/cli/common/ipfirewall.md)| Create a Cosmos account with IP firewall configured.|
4242
| [Secure new account with service endpoints](../scripts/cli/common/service-endpoints.md)| Create a Cosmos account and secure with service-endpoints.|
4343
| [Secure existing account with service endpoints](../scripts/cli/common/service-endpoints-ignore-missing-vnet.md)| Update a Cosmos account to secure with service-endpoints when the subnet is eventually configured.|
44+
| [Find existing free-tier account](../scripts/cli/common/free-tier.md)| Find whether there is an existing free-tier account in your subscription.|
4445
|||
4546

4647
## Next steps

articles/cosmos-db/mongodb/cli-samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: seesharprun
55
ms.service: cosmos-db
66
ms.subservice: cosmosdb-mongo
77
ms.topic: sample
8-
ms.date: 02/21/2022
8+
ms.date: 08/18/2022
99
ms.author: sidandrews
1010
ms.reviewer: mjbrown
1111
ms.custom: devx-track-azurecli
@@ -41,6 +41,7 @@ These samples apply to all Azure Cosmos DB APIs. These samples use a SQL (Core)
4141
| [Secure with IP firewall](../scripts/cli/common/ipfirewall.md)| Create a Cosmos account with IP firewall configured.|
4242
| [Secure new account with service endpoints](../scripts/cli/common/service-endpoints.md)| Create a Cosmos account and secure with service-endpoints.|
4343
| [Secure existing account with service endpoints](../scripts/cli/common/service-endpoints-ignore-missing-vnet.md)| Update a Cosmos account to secure with service-endpoints when the subnet is eventually configured.|
44+
| [Find existing free-tier account](../scripts/cli/common/free-tier.md)| Find whether there is an existing free-tier account in your subscription.|
4445
|||
4546

4647
## Next steps

articles/cosmos-db/sql/cli-samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: seesharprun
55
ms.service: cosmos-db
66
ms.subservice: cosmosdb-sql
77
ms.topic: sample
8-
ms.date: 02/21/2022
8+
ms.date: 08/19/2022
99
ms.author: sidandrews
1010
ms.reviewer: mjbrown
1111
ms.custom: devx-track-azurecli, seo-azure-cli
@@ -42,6 +42,7 @@ These samples apply to all Azure Cosmos DB APIs. These samples use a SQL (Core)
4242
| [Secure with IP firewall](../scripts/cli/common/ipfirewall.md)| Create a Cosmos account with IP firewall configured.|
4343
| [Secure new account with service endpoints](../scripts/cli/common/service-endpoints.md)| Create a Cosmos account and secure with service-endpoints.|
4444
| [Secure existing account with service endpoints](../scripts/cli/common/service-endpoints-ignore-missing-vnet.md)| Update a Cosmos account to secure with service-endpoints when the subnet is eventually configured.|
45+
| [Find existing free-tier account](../scripts/cli/common/free-tier.md)| Find whether there is an existing free-tier account in your subscription.|
4546
|||
4647

4748
## Next steps

articles/cosmos-db/table/cli-samples.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: seesharprun
55
ms.service: cosmos-db
66
ms.subservice: cosmosdb-table
77
ms.topic: sample
8-
ms.date: 02/21/2022
8+
ms.date: 08/19/2022
99
ms.author: sidandrews
1010
ms.reviewer: mjbrown
1111
ms.custom: devx-track-azurecli
@@ -41,6 +41,7 @@ These samples apply to all Azure Cosmos DB APIs. These samples use a SQL (Core)
4141
| [Secure with IP firewall](../scripts/cli/common/ipfirewall.md)| Create a Cosmos account with IP firewall configured.|
4242
| [Secure new account with service endpoints](../scripts/cli/common/service-endpoints.md)| Create a Cosmos account and secure with service-endpoints.|
4343
| [Secure existing account with service endpoints](../scripts/cli/common/service-endpoints-ignore-missing-vnet.md)| Update a Cosmos account to secure with service-endpoints when the subnet is eventually configured.|
44+
| [Find existing free-tier account](../scripts/cli/common/free-tier.md)| Find whether there is an existing free-tier account in your subscription.|
4445
|||
4546

4647
## Next steps

articles/dns/private-resolver-endpoints-rulesets.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The IP address associated with an inbound endpoint is always part of the private
2929

3030
Outbound endpoints egress from Azure and can be linked to [DNS Forwarding Rulesets](#dns-forwarding-rulesets).
3131

32-
Outbound endpoints are also part of the private virtual network address space where the private resolver is deployed. An endpoint is associated with a subnet, but isn't provisioned with an IP address like the inbound endpoint. No other resources can exist in the same subnet with the inbound endpoint. The following screenshot shows an inbound endpoint inside the subnet `snet-E-outbound`.
32+
Outbound endpoints are also part of the private virtual network address space where the private resolver is deployed. An outbound endpoint is associated with a subnet, but isn't provisioned with an IP address like the inbound endpoint. No other resources can exist in the same subnet with the outbound endpoint. The following screenshot shows an outbound endpoint inside the subnet `snet-E-outbound`.
3333

3434
![View outbound endpoints](./media/private-resolver-endpoints-rulesets/east-outbound-endpoint.png)
3535

@@ -44,13 +44,18 @@ Rulesets have the following associations:
4444

4545
A ruleset can't be linked to a virtual network in another region.
4646

47-
When you link a ruleset to a virtual network, resources within that virtual network will use the DNS forwarding rules enabled in the ruleset. The linked virtual network must peer with the virtual network where the outbound endpoint exists. This configuration is typically used in a hub and spoke design, with spoke vnets peered to a hub vnet that has one or more private resolver endpoints. In this hub and spoke scenario, the spoke vnet does not need to be linked to the private DNS zone in order to resolve resource records in the zone, because the forwarding ruleset rule for the private zone sends queries to the hub vnet's inbound endpoint. For example: **azure.contoso.com** to **10.10.0.4**.
47+
When you link a ruleset to a virtual network, resources within that virtual network will use the DNS forwarding rules enabled in the ruleset. The linked virtual network must peer with the virtual network where the outbound endpoint exists. This configuration is typically used in a hub and spoke design, with spoke vnets peered to a hub vnet that has one or more private resolver endpoints. In this hub and spoke scenario, the spoke vnet does not need to be linked to the private DNS zone in order to resolve resource records in the zone. In this case, the forwarding ruleset rule for the private zone sends queries to the hub vnet's inbound endpoint. For example: **azure.contoso.com** to **10.10.0.4**.
4848

4949
The following screenshot shows a DNS forwarding ruleset linked to two virtual networks: a hub vnet: **myeastvnet**, and a spoke vnet: **myeastspoke**.
5050

5151
![View ruleset links](./media/private-resolver-endpoints-rulesets/ruleset-links.png)
5252

53-
Virtual network links for DNS forwarding rulesets enable resources in vnets to use forwarding rules when resolving DNS names. Vnets that are linked from a ruleset but don't have their own private resolver must have a peering connection to the vnet that contains the private resolver. The vnet with the private resolver must also be linked from any private DNS zones for which there are ruleset rules.
53+
Virtual network links for DNS forwarding rulesets enable resources in vnets to use forwarding rules when resolving DNS names. Vnets that are linked from a ruleset, but don't have their own private resolver, must have a peering connection to the vnet that contains the private resolver. The vnet with the private resolver must also be linked from any private DNS zones for which there are ruleset rules.
54+
55+
For example, resources in the vnet `myeastspoke` can resolve records in the private DNS zone `azure.contoso.com` if:
56+
- The vnet `myeastspoke` peers with `myeastvnet`
57+
- The ruleset provisioned in `myeastvnet` is linked to `myeastspoke` and `myeastvnet`
58+
- A ruleset rule is configured and enabled in the linked ruleset to resolve `azure.contoso.com` using the inbound endpoint in `myeastvnet`
5459

5560
### Rules
5661

articles/dns/tutorial-dns-private-resolver-failover.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Now that DNS resolution is working from on-premises to Azure using two different
127127
> [!NOTE]
128128
> The DNS server that you use to configure forwarding should be a server that client devices on your network will use for DNS resolution. If the server you're configuring is not the default, you'll need to query it's IP address directly (ex: nslookup test.azure.contoso.com 10.100.0.2) after forwarding is configured.
129129
130-
1. Open an elevated Windows PowerShell prompt and prompt commands. Replace **azure.contoso.com** with the name of your private zone, and replace the IP addresses below with the IP addresses for your private resolvers.
130+
1. Open an elevated Windows PowerShell prompt and issue the following command. Replace **azure.contoso.com** with the name of your private zone, and replace the IP addresses below with the IP addresses of your private resolvers.
131131
132132
```PowerShell
133133
Add-DnsServerConditionalForwarderZone -Name "azure.contoso.com" -MasterServers 10.20.0.4,10.10.0.4

articles/key-vault/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Key Vault
33
description: Lists Azure Policy built-in policy definitions for Key Vault. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 08/16/2022
4+
ms.date: 08/19/2022
55
ms.topic: reference
66
author: msmbaldwin
77
ms.author: mbaldwin

0 commit comments

Comments
 (0)