Skip to content

Commit fa5291a

Browse files
authored
Merge pull request #281927 from MicrosoftDocs/main
7/26 11:00 AM IST Publish
2 parents 16e29fd + 96d2607 commit fa5291a

File tree

117 files changed

+1538
-475
lines changed

Some content is hidden

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

117 files changed

+1538
-475
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/ai-services/speech-service/includes/how-to/speech-synthesis/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ In this example, use the `AudioDataStream` constructor to get a stream from the
8686
```python
8787
speech_synthesizer = speechsdk.SpeechSynthesizer(speech_config=speech_config, audio_config=None)
8888
result = speech_synthesizer.speak_text_async("I'm excited to try text to speech").get()
89-
stream = AudioDataStream(result)
89+
stream = speechsdk.AudioDataStream(result)
9090
```
9191

9292
At this point, you can implement any custom behavior by using the resulting `stream` object.

articles/aks/advanced-network-observability-bring-your-own-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ az aks get-credentials --name $CLUSTER_NAME --resource-group $RESOURCE_GROUP
189189
190190
```azurecli-interactive
191191
# Set environment variables
192-
export HUBBLE_VERSION=0.11
192+
export HUBBLE_VERSION=v0.11.0
193193
export HUBBLE_ARCH=amd64
194194

195195
# Install Hubble CLI

articles/aks/advanced-network-observability-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Install the Hubble CLI to access the data it collects using the following comman
250250
251251
```azurecli-interactive
252252
# Set environment variables
253-
export HUBBLE_VERSION=0.11
253+
export HUBBLE_VERSION=v0.11.0
254254
export HUBBLE_ARCH=amd64
255255
256256
#Install Hubble CLI

articles/aks/azure-linux-aks-partner-solutions.md

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: schaffererin
77
ms.service: azure-kubernetes-service
88
ms.topic: conceptual
99
ms.custom: linux-related-content
10-
ms.date: 06/13/2024
10+
ms.date: 07/25/2024
1111
---
1212

1313
# Azure Linux AKS Container Host partner solutions
@@ -16,15 +16,9 @@ Microsoft collaborates with partners to ensure your build, test, deployment, con
1616

1717
The third party partners featured in this article have introduction guides to help you start using their solutions with your applications running on Azure Linux Container Host on AKS.
1818

