Skip to content

Commit 5446588

Browse files
authored
Merge pull request #284026 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 72fc82c + ba1f65d commit 5446588

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

articles/api-management/azure-openai-token-limit-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ By relying on token usage metrics returned from the OpenAI endpoint, the policy
4444
| -------------- | ----------------------------------------------------------------------------------------------------- | -------- | ------- |
4545
| counter-key | The key to use for the token limit policy. For each key value, a single counter is used for all scopes at which the policy is configured. Policy expressions are allowed.| Yes | N/A |
4646
| tokens-per-minute | The maximum number of tokens consumed by prompt and completion per minute. | Yes | N/A |
47-
| estimate-prompt-tokens | Boolean value that determines whether to estimate the number of tokens required for a prompt: <br> - `true`: estimate the number of tokens based on prompt schema in API; may reduce performance. <br> - `false`: don't estimate prompt tokens. | Yes | N/A |
47+
| estimate-prompt-tokens | Boolean value that determines whether to estimate the number of tokens required for a prompt: <br> - `true`: estimate the number of tokens based on prompt schema in API; may reduce performance. <br> - `false`: don't estimate prompt tokens. <br><br>When set to `false`, the remaining tokens per `counter-key` are calculated using the actual token usage from the response of the model. This could result in prompts being sent to the model that exceed the token limit. In such case, this will be detected in the response, and all succeeding requests will be blocked by the policy until the token limit frees up again. | Yes | N/A |
4848
| retry-after-header-name | The name of a custom response header whose value is the recommended retry interval in seconds after the specified `tokens-per-minute` is exceeded. Policy expressions aren't allowed. | No | `Retry-After` |
4949
| retry-after-variable-name | The name of a variable that stores the recommended retry interval in seconds after the specified `tokens-per-minute` is exceeded. Policy expressions aren't allowed. | No | N/A |
5050
| remaining-tokens-header-name | The name of a response header whose value after each policy execution is the number of remaining tokens allowed for the time interval. Policy expressions aren't allowed.| No | N/A |

articles/azure-vmware/deploy-zerto-disaster-recovery.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@ ms.custom: engagement-fy23
99

1010
# Deploy Zerto disaster recovery on Azure VMware Solution
1111

12-
> [!IMPORTANT]
13-
> **Temporary pause on new onboarding for Zerto on Azure VMware Solution**
14-
>
15-
> Due to ongoing security enhancements and ongoing development work on the Linux version for Azure VMware Solution Run Command and migration activities, we are currently not onboarding new customers for Zerto on Azure VMware Solution. These efforts include transitioning to Linux-based run command, meeting the security requirements to operate the Zerto Linux appliance, and migrating existing customers to latest Zerto version. This pause will be in effect until August 6, 2024.
16-
>
17-
>Please Note: Existing customers will continue to receive full support as usual. For further information regarding the timeline and future onboarding availability, please reach out to your Zerto account team.
18-
>
19-
>Thank you for your understanding and cooperation.
20-
21-
2212
> [!IMPORTANT]
2313
> AV64 node type does not support Zerto Disaster Recovery at the moment. You can contact your Zerto account team to get more information and an estimate of when this will be available.
2414
@@ -90,7 +80,7 @@ In this scenario, the primary site is an Azure VMware Solution private cloud in
9080

9181
- Network connectivity, ExpressRoute based, from Azure VMware Solution to the virtual network used for disaster recovery.
9282

93-
- Follow the [Zerto Virtual Replication Azure Quickstart Guide](https://help.zerto.com/bundle/QS.Azure.HTML.95/page/Zerto_Quick_Start_Azure_Environments.htm) for the rest of the prerequisites.
83+
- Follow the [Zerto Virtual Replication Azure Quickstart Guide](https://help.zerto.com/bundle/Install.MA.HTML.10.0_U1/page/Prerequisites_Requirements_Microsoft_Azure_Environments.htm) for the rest of the prerequisites.
9484

9585
## Install Zerto on Azure VMware Solution
9686

0 commit comments

Comments
 (0)