Skip to content

Commit 33d1b31

Browse files
authored
Merge branch 'MicrosoftDocs:main' into embed-trycosmosdb-video
2 parents 15bcc92 + 7d8cc11 commit 33d1b31

16 files changed

+142
-124
lines changed

articles/ai-services/openai/how-to/provisioned-throughput-onboarding.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure OpenAI Service Provisioned Throughput Units (PTU) onboarding
33
description: Learn about provisioned throughput units onboarding and Azure OpenAI.
44
ms.service: azure-ai-openai
55
ms.topic: conceptual
6-
ms.date: 05/02/2024
6+
ms.date: 06/25/2024
77
manager: nitinme
88
author: mrbullwinkle
99
ms.author: mbullwin
@@ -44,11 +44,13 @@ The **Provisioned** option and the capacity planner are only available in certai
4444
|---|---|
4545
|Model | OpenAI model you plan to use. For example: GPT-4 |
4646
| Version | Version of the model you plan to use, for example 0614 |
47-
| Prompt tokens | Number of tokens in the prompt for each call |
48-
| Generation tokens | Number of tokens generated by the model on each call |
49-
| Peak calls per minute | Peak concurrent load to the endpoint measured in calls per minute|
47+
| Peak calls per min | The number of calls per minute that are expected to be sent to the model |
48+
| Tokens in prompt call | The number of tokens in the prompt for each call to the model. Calls with larger prompts will utilize more of the PTU deployment. Currently this calculator assumes a single prompt value so for workloads with wide variance, we recommend benchmarking your deployment on your traffic to determine the most accurate estimate of PTU needed for your deployment. |
49+
| Tokens in model response | The number of tokens generated from each call to the model. Calls with larger generation sizes will utilize more of the PTU deployment. Currently this calculator assumes a single prompt value so for workloads with wide variance, we recommend benchmarking your deployment on your traffic to determine the most accurate estimate of PTU needed for your deployment. |
5050

51-
After you fill in the required details, select **Calculate** to view the suggested PTU for your scenario.
51+
After you fill in the required details, select **Calculate** button in the output column.
52+
53+
The values in the output column are the estimated value of PTU units required for the provided workload inputs. The first output value represents the estimated PTU units required for the workload, rounded to the nearest PTU scale increment. The second output value represents the raw estimated PTU units required for the workload. The token totals are calculated using the following equation: `Total = Peak calls per minute * (Tokens in prompt call + Tokens in model response)`.
5254

5355
:::image type="content" source="../media/how-to/provisioned-onboarding/capacity-calculator.png" alt-text="Screenshot of the Azure OpenAI Studio landing page." lightbox="../media/how-to/provisioned-onboarding/capacity-calculator.png":::
5456

26.1 KB
Loading

articles/postgresql/flexible-server/concepts-extensions.md

Lines changed: 120 additions & 105 deletions
Large diffs are not rendered by default.