19-
| Solutions | Partners |
20-
|--------------------|------------------------------------------------------------------------------------------------|
21-
| DevOps | [Advantech](#advantech) <br> [Akuity](#akuity) <br> [Anchore](#anchore) <br> [Hashicorp](#hashicorp) <br> [Kong](#kong) <br> [NetApp](#netapp) |
22-
| Networking | [Buoyant](#buoyant) <br> [Isovalent](#isovalent) <br> [Solo.io](#soloio) <br> [Tetrate](#tetrate) <br> [Tigera](#tigera-inc) |
23-
| Observability | [Anchore](#anchore) <br> [Buoyant](#buoyant) <br> [Isovalent](#isovalent) <br> [Dynatrace](#dynatrace) <br> [Solo.io](#soloio) <br> [Tigera](#tigera-inc) |
24-
| Security | [Anchore](#anchore) <br> [Buoyant](#buoyant) <br> [Isovalent](#isovalent) <br> [Kong](#kong) <br> [Palo Alto Networks](#palo-alto-networks) <br> [Solo.io](#soloio) <br> [Tetrate](#tetrate) <br> [Tigera](#tigera-inc) <br> [Wiz](#wiz) |
25-
| Storage | [Catalogic](#catalogic) <br> [Veeam](#veeam) |
26-
| Config Management | [Corent](#corent) |
27-
| Migration | [Catalogic](#catalogic) |
19+
| | DevOps | Networking | Observability | Security | Storage | Config Management | Migration |
20+
|----------|--------|------------|---------------|----------|---------|-------------------|-----------|
21+
| **Partners** |[Advantech](#advantech) <br> • [Akuity](#akuity) <br> • [Anchore](#anchore) <br> • [Hashicorp](#hashicorp) <br> • [Kong](#kong) <br> • [NetApp](#netapp) |[Buoyant](#buoyant) <br> • [Isovalent](#isovalent) <br> • [Solo.io](#soloio) <br> • [Tetrate](#tetrate) <br> • [Tigera](#tigera-inc) |[Anchore](#anchore) <br> • [Buoyant](#buoyant) <br> • [Isovalent](#isovalent) <br> • [Dynatrace](#dynatrace) <br> • [Solo.io](#soloio) <br> • [Tigera](#tigera-inc) |[Anchore](#anchore) <br> • [Buoyant](#buoyant) <br> • [Isovalent](#isovalent) <br> • [Kong](#kong) <br> • [Palo Alto Networks](#palo-alto-networks) <br> • [Qualys](#qualys) <br> • [Solo.io](#soloio) <br> • [Tetrate](#tetrate) <br> • [Tigera](#tigera-inc) <br> • [Wiz](#wiz) |[Catalogic](#catalogic) <br> • [Veeam](#veeam) |[Corent](#corent) |[Catalogic](#catalogic) |
2822

2923
## DevOps
3024

@@ -293,6 +287,48 @@ With Prisma Cloud by Palo Alto Networks you get always on, real-time app visibil
293287

294288
For more information, see [Palo Alto Networks Solutions](https://www.paloaltonetworks.com/prisma/environments/azure) and [Prisma Cloud Compute Edition on Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/paloaltonetworks.pcce_twistlock?tab=Overview).
295289

290+
### Qualys
291+
292+
:::image type="icon" source="./media/azure-linux-aks-partner-solutions/qualys.png":::
293+
294+
#### Qualys Cloud Agent
295+
296+
| Solution | Categories |
297+
|----------|------------|
298+
| Qualys Cloud Agent | Security |
299+
300+
The Qualys Cloud Agent is a lightweight, modular software agent that enables continuous, real-time security and compliance monitoring across various environments, including SaaS platforms, on-premises systems, and cloud infrastructures.
301+
302+
<details> <summary> See more </summary><br>
303+
304+
It supports a wide range of operating systems and architectures, such as Windows, Linux, macOS, AIX, Solaris, and specialized systems like AWS Bottlerocket. The agent provides functionalities such as vulnerability management, patching, endpoint protection, and file integrity monitoring, allowing customers to activate and deactivate capabilities based on their needs. Designed for ease of use, it facilitates seamless integration and management of security protocols across complex IT landscapes.
305+
306+
</details>
307+
308+
For more information, see [Qualys Cloud Agent Solutions](https://www.qualys.com/cloud-agent/).
309+
310+
#### Qualys Container Security
311+
312+
| Solution | Categories |
313+
|----------|------------|
314+
| Qualys Container Security | Security |
315+
316+
Qualys K8s and the Container Security solution provide proactive, preventive, and reactive security for containerized applications.
317+
318+
<details> <summary> See more </summary><br>
319+
320+
It integrates into your DevOps workflows, offering continuous real-time security and compliance throughout the containerized application lifecycle. Key features include:
321+
322+
* **Vulnerability management**: Identifies vulnerabilities in container images, registries, and running containers, prioritizes them, and helps mitigate the most critical vulnerabilities first.
323+
* **Runtime protection**: eBPF-based runtime security monitors and protects containers in real-time, detecting and responding to malicious activities.
324+
* **Compliance**: Ensures that Kubernetes configurations and container images adhere to best practices and compliance standards, preventing misconfigurations that might lead to security breaches.
325+
* **File integrity monitoring**: Monitors changes to critical files within containers to detect and respond to unauthorized modifications.
326+
* **Secret and malware detection**: Detects secrets and malware on the left side before container images are deployed in runtime, ensuring security from the development phase.
327+
328+
</details>
329+
330+
For more information, see [Qualys Container Security Solutions](https://www.qualys.com/apps/container-security/).
331+
296332
### Tetrate
297333

298334
:::image type="icon" source="./media/azure-linux-aks-partner-solutions/tetrate.png":::
14.2 KB
Loading

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-arc/resource-bridge/upgrade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ This article describes how Arc resource bridge is upgraded, and the two ways upg
1212
## Private cloud providers
1313
Currently, private cloud providers differ in how they perform Arc resource bridge upgrades. Review the following information to see how to upgrade your Arc resource bridge for a specific provider.
1414

15-
For **Arc-enabled VMware vSphere**, manual upgrade and cloud upgrade are available. Appliances on version 1.0.15 and higher are automatically opted-in to cloud-managed upgrade. In order for either upgrade option to work, [the upgrade prerequisites](#prerequisites) must be met. Microsoft may attempt to perform a cloud-managed upgrade of your Arc resource bridge at any time if your appliance will soon be out of support. While Microsoft offers cloud-managed upgrade, you’re still responsible for ensuring that your Arc resource bridge is within the supported n-3 versions. Disruptions could cause cloud-managed upgrade to fail and you may need to manual upgrade the Arc resource bridge. If you are close to being out of support, please manual upgrade to stay in supported versions.  Do not wait for cloud-managed upgrade. Any appliances that are earlier than version 1.0.15 must be manually upgraded.
15+
For **Arc-enabled VMware vSphere**, manual upgrade and cloud upgrade are available. Appliances on version 1.0.15 and higher are automatically opted-in to cloud-managed upgrade. In order for either upgrade option to work, [the upgrade prerequisites](#prerequisites) must be met. Microsoft may attempt to perform a cloud-managed upgrade of your Arc resource bridge at any time if your appliance will soon be out of support. While Microsoft offers cloud-managed upgrade, you’re still responsible for ensuring that your Arc resource bridge is within the supported n-3 versions. Disruptions could cause cloud-managed upgrade to fail and you may need to manual upgrade the Arc resource bridge. If you are close to being out of support, please manual upgrade to stay in supported versions.
1616

1717
For **Azure Arc VM management (preview) on Azure Stack HCI**, appliance version 1.0.15 or higher is only available on Azure Stack HCI build 23H2. In HCI 23H2, the LCM tool manages upgrades across all HCI, Arc resource bridge, and extension components as a "validated recipe" package. Any preview version of Arc resource bridge must be removed prior to updating from 22H2 to 23H2. Attempting to upgrade Arc resource bridge independent of other HCI environment components may cause problems in your environment that could result in a disaster recovery scenario. For more information, visit the [Arc VM management FAQ page](/azure-stack/hci/manage/azure-arc-vms-faq).
1818

19-
For **Arc-enabled System Center Virtual Machine Manager (SCVMM)**, the manual upgrade feature is available for appliance version 1.0.14 and higher. Appliances below version 1.0.14 need to perform the recovery option to get to version 1.0.15 or higher. Review the steps for [performing the recovery operation](/azure/azure-arc/system-center-virtual-machine-manager/disaster-recovery), then delete the appliance VM from SCVMM and perform the recovery steps. This deploys a new resource bridge and reconnects pre-existing Azure resources.
19+
For **Arc-enabled System Center Virtual Machine Manager (SCVMM)**, the manual upgrade feature is available for appliance version 1.0.15 and higher. Appliances below version 1.0.15 need to perform the recovery option to get to version 1.0.15 or higher. Review the steps for [performing the recovery operation](/azure/azure-arc/system-center-virtual-machine-manager/disaster-recovery). This deploys a new resource bridge and reconnects pre-existing Azure resources.
2020

2121
## Prerequisites
2222

articles/azure-arc/servers/ssh-arc-overview.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ Authenticating with Microsoft Entra credentials has additional requirements:
3636
> The Virtual Machine Administrator Login and Virtual Machine User Login roles use `dataActions` and can be assigned at the management group, subscription, resource group, or resource scope. We recommend that you assign the roles at the management group, subscription, or resource level and not at the individual VM level. This practice avoids the risk of reaching the [Azure role assignments limit](../../role-based-access-control/troubleshoot-limits.md) per subscription.
3737
3838
### Availability
39-
SSH access to Arc-enabled servers is currently supported in all regions supported by Arc-Enabled Servers with the following exceptions:
40-
- Germany West Central
39+
SSH access to Arc-enabled servers is currently supported in all regions supported by Arc-Enabled Servers.
4140

4241
## Getting started
4342

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

0 commit comments

Comments
 (0)