Skip to content

Commit b00998f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-mtu-size
commit
2 parents 0456bbd + 0cd60cf commit b00998f

File tree

50 files changed

+356
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+356
-222
lines changed

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -579,14 +579,18 @@ These estimates will vary based on the values set for the above parameters. For
579579

580580
The estimates also depend on the nature of the documents and questions being asked. For example, if the questions are open-ended, the responses are likely to be longer. Similarly, a longer system message would contribute to a longer prompt that consumes more tokens, and if the conversation history is long, the prompt will be longer.
581581

582-
| Model | Max tokens for system message | Max tokens for model response |
583-
|--|--|--|
584-
| GPT-35-0301 | 400 | 1500 |
585-
| GPT-35-0613-16K | 1000 | 3200 |
586-
| GPT-4-0613-8K | 400 | 1500 |
587-
| GPT-4-0613-32K | 2000 | 6400 |
588-
589-
The table above shows the maximum number of tokens that can be used for the [system message](#system-message) and the model response. Additionally, the following also consume tokens:
582+
| Model | Max tokens for system message |
583+
|--|--|
584+
| GPT-35-0301 | 400 |
585+
| GPT-35-0613-16K | 1000 |
586+
| GPT-4-0613-8K | 400 |
587+
| GPT-4-0613-32K | 2000 |
588+
| GPT-35-turbo-0125 | 2000 |
589+
| GPT-4-turbo-0409 | 4000 |
590+
| GPT-4o | 4000 |
591+
| GPT-4o-mini | 4000 |
592+
593+
The table above shows the maximum number of tokens that can be used for the [system message](#system-message). To see the maximum tokens for the model response, see the [models article](./models.md#gpt-4-and-gpt-4-turbo-models). Additionally, the following also consume tokens:
590594

591595

592596

articles/aks/troubleshoot-udp-packet-drops.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Diagnose and solve UDP packet drops in Azure Kubernetes Service (AKS)
33
description: Learn how to diagnose and solve UDP packet drops in Azure Kubernetes Service (AKS).
44
ms.topic: how-to
5-
ms.date: 05/09/2024
5+
ms.date: 07/25/2024
66
author: schaffererin
77
ms.author: schaffererin
88
ms.service: azure-kubernetes-service
@@ -132,6 +132,19 @@ Once you apply the new values, you can access your VM to ensure the new values a
132132

133133
Your values should now be set to the values outlined in `linuxosconfig.json`.
134134

135+
## Revert to original values
136+
137+
If you want to restore the buffer size to its default value of *0.2 MB*, you can update the `linuxosconfig.json` file with the following values:
138+
139+
```json
140+
{
141+
"sysctls": {
142+
"netCoreRmemMax": 212992,
143+
"netCoreRmemDefault": 212992
144+
}
145+
}
146+
```
147+
135148
## Next steps
136149

137150
In this article, you learned how to diagnose and solve UDP packet drops in Azure Kubernetes Service (AKS). For more information on how to troubleshoot issues in AKS, see the [Azure Kubernetes Service troubleshooting documentation](/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes).

articles/automanage/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ title: Frequently asked questions for Azure Automanage for VMs
1111
summary: |
1212
This article provides answers to some of the most common questions about [Azure Automanage for virtual machines](overview-about.md).
1313
14-
If your Azure issue isn't addressed in this article, visit the Azure forums on [Microsoft Q & A and Stack Overflow](https://azure.microsoft.com/support/forums/). You can post your issue in these forums, or post to [@AzureSupport on Twitter](https://twitter.com/AzureSupport). You can also submit an Azure support request. To submit a support request, on the [Azure support page](https://azure.microsoft.com/support/options/), select **Get support**.
14+
If your Azure issue isn't addressed in this article, visit the Azure forums on [Microsoft Q & A and Stack Overflow](https://azure.microsoft.com/support/forums/). You can post your issue in these forums, or post to [@AzureSupport on X](https://x.com/azuresupport). You can also submit an Azure support request. To submit a support request, on the [Azure support page](https://azure.microsoft.com/support/options/), select **Get support**.
1515
1616
1717

articles/azure-cache-for-redis/cache-redis-samples.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ The [Manage Azure Cache for Redis using Azure Management Libraries](https://gith
6868

6969
The [Access Azure Cache for Redis Monitoring data](https://github.com/rustd/RedisSamples/tree/master/CustomMonitoring) sample demonstrates how to access monitoring data for your Azure Cache for Redis outside of the Azure portal.
7070

71-
## A Twitter-style clone written using PHP and Redis
71+
## An X-style clone written using PHP and Redis
7272

73-
The [Retwis](https://github.com/SyntaxC4-MSFT/retwis) sample is the Redis Hello World. It's a minimal Twitter-style social network clone written using Redis and PHP using the [Predis](https://github.com/nrk/predis) client. The source code is designed to be simple and at the same time to show different Redis data structures.
73+
The [Retwis](https://github.com/SyntaxC4-MSFT/retwis) sample is the Redis Hello World. It's a minimal X-style social network clone written using Redis and PHP using the [Predis](https://github.com/nrk/predis) client. The source code is designed to be simple and at the same time to show different Redis data structures.
7474

7575
## Bandwidth monitor
7676

articles/azure-functions/flex-consumption-how-to.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ You can use Maven to create a Flex Consumption hosted function app and required
225225
226226
You can enable [virtual network integration](functions-networking-options.md#virtual-network-integration) for your app in a Flex Consumption plan. The examples in this section assume that you already have [created a virtual network with subnet](../virtual-network/quick-create-cli.md#create-a-virtual-network-and-subnet) in your account. You can enable virtual network integration when you create your app or at a later time.
227227
228+
> [!IMPORTANT]
229+
> The Flex Consumption plan currently doesn't support subnets with names that contain underscore (`_`) characters.
230+
228231
To enable virtual networking when you create your app:
229232
230233
### [Azure CLI](#tab/azure-cli)

articles/azure-functions/functions-dotnet-class-library.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Azure Functions supports C# and C# script programming languages. If you're looki
3232
### Updating to target .NET 8
3333

3434
> [!NOTE]
35-
> Targeting .NET 8 with the in-process model is not yet enabled for Linux or for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
35+
> Targeting .NET 8 with the in-process model is not yet enabled for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
3636
3737
Apps using the in-process model can target .NET 8 by following the steps outlined in this section. However, if you choose to exercise this option, you should still begin planning your [migration to the isolated worker model](./migrate-dotnet-to-isolated-model.md) in advance of [support ending for the in-process model on November 10, 2026](https://aka.ms/azure-functions-retirements/in-process-model).
3838

articles/azure-monitor/agents/data-collection-log-json.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ $tableParams = @'
8888
{
8989
"name": "FilePath",
9090
"type": "string"
91-
},
92-
{
93-
"name": "Computer",
94-
"type": "string"
9591
}
9692
]
9793
}
@@ -116,7 +112,6 @@ JSON files include a property name with each value, and the incoming stream in t
116112
| `TimeGenerated` | datetime | The time the record was generated. |
117113
| `RawData` | string | This column will be empty for a JSON log. |
118114
| `FilePath` | string | If you add this column to the incoming stream in the DCR, it will be populated with the path to the log file. This column is not created automatically and can't be added using the portal. You must manually modify the DCR created by the portal or create the DCR using another method where you can explicitly define the incoming stream. |
119-
| `Computer` | string | If you add this column to the incoming stream in the DCR, it will be populated with the name of the computer. This column is not created automatically and can't be added using the portal. You must manually modify the DCR created by the portal or create the DCR using another method where you can explicitly define the incoming stream. |
120115

121116
### [Portal](#tab/portal)
122117

@@ -198,10 +193,6 @@ Use the following ARM template to create a DCR for collecting text log files. In
198193
"name": "FilePath",
199194
"type": "String"
200195
},
201-
{
202-
"name": "Computer",
203-
"type": "String"
204-
},
205196
{
206197
"name": "MyStringColumn",
207198
"type": "string"

articles/azure-monitor/agents/data-collection-syslog.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ The following facilities are supported with the Syslog collector:
3232
| 0 | None |
3333
| 1 | Kern |
3434
| 2 | user |
35-
| 3 | mail |
35+
| 3 | mail |
3636
| 4 | daemon |
37-
| 4 | auth |
38-
| 5 | syslog
39-
| 6 | lpr |
40-
| 7 | news |
41-
| 8 | uucp |
42-
| 9 | ftp |
43-
| 10 | ntp |
44-
| 11 | audit |
45-
| 12 | alert |
46-
| 13 | mark |
47-
| 14 | local0 |
48-
| 15 | local1 |
49-
| 16 | local2 |
50-
| 17 | local3 |
51-
| 18 | local4 |
52-
| 19 | local5 |
53-
| 20 | local6 |
54-
| 21 | local7 |
37+
| 5 | auth |
38+
| 6 | syslog |
39+
| 7 | lpr |
40+
| 8 | news |
41+
| 9 | uucp |
42+
| 10 | ftp |
43+
| 11 | ntp |
44+
| 12 | audit |
45+
| 13 | alert |
46+
| 14 | clock |
47+
| 15 | local0 |
48+
| 16 | local1 |
49+
| 17 | local2 |
50+
| 18 | local3 |
51+
| 19 | local4 |
52+
| 20 | local5 |
53+
| 21 | local6 |
54+
| 22 | local7 |
5555

5656
:::image type="content" source="../../sentinel/media/forward-syslog-monitor-agent/create-rule-data-source.png" lightbox="../../sentinel/media/forward-syslog-monitor-agent/create-rule-data-source.png" alt-text="Screenshot that shows the page to select the data source type and minimum log level.":::
5757

articles/azure-web-pubsub/quickstart-serverless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ Here we choose `Microsoft` as identify provider, which uses `x-ms-client-princip
817817
- [Microsoft Entra ID](../app-service/configure-authentication-provider-aad.md)
818818
- [Facebook](../app-service/configure-authentication-provider-facebook.md)
819819
- [Google](../app-service/configure-authentication-provider-google.md)
820-
- [Twitter](../app-service/configure-authentication-provider-twitter.md)
820+
- [X](../app-service/configure-authentication-provider-twitter.md)
821821

822822
## Try the application
823823

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
---
22
title: Edge Secured-core certified devices
33
description: List of devices that have passed the Edge Secured-core certifications
4-
author: dimatx
5-
ms.author: dimatokar
4+
author: sufenfong
5+
ms.author: sufon
66
ms.topic: conceptual
7-
ms.date: 01/26/2024
7+
ms.date: 07/22/2024
88
ms.custom: Edge Secured-core certified devices
99
ms.service: certification
1010
---
1111

1212
# Edge Secured-core certified devices
13-
This page contains a list of devices that have successfully passed the Edge Secured-core certification.
13+
This page contains a list of devices that have successfully passed the Edge Secured-core certification. The listed models may not be shipped as secure-by-default. When ordering, please request specifically for Edge Secured-core devices.
1414

1515
|Manufacturer|Device Name|OS|Last Updated|
1616
---|---|---|---
1717
|AAEON|[SRG-TG01](https://newdata.aaeon.com.tw/DOWNLOAD/2014%20datasheet/Systems/SRG-TG01.pdf)|Windows 10 IoT Enterprise|2022-06-14|
18+
|Advantech|[ITA-580](https://www.advantech.com/en-eu/products/5130beef-2b81-41f7-a89b-2c43c1f2b6e9/ita-580/mod_bf7b0383-e6b2-49d7-9181-b6fc752e188b)|Windows 10 IoT Enterprise|2024-07-08|
1819
|Asus|[PE200U](https://www.asus.com/networking-iot-servers/aiot-industrial-solutions/embedded-computers-edge-ai-systems/pe200u/)|Windows 10 IoT Enterprise|2022-04-20|
1920
|Asus|[PN64-E1 vPro](https://www.asus.com/ca-en/displays-desktops/mini-pcs/pn-series/asus-expertcenter-pn64-e1/)|Windows 10 IoT Enterprise|2023-08-08|
2021
|Asus|[NUC13L3Hv7](https://www.asus.com/us/displays-desktops/nucs/nuc-mini-pcs/asus-nuc-13-pro/)|Windows 10 IoT Enterprise|2023-04-28|
@@ -25,4 +26,4 @@ This page contains a list of devices that have successfully passed the Edge Secu
2526
|Asus|[NUC12WSKV7](https://www.asus.com/us/displays-desktops/nucs/nuc-kits/asus-nuc-12-pro/)|Windows 10 IoT Enterprise|2022-10-31|
2627
|Asus|BELM12HBv716W+CMB1AB|Windows 10 IoT Enterprise|2022-10-25|
2728
|Asus|[NUC11TNHv5000](https://www.asus.com/us/displays-desktops/nucs/nuc-kits/nuc-11-pro-kit/)|Windows 10 IoT Enterprise|2022-06-14|
28-
|Lenovo|[ThinkEdge SE30](https://www.lenovo.com/us/en/p/desktops/thinkedge/thinkedge-se30/len102c0004)|Windows 10 IoT Enterprise|2022-04-06|
29+
|Lenovo|[ThinkEdge SE30](https://www.lenovo.com/us/en/p/desktops/thinkedge/thinkedge-se30/len102c0004)|Windows 10 IoT Enterprise|2022-04-06|

0 commit comments

Comments
 (0)