articles/postgresql/flexible-server/how-to-connect-query-guide.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The following document includes links to examples showing how to connect and que
2121
| Quickstart | Description |
2222
|---|---|
2323
|[Pgadmin](https://www.pgadmin.org/)|You can use pgadmin to connect to the server and it simplifies the creation, maintenance and use of database objects.|
24-
|[psql in Azure Cloud Shell](./quickstart-create-server-cli.md#connect-using-postgresql-command-line-client)|This article shows how to run [**psql**](https://www.postgresql.org/docs/current/static/app-psql.html) in [Azure Cloud Shell](../../cloud-shell/overview.md) to connect to your server and then run statements to query, insert, update, and delete data in the database.You can run **psql** if installed on your development environment|
24+
|[psql in Azure Cloud Shell](./quickstart-create-server-cli.md#connect-using-postgresql-command-line-client)|This article shows how to run [**psql**](https://www.postgresql.org/docs/current/static/app-psql.html) in [Azure Cloud Shell](../../cloud-shell/overview.md) to connect to your server and then run statements to query, insert, update, and delete data in the database. You can run **psql** if installed on your development environment|
2525
|[Python](connect-python.md)|This quickstart demonstrates how to use Python to connect to a database and use work with database objects to query data. |
2626
|[Django with App Service](/azure/app-service/tutorial-python-postgresql-app)|This tutorial demonstrates how to use Ruby to create a program to connect to a database and use work with database objects to query data.|
2727

@@ -34,7 +34,8 @@ Transport Layer Security (TLS) is used by all drivers that Microsoft supplies or
3434
Azure Database for PostgreSQL flexible server provides the ability to extend the functionality of your database using extensions. Extensions bundle multiple related SQL objects together in a single package that can be loaded or removed from your database with a single command. After being loaded in the database, extensions function like built-in features.
3535

3636
- [Postgres extensions](./concepts-extensions.md#extension-versions)
37-
- [dblink and postgres_fdw](./concepts-extensions.md#dblink-and-postgres_fdw)
37+
- [dblink](./concepts-extensions.md#dblink)
38+
- [postgres_fdw](./concepts-extensions.md#postgres_fdw)
3839
- [pg_prewarm](./concepts-extensions.md#pg_prewarm)
3940
- [pg_stat_statements](./concepts-extensions.md#pg_stat_statements)
4041

articles/virtual-wan/create-bgp-peering-hub-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: cherylmc
1313

1414
This article helps you configure an Azure Virtual WAN hub router to peer with a Network Virtual Appliance (NVA) in your virtual network using BGP Peering using the Azure portal. The virtual hub router learns routes from the NVA in a spoke VNet that is connected to a virtual WAN hub. The virtual hub router also advertises the virtual network routes to the NVA. For more information, see [Scenario: BGP peering with a virtual hub](scenario-bgp-peering-hub.md). You can also create this configuration using [Azure PowerShell](create-bgp-peering-hub-powershell.md).
1515

16-
:::image type="content" source="./media/create-bgp-peering-hub-portal/diagram.png" alt-text="Diagram of configuration.":::
16+
:::image type="content" source="./media/create-bgp-peering-hub-portal/diagram.png" alt-text="Diagram of configuration." lightbox="./media/create-bgp-peering-hub-portal/diagram.png":::
1717

1818
## Prerequisites
1919

articles/virtual-wan/create-bgp-peering-hub-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: cherylmc
1313

1414
This article helps you configure an Azure Virtual WAN hub router to peer with a Network Virtual Appliance (NVA) in your virtual network using BGP Peering using Azure PowerShell. The virtual hub router learns routes from the NVA in a spoke VNet that is connected to a virtual WAN hub. The virtual hub router also advertises the virtual network routes to the NVA. For more information, see [Scenario: BGP peering with a virtual hub](scenario-bgp-peering-hub.md). You can also create this configuration using the [Azure portal](create-bgp-peering-hub-portal.md).
1515

16-
:::image type="content" source="./media/create-bgp-peering-hub-portal/diagram.png" alt-text="Diagram of configuration.":::
16+
:::image type="content" source="./media/create-bgp-peering-hub-portal/diagram.png" alt-text="Diagram of configuration." lightbox="./media/create-bgp-peering-hub-portal/diagram.png":::
1717

1818
## Prerequisites
1919

articles/virtual-wan/cross-tenant-vnet-az-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: aldairzamora
1616

1717
This article helps you use Azure Virtual WAN to connect a virtual network to a virtual hub in a different tenant. This architecture is useful if you have client workloads that must be connected to be the same network but are on different tenants. For example, as shown in the following diagram, you can connect a non-Contoso virtual network (the remote tenant) to a Contoso virtual hub (the parent tenant).
1818

19-
:::image type="content" source="./media/cross-tenant-vnet/connectivity.png" alt-text="Diagram that shows a routing configuration with a parent tenant and a remote tenant." :::
19+
:::image type="content" source="./media/cross-tenant-vnet/connectivity.png" alt-text="Diagram that shows a routing configuration with a parent tenant and a remote tenant." lightbox="./media/cross-tenant-vnet/connectivity.png":::
2020

2121
In this article, you learn how to:
2222

articles/virtual-wan/cross-tenant-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.author: wellee
1515

1616
This article helps you use Azure Virtual WAN to connect a virtual network to a virtual hub in a different tenant. This architecture is useful if you have client workloads that must be connected to be the same network but are on different tenants. For example, as shown in the following diagram, you can connect a non-Contoso virtual network (the remote tenant) to a Contoso virtual hub (the parent tenant).
1717

18-
:::image type="content" source="./media/cross-tenant-vnet/connectivity.png" alt-text="Diagram that shows a routing configuration with a parent tenant and a remote tenant." :::
18+
:::image type="content" source="./media/cross-tenant-vnet/connectivity.png" alt-text="Diagram that shows a routing configuration with a parent tenant and a remote tenant." lightbox="./media/cross-tenant-vnet/connectivity.png":::
1919

2020
In this article, you learn how to:
2121

articles/virtual-wan/manage-secure-access-resources-spoke-p2s.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This article shows you how to use Virtual WAN and Azure Firewall rules and filte
1717

1818
The steps in this article help you create the architecture in the following diagram to allow User VPN clients to access a specific resource (VM1) in a spoke VNet connected to the virtual hub, but not other resources (VM2). Use this architecture example as a basic guideline.
1919

20-
:::image type="content" source="./media/manage-secure-access-resources-spoke-p2s/diagram.png" alt-text="Diagram of a Secured virtual hub.":::
20+
:::image type="content" source="./media/manage-secure-access-resources-spoke-p2s/diagram.png" alt-text="Diagram of a Secured virtual hub." lightbox="./media/manage-secure-access-resources-spoke-p2s/diagram.png":::
2121

2222
## Prerequisites
2323

articles/virtual-wan/quickstart-any-to-any-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The template used in this quickstart is from [Azure Quickstart Templates](https:
3131

3232
In this quickstart, you'll create an Azure Virtual WAN multi-hub deployment, including all gateways and VNet connections. The list of input parameters has been purposely kept at a minimum. The IP addressing scheme can be changed by modifying the variables inside of the template. The scenario is explained further in the [Any-to-any scenario](scenario-any-to-any.md) article.
3333

34-
:::image type="content" source="./media/routing-scenarios/any-any/figure-1.png" alt-text="Deployment architecture":::
34+
:::image type="content" source="./media/routing-scenarios/any-any/figure-1.png" alt-text="Screenshot of deployment architecture." lightbox="./media/routing-scenarios/any-any/figure-1.png":::
3535

3636
This template creates a fully functional Azure Virtual WAN environment with the following resources:
3737

0 commit comments

Comments
 (0)