Skip to content

Commit 30e03ed

Browse files
committed
Merge branch 'fxl---import-issue-ado-bug--32885338' into fxl---applies-to
2 parents 4502292 + 851a8d5 commit 30e03ed

26 files changed

+89
-332
lines changed

articles/api-management/azure-openai-enable-semantic-caching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Enable semantic caching of responses to Azure OpenAI API requests to reduce band
2727
* Chat Completion API - Deployment used for API consumer calls
2828
* Embeddings API - Deployment used for semantic caching
2929
* The API Management instance must be configured to use managed identity authentication to the Azure OpenAI APIs. For more information, see [Authenticate and authorize access to Azure OpenAI APIs using Azure API Management ](api-management-authenticate-authorize-azure-openai.md#authenticate-with-managed-identity).
30-
* An [Azure Cache for Redis Enterprise](../azure-cache-for-redis/quickstart-create-redis-enterprise.md) or [Azure Managed Redis](../redis/quickstart-create-managed-redis.md) instance. The **RediSearch** module must be enabled on the Redis cache.
30+
* An [Azure Managed Redis](../redis/quickstart-create-managed-redis.md) instance. The **RediSearch** module must be enabled on the Redis cache.
3131
> [!NOTE]
3232
> You can only enable the **RediSearch** module when creating a new Azure Redis Enterprise or Azure Managed Redis cache. You can't add a module to an existing cache. [Learn more](../redis/redis-modules.md)
3333
* External cache configured in the Azure API Management instance. For steps, see [Use an external Redis-compatible cache in Azure API Management](api-management-howto-cache-external.md).

articles/azure-cache-for-redis/.openpublishing.redirection.redis-cache.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,11 @@
440440
"source_path_from_root": "/articles/azure-cache-for-redis/scripts/create-manage-cache.md",
441441
"redirect_url": "/azure/redis/scripts/create-manage-cache",
442442
"redirect_document_id": true
443+
},
444+
{
445+
"source_path_from_root": "/articles/azure-cache-for-redis/quickstart-create-redis-enterprise.md",
446+
"redirect_url": "/azure/redis/quickstart-create-managed-redis",
447+
"redirect_document_id": false
443448
}
444449
]
445450
}

articles/azure-cache-for-redis/TOC.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
items:
1414
- name: Create an Azure Cache for Redis instance in the Basic, Standard and Premium tiers
1515
href: quickstart-create-redis.md
16-
- name: Create an Azure Cache for Redis instance in the Enterprise tiers
17-
href: quickstart-create-redis-enterprise.md
1816
- name: Create and manage with Azure PowerShell
1917
href: /azure/redis/how-to-manage-redis-cache-powershell
2018
- name: Create and manage with Azure CLI
@@ -115,10 +113,10 @@
115113
href: /azure/redis/overview-vector-similarity
116114
- name: Connection resilience best practices
117115
href: cache-best-practices-connection.md
118-
- name: Use Azure Functions triggers and bindings
119-
items:
120-
- name: Create a simple Function app for Redis triggers
121-
href: /azure/redis/tutorial-functions-getting-started
116+
# - name: Use Azure Functions triggers and bindings
117+
# items:
118+
# - name: Create a simple Function app for Redis triggers
119+
# href: /azure/redis/tutorial-functions-getting-started
122120

123121
- name: Logs and monitoring
124122
items:

articles/azure-cache-for-redis/cache-how-to-encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ In the **Basic, Standard, and Premium** tiers, the OS disk is encrypted by defau
7777

7878
### Use the portal to create a new cache with CMK enabled
7979

80-
1. Sign in to the [Azure portal](https://portal.azure.com) and start the [Create a Redis Enterprise cache](quickstart-create-redis-enterprise.md) quickstart guide.
80+
1. Create a Redis Enterprise cache.
8181

8282
1. On the **Advanced** page, go to the section titled **Customer-managed key encryption at rest** and enable the **Use a customer-managed key** option.
8383

articles/azure-cache-for-redis/cache-how-to-premium-persistence.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ With AOF persistence, write operations to the cache save to the named storage ac
152152
>[!NOTE]
153153
>You can also add persistence to a previously created cache by navigating to **Advanced settings** under **Settings** in the left navigation menu for your cache.
154154
155-
1. To create an Enterprise-level cache in the [Azure portal](https://portal.azure.com), follow the instructions in the [Enterprise tier quickstart guide](quickstart-create-redis-enterprise.md).
156-
157155
1. When you fill out the **Advanced** tab, select either **RDB** or **AOF** persistence for **Backup file** under **(PREVIEW) Data Persistence**.
158156

159157
1. Set the **Backup Frequency**.
@@ -165,7 +163,6 @@ With AOF persistence, write operations to the cache save to the named storage ac
165163
166164
:::image type="content" source="media/cache-how-to-premium-persistence/cache-advanced-persistence.png" alt-text="Screenshot that shows the Enterprise tier Advanced tab and Data persistence is highlighted with a red box.":::
167165

168-
1. Finish creating the cache by following the rest of the instructions in the [Enterprise tier quickstart guide](quickstart-create-redis-enterprise.md).
169166

170167
---
171168

articles/azure-cache-for-redis/cache-how-to-redis-cli-tool.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,5 @@ While the redis-cli is a useful tool, you can also use the following other metho
122122

123123
## Related content
124124

125-
Get started by creating a [new Enterprise-tier cache](quickstart-create-redis-enterprise.md).
125+
- Azure CLI using [az redis list-keys](/cli/azure/redis#az-redis-list-keys)
126+
- Azure PowerShell using [Get-AzRedisCacheKey](/powershell/module/az.rediscache/Get-AzRedisCacheKey)

articles/azure-cache-for-redis/cache-moving-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Open-source Redis defines a standard mechanism for taking a snapshot of a cache'
161161

162162
### Prepare
163163

164-
To move your cache instance to another region, you'll need to create [a second premium cache instance](quickstart-create-redis.md) or [a second enterprise cache instance](quickstart-create-redis-enterprise.md) in the desired region.
164+
To move your cache instance to another region, you'll need to create [a second premium cache instance](quickstart-create-redis.md) in the desired region.
165165

166166
### Move
167167

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ Azure Cache for Redis is continually expanding into new regions. To check the av
110110
## Related content
111111

112112
- [Create an open-source Redis cache](quickstart-create-redis.md)
113-
- [Create a Redis Enterprise cache](quickstart-create-redis-enterprise.md)
114113
- [Use Azure Cache for Redis in an ASP.NET web app](../redis/web-app-cache-howto.md)
115114
- [Use Azure Cache for Redis in .NET Core](../redis/dotnet-core-quickstart.md)
116115
- [Use Azure Cache for Redis in .NET Framework](../redis/dotnet-how-to-use-azure-redis-cache.md)

articles/azure-cache-for-redis/quickstart-create-redis-enterprise.md

Lines changed: 0 additions & 96 deletions
This file was deleted.

articles/azure-cache-for-redis/quickstart-create-redis.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ You need an Azure subscription before you begin. If you don't have one, create a
2525

2626
## Related content
2727

28-
- [Create a Redis Enterprise cache](quickstart-create-redis-enterprise.md)
2928
- [Create an Azure Managed Redis instance (preview)](../redis/quickstart-create-managed-redis.md)
3029
- [Create an ASP.NET web app that uses Azure Cache for Redis.](../redis/web-app-cache-howto.md)

0 commit comments

Comments
 (0)