Skip to content

Commit cf584b0

Browse files
authored
Merge pull request #271867 from MicrosoftDocs/main
4/11 11:00 AM IST Publish
2 parents 6502184 + fe172bb commit cf584b0

File tree

73 files changed

+319
-452
lines changed

Some content is hidden

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

73 files changed

+319
-452
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: How to work with the GPT-35-Turbo and GPT-4 models
2+
title: Work with the GPT-35-Turbo and GPT-4 models
33
titleSuffix: Azure OpenAI Service
4-
description: Learn about the options for how to use the GPT-35-Turbo and GPT-4 models
4+
description: Learn about the options for how to use the GPT-35-Turbo and GPT-4 models.
55
author: mrbullwinkle #dereklegenzoff
66
ms.author: mbullwin #delegenz
77
ms.service: azure-ai-openai
@@ -12,10 +12,10 @@ manager: nitinme
1212
keywords: ChatGPT
1313
---
1414

15-
# Learn how to work with the GPT-3.5-Turbo and GPT-4 models
15+
# Work with the GPT-3.5-Turbo and GPT-4 models
1616

17-
The GPT-3.5-Turbo and GPT-4 models are language models that are optimized for conversational interfaces. The models behave differently than the older GPT-3 models. Previous models were text-in and text-out, meaning they accepted a prompt string and returned a completion to append to the prompt. However, the GPT-3.5-Turbo and GPT-4 models are conversation-in and message-out. The models expect input formatted in a specific chat-like transcript format, and return a completion that represents a model-written message in the chat. While this format was designed specifically for multi-turn conversations, you'll find it can also work well for non-chat scenarios too.
17+
The GPT-3.5-Turbo and GPT-4 models are language models that are optimized for conversational interfaces. The models behave differently than the older GPT-3 models. Previous models were text-in and text-out, which means they accepted a prompt string and returned a completion to append to the prompt. However, the GPT-3.5-Turbo and GPT-4 models are conversation-in and message-out. The models expect input formatted in a specific chat-like transcript format. They return a completion that represents a model-written message in the chat. This format was designed specifically for multi-turn conversations, but it can also work well for nonchat scenarios.
1818

19-
This article walks you through getting started with the GPT-3.5-Turbo and GPT-4 models. It's important to use the techniques described here to get the best results. If you try to interact with the models the same way you did with the older model series, the models will often be verbose and provide less useful responses.
19+
This article walks you through getting started with the GPT-3.5-Turbo and GPT-4 models. To get the best results, use the techniques described here. Don't try to interact with the models the same way you did with the older model series because the models are often verbose and provide less useful responses.
2020

2121
[!INCLUDE [Chat Completions](../includes/chat-completion.md)]

articles/ai-services/openai/includes/chat-completion.md

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

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: Using Redis modules with Azure Cache for Redis
3-
description: You can use Redis modules with your Azure Cache for Redis instances.
3+
description: You can use Redis modules with your Azure Cache for Redis instances to extend your caches on the Enterprise tiers.
44
author: flang-msft
55

66
ms.author: franlanglois
77
ms.service: cache
88
ms.topic: conceptual
9-
ms.date: 03/02/2023
9+
ms.date: 04/10/2024
1010
ms.custom: template-concept
1111

1212
---
@@ -29,13 +29,12 @@ Some popular modules are available for use in the Enterprise tier of Azure Cache
2929
|RedisTimeSeries | No | Yes | No |
3030
|RedisJSON | No | Yes | Yes |
3131

32-
3332
> [!NOTE]
3433
> Currently, you can't manually load any modules into Azure Cache for Redis. Manually updating modules version is also not possible.
3534
36-
3735
## Using modules with active geo-replication
38-
Only the `RediSearch` and `RedisJSON` modules can be used concurrently with [active geo-replication](cache-how-to-active-geo-replication.md).
36+
37+
Only the `RediSearch` and `RedisJSON` modules can be used concurrently with [active geo-replication](cache-how-to-active-geo-replication.md).
3938

4039
Using these modules, you can implement searches across groups of caches that are synchronized in an active-active configuration. Also, you can search JSON structures in your active-active configuration.
4140

@@ -78,11 +77,11 @@ Features include:
7877
- Geo-filtering
7978
- Boolean queries
8079

81-
Additionally, **RediSearch** can function as a secondary index, expanding your cache beyond a key-value structure and offering more sophisticated queries.
80+
Additionally, **RediSearch** can function as a secondary index, expanding your cache beyond a key-value structure and offering more sophisticated queries.
8281

83-
**RediSearch** also includes functionality to perform [vector similarity queries](https://redis.io/docs/stack/search/reference/vectors/) such as K-nearest neighbor (KNN) search. This feature allows Azure Cache for Redis to be used as a vector database, which is useful in AI use-cases like [semantic answer engines or any other application that requires the comparison of embeddings vectors](https://redis.com/blog/rediscover-redis-for-vector-similarity-search/) generated by machine learning models.
82+
**RediSearch** also includes functionality to perform [vector similarity queries](https://redis.io/solutions/vector-search/) such as K-nearest neighbor (KNN) search. This feature allows Azure Cache for Redis to be used as a vector database, which is useful in AI use-cases like [semantic answer engines or any other application that requires the comparison of embeddings vectors](https://redis.com/blog/rediscover-redis-for-vector-similarity-search/) generated by machine learning models.
8483

85-
You can use **RediSearch** is used in a wide variety of additional use-cases, including real-time inventory, enterprise search, and in indexing external databases. [For more information, see the RediSearch documentation page](https://redis.io/docs/stack/search/).
84+
You can use **RediSearch** is used in a wide variety of use-cases, including real-time inventory, enterprise search, and in indexing external databases. [For more information, see the RediSearch documentation page](https://redis.io/search/).
8685

8786
>[!IMPORTANT]
8887
> The RediSearch module requires use of the `Enterprise` clustering policy and the `NoEviction` eviction policy. For more information, see [Clustering Policy](quickstart-create-redis-enterprise.md#clustering-policy) and [Memory Policies](cache-configure.md#memory-policies)
@@ -101,7 +100,7 @@ RedisBloom adds four probabilistic data structures to a Redis server: **bloom fi
101100
**Bloom and Cuckoo** filters are similar to each other, but each has a unique set of advantages and disadvantages that are beyond the scope of
102101
this documentation.
103102

104-
For more information, see [RedisBloom](https://redis.io/docs/stack/bloom/).
103+
For more information, see [RedisBloom](https://redis.io/bloom/).
105104

106105
### RedisTimeSeries
107106

@@ -115,7 +114,7 @@ The **RedisTimeSeries** module adds high-throughput time series capabilities to
115114

116115
This module is useful for many applications that involve monitoring streaming data, such as IoT telemetry, application monitoring, and anomaly detection.
117116

118-
For more information, see [RedisTimeSeries](https://redis.io/docs/stack/timeseries/).
117+
For more information, see [RedisTimeSeries](https://redis.io/timeseries/).
119118

120119
### RedisJSON
121120

@@ -131,9 +130,12 @@ The **RedisJSON** module is also designed for use with the **RediSearch** module
131130

132131
Some common use-cases for **RedisJSON** include applications such as searching product catalogs, managing user profiles, and caching JSON-structured data.
133132

134-
For more information, see [RedisJSON](https://redis.io/docs/stack/json/).
133+
For more information, see [RedisJSON](https://redis.io/json/).
134+
135+
> [!NOTE]
136+
> The `FT.CONFIG` command is not supported for updating module configuration parameters. However, this can be achieved by passing in arguments configuring the modules when using management APIs. For instance, you can see samples of configuring the `ERROR_RATE` and `INITIAL_SIZE` properties of the RedisBloom module using the `args` parameter with the [REST API](/rest/api/redis/redisenterprisecache/databases/create), [Azure CLI](/cli/azure/redisenterprise), or [PowerShell](/powershell/module/az.redisenterprisecache/new-azredisenterprisecache).
135137
136-
## Next steps
138+
## Related content
137139

138140
- [Quickstart: Create a Redis Enterprise cache](quickstart-create-redis-enterprise.md)
139141
- [Client libraries](cache-best-practices-client-libraries.md)

articles/azure-maps/tutorial-iot-hub-maps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ To learn more about how to send device-to-cloud telemetry, and the other way aro
275275
[Get Search Address Reverse]: /rest/api/maps/search/getsearchaddressreverse?view=rest-maps-1.0&preserve-view=true
276276
[How to create data registry]: how-to-create-data-registries.md
277277
[IoT Hub message routing]: ../iot-hub/iot-hub-devguide-routing-query-syntax.md
278-
[IoT Plug and Play]: ../iot-develop/index.yml
278+
[IoT Plug and Play]: ../iot/overview-iot-plug-and-play.md
279279
[geofence JSON data file]: https://raw.githubusercontent.com/Azure-Samples/iothub-to-azure-maps-geofencing/master/src/Data/geofence.json?token=AKD25BYJYKDJBJ55PT62N4C5LRNN4
280280
[Plug and Play schema for geospatial data]: https://github.com/Azure/opendigitaltwins-dtdl/blob/master/DTDL/v1-preview/schemas/geospatial.md
281281
[Postman]: https://www.postman.com/

articles/azure-monitor/containers/container-insights-region-mapping.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,21 @@ ms.custom: references_regions
77
ms.reviewer: aul
88
---
99

10-
# Region mappings supported by Container insights
10+
# Regions supported by Container insights
1111

12-
When enabling Container insights, only certain regions are supported for linking a Log Analytics workspace and an AKS cluster, and collecting custom metrics submitted to Azure Monitor.
12+
## Kubernetes cluster region
13+
The following table specifies the regions that are supported for Container insights on different platforms.
1314

14-
> [!NOTE]
15-
> Container insights is supported in all regions supported by AKS as specified in [Azure Products by Region](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=kubernetes-service), but AKS must be in the same region as the AKS workspace for most regions. This article lists the mapping for those regions where AKS can be in a different workspace from the Log Analytics workspace.
15+
| Platform | Regions |
16+
|:---|:---|
17+
| AKS | All regions supported by AKS as specified in [Azure Products by Region](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=kubernetes-service). |
18+
| Arc-enabled Kubernetes | All public regions supported by Arc-enabled Kubernetes as specified in [Azure Products by Region](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=azure-arc). |
1619

17-
## Log Analytics workspace supported mappings
18-
Supported AKS regions are listed in [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service). The Log Analytics workspace must be in the same region except for the regions listed in the following table. Watch [AKS release notes](https://github.com/Azure/AKS/releases) for updates.
20+
## Log Analytics workspace region
21+
The Log Analytics workspace supporting Container insights must be in the same region except for the regions listed in the following table.
1922

2023

21-
|**AKS Cluster region** | **Log Analytics Workspace region** |
24+
|**Cluster region** | **Log Analytics Workspace region** |
2225
|-----------------------|------------------------------------|
2326
|**Africa** | |
2427
|SouthAfricaNorth |WestEurope |
@@ -40,9 +43,9 @@ Supported AKS regions are listed in [Products available by region](https://azure
4043
|**Korea** | |
4144
|KoreaSouth |KoreaCentral |
4245
|**US** | |
43-
|WestCentralUS<sup>1</sup>|EastUS |
46+
|WestCentralUS|EastUS |
4447

4548

4649
## Next steps
4750

48-
To begin monitoring your AKS cluster, review [How to enable the Container insights](container-insights-onboard.md) to understand the requirements and available methods to enable monitoring.
51+
To begin monitoring your cluster, see [Enable monitoring for Kubernetes clusters](kubernetes-monitoring-enable.md) to understand the requirements and available methods to enable monitoring.

articles/azure-monitor/containers/kubernetes-monitoring-disable.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,14 @@ The configuration change can take a few minutes to complete. Because Helm tracks
142142
143143
Use the following `az aks update` Azure CLI command with the `--disable-azure-monitor-metrics` parameter to remove the metrics add-on from your AKS cluster or `az k8s-extension delete` Azure CLI command with the `--name azuremonitor-metrics` parameter to remove the metrics add-on from Arc-enabled cluster, and stop sending Prometheus metrics to Azure Monitor managed service for Prometheus. It doesn't remove the data already collected and stored in the Azure Monitor workspace for your cluster.
144144
145+
### AKS Cluster:
146+
145147
```azurecli
146148
az aks update --disable-azure-monitor-metrics -n <cluster-name> -g <cluster-resource-group>
149+
```
150+
151+
### Azure Arc-enabled Cluster:
152+
```
147153
az k8s-extension delete --name azuremonitor-metrics --cluster-name <cluster-name> --resource-group <cluster-resource-group> --cluster-type connectedClusters
148154
```
149155

0 commit comments

Comments
 (0)