Skip to content

Commit 86efe83

Browse files
authored
Merge pull request #310789 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 3990373 + 7c564d4 commit 86efe83

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

articles/azure-functions/functions-host-json.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,21 @@ A list of functions that the job host runs. An empty array means run all functio
325325

326326
## functionTimeout
327327

328-
Indicates the timeout duration for all function executions. It follows the timespan string format. A value of `-1` indicates unbounded execution, but keeping a fixed upper bound is recommended.
328+
Indicates the timeout duration for all function executions. It follows the [timespan string format](/dotnet/fundamentals/runtime-libraries/system-timespan-parse). A value of `-1` indicates unbounded execution, but keeping a fixed upper bound is recommended.
329329

330330
```json
331331
{
332332
"functionTimeout": "00:05:00"
333333
}
334334
```
335+
The format of the timespan string needs to follow the syntax `[d.]hh:mm:ss` and the valid values are:
336+
- d = days (optional)
337+
- hh = hours (0–23)
338+
- mm = minutes (0–59)
339+
- ss = seconds (0–59)
340+
341+
> [!TIP]
342+
> When you need to set a 24-hour timeout, you must define it as one day (`"1.00:00:00"`) instead of 24 hours (`"24:00:00"`). You might also use `"23:59:59"`.
335343
336344
For more information on the default and maximum values for specific plans, see [Function app timeout duration](./functions-scale.md#timeout).
337345

articles/azure-vmware/request-host-quota-azure-vmware-solution.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ You need an Azure account in an Azure subscription that adheres to one of the fo
4646

4747
> [!NOTE]
4848
> - Azure VMware Solution requires a minimum of three hosts and recommends redundancy of N+1 hosts.
49-
> - Any unused quota expires after 30 days. A new request needs to be submitted for more quota.
49+
> - Any unused quota or extra quota not deployed will expire after 30 days. A new request needs to be submitted for more quota.
50+
> - Customers with a valid VCF key and extra quota not deployed, quota will not expire and remain after 30 days.
5051
> - **NEW** If requesting quota to use Portable [VMware Cloud Foundation (VCF)](/azure/azure-vmware/vmware-cloud-foundations-license-portability) pricing, add the following statement as is, by replacing (N) with the Number of VCF cores you purchased from Broadcom for license portability to Azure VMware Solution. **"I acknowledge that I have procured portable VCF license from Broadcom for (N) cores to use with Azure VMware Solution."**
5152
> - **VCF Disclaimer** Quota allocation is processed upon request. If you didn't submit the VCF license through [email protected] and provision the hosts, you're subject to Azure VMware Solution pay-as-you-go (PayGo) pricing.
5253
> - **NEW** If you have an Availability Zone requirement for integrating with other Azure services; for example, Azure NetApp Files, create a technical **[New support request](https://portal.azure.com/#create/Microsoft.Support)** once the quota is allocated and before provisioning.

articles/partner-solutions/elastic/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The Elastic integration with Azure includes the following technical capabilities
3232

3333
- **Integrated onboarding** – Deploy Elastic resources directly from Azure portal using the Microsoft.Elastic resource provider.
3434
- **Azure billing integration** – Track Elastic resource consumption and charges through the Azure billing system.
35-
- **Azure Active Directory authentication** – Access Elastic services using Azure AD credentials for single sign-on.
35+
- **Microsoft Entra ID authentication** – Access Elastic services using Entra ID credentials for single sign-on.
3636
- **Log forwarding** – Route Azure subscription activity and resource logs to Elastic for indexing and analysis. For more information, see [Monitor & Observe Azure resources with Azure Native Integrations](../metrics-logs.md).
3737
- **Centralized management** – Configure and monitor log shipping from Azure services to Elastic through a unified interface.
3838
- **Flexible deployment options** – Choose between serverless projects for usage-based scaling and cloud-hosted projects for dedicated, managed clusters.

0 commit comments

Comments
 (0)