Skip to content

Commit 6a036ba

Browse files
authored
Merge pull request #261414 from MicrosoftDocs/main
12/15/2023 PM Publish
2 parents 89a84e2 + 0c9092e commit 6a036ba

File tree

214 files changed

+2043
-654
lines changed

Some content is hidden

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

214 files changed

+2043
-654
lines changed

articles/ai-services/language-service/summarization/includes/quickstarts/rest-api.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ author: jboback
44
manager: nitinme
55
ms.service: azure-ai-language
66
ms.topic: include
7-
ms.date: 02/17/2023
7+
ms.date: 12/13/2023
88
ms.author: aahi
99
ms.custom: ignite-fall-2021, event-tier1-build-2022, ignite-2022
1010
---
1111

12+
# [Document summarization](#tab/document-summarization)
13+
1214
# [Conversation summarization](#tab/conversation-summarization)
1315

16+
---
17+
1418
Use this quickstart to send text summarization requests using the REST API. In the following example, you will use cURL to summarize documents or text-based customer service conversations.
1519

1620
[!INCLUDE [Use Language Studio](../use-language-studio.md)]
@@ -111,8 +115,6 @@ curl -X GET $LANGUAGE_ENDPOINT/language/analyze-text/jobs/<my-job-id>?api-versio
111115
-H "Ocp-Apim-Subscription-Key: $LANGUAGE_KEY"
112116
```
113117

114-
115-
116118
### Document extractive summarization example JSON response
117119

118120
```json
@@ -189,6 +191,8 @@ curl -X GET $LANGUAGE_ENDPOINT/language/analyze-text/jobs/<my-job-id>?api-versio
189191
}
190192
```
191193

194+
# [Conversation summarization](#tab/conversation-summarization)
195+
192196
## Conversation issue and resolution summarization
193197

194198
The following example will get you started with conversation issue and resolution summarization:
@@ -296,8 +300,6 @@ curl -X GET $LANGUAGE_ENDPOINT/language/analyze-conversations/jobs/<my-job-id>?a
296300
-H "Ocp-Apim-Subscription-Key: $LANGUAGE_KEY"
297301
```
298302

299-
300-
301303
### Conversation issue and resolution summarization example JSON response
302304

303305
```json

articles/ai-services/openai/how-to/gpt-with-vision.md

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ Every response includes a `"finish_details"` field. The subfield `"type"` has th
143143

144144
If `finish_details.type` is `stop`, then there is another `"stop"` property that specifies the token that caused the output to end.
145145

146+
## Detail parameter settings in image processing: Low, High, Auto
147+
148+
The detail parameter in the model offers three choices: `low`, `high`, or `auto`, to adjust the way the model interprets and processes images. The default setting is auto, where the model decides between low or high based on the size of the image input.
149+
- `low` setting: the model does not activate the "high res" mode, instead processes a lower resolution 512x512 version, resulting in quicker responses and reduced token consumption for scenarios where fine detail isn't crucial.
150+
- `high` setting: the model activates "high res" mode. Here, the model initially views the low-resolution image and then generates detailed 512x512 segments from the input image. Each segment uses double the token budget, allowing for a more detailed interpretation of the image.''
151+
152+
For details on how the image parameters impact tokens used and pricing please see - [What is OpenAI? Image Tokens with GPT-4 Turbo with Vision](../overview.md#image-tokens-gpt-4-turbo-with-vision)
153+
146154
## Use Vision enhancement with images
147155

148156
GPT-4 Turbo with Vision provides exclusive access to Azure AI Services tailored enhancements. When combined with Azure AI Vision, it enhances your chat experience by providing the chat model with more detailed information about visible text in the image and the locations of objects.
@@ -396,11 +404,33 @@ Every response includes a `"finish_details"` field. The subfield `"type"` has th
396404

397405
If `finish_details.type` is `stop`, then there is another `"stop"` property that specifies the token that caused the output to end.
398406

399-
## Detail parameter settings in image processing: Low, High, Auto
407+
### Pricing example for Video prompts
408+
The pricing for GPT-4 Turbo with Vision is dynamic and depends on the specific features and inputs used. For a comprehensive view of Azure OpenAI pricing see [Azure OpenAI Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
400409

401-
The detail parameter in the model offers three choices: `low`, `high`, or `auto`, to adjust the way the model interprets and processes images. The default setting is auto, where the model decides between low or high based on the size of the image input.
402-
- `low` setting: the model does not activate the "high res" mode, instead processes a lower resolution 512x512 version, resulting in quicker responses and reduced token consumption for scenarios where fine detail isn't crucial.
403-
- `high` setting: the model activates "high res" mode. Here, the model initially views the low-resolution image and then generates detailed 512x512 segments from the input image. Each segment uses double the token budget, allowing for a more detailed interpretation of the image.
410+
The base charges and additional features are outlined below:
411+
412+
Base Pricing for GPT-4 Turbo with Vision is:
413+
- Input: $0.01 per 1000 tokens
414+
- Output: $0.03 per 1000 tokens
415+
416+
Video prompt integration with Video Retrieval Add-on:
417+
- Ingestion: $0.05 per minute of video
418+
- Transactions: $0.25 per 1000 queries of the Video Retrieval index
419+
420+
Processing videos will involve the use of extra tokens to identify key frames for analysis. The number of these additional tokens will be roughly equivalent to the sum of the tokens in the text input plus 700 tokens.
421+
422+
#### Calculation
423+
For a typical use case let's imagine that I have use a 3-minute video with a 100-token prompt input. The section of video has a transcript that's 100-tokens long and when I process the prompt, I generate 100-tokens of output. The pricing for this transaction would be as follows:
424+
425+
| Item | Detail | Total Cost |
426+
|-------------------------------------------|---------------------------------------------------------------|--------------|
427+
| GPT-4 Turbo with Vision Input Tokens | 100 text tokens | $0.001 |
428+
| Additional Cost to identify frames | 100 input tokens + 700 tokens + 1 Video Retrieval txn | $0.00825 |
429+
| Image Inputs and Transcript Input | 20 images (85 tokens each) + 100 transcript tokens | $0.018 |
430+
| Output Tokens | 100 tokens (assumed) | $0.003 |
431+
| **Total Cost** | | **$0.03025** |
432+
433+
Additionally, there's a one-time indexing cost of $0.15 to generate the Video Retrieval index for this 3-minute segment of video. This index can be reused across any number of Video Retrieval and GPT-4 Turbo with Vision calls.
404434

405435
## Limitations
406436

articles/aks/manage-ssh-node-access.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ This article describes how to configure the SSH key (preview) on your AKS cluste
1919

2020
## Install the `aks-preview` Azure CLI extension
2121

22-
[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
23-
2422
1. Install the aks-preview extension using the [`az extension add`][az-extension-add] command.
2523

2624
```azurecli
@@ -67,10 +65,6 @@ Use the [az aks update][az-aks-update] command to update the SSH public key on y
6765
> [!NOTE]
6866
> Updating of the SSH key is supported on Azure virtual machine scale sets with AKS clusters.
6967
70-
|SSH parameter |Description |Default value |
71-
|-----|-----|-----|
72-
|--ssh-key-vaule |Public key path or key contents to install on node VMs for SSH access. For example, `ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm`.|`~.ssh\id_rsa.pub` |
73-
7468
The following are examples of this command:
7569
7670
* To specify a new SSH public key value, include the `--ssh-key-value` argument:
@@ -96,8 +90,15 @@ To help troubleshoot any issues with SSH connectivity to your clusters nodes, yo
9690
9791
<!-- LINKS - internal -->
9892
[install-azure-cli]: /cli/azure/install-azure-cli
93+
[az-feature-register]: /cli/azure/feature#az_feature_register
94+
[az-feature-show]: /cli/azure/feature#az-feature-show
95+
[az-extension-add]: /cli/azure/extension#az_extension_add
96+
[az-extension-update]: /cli/azure/extension#az_extension_update
97+
[az-provider-register]: /cli/azure/provider#az_provider_register
9998
[az-aks-update]: /cli/azure/aks#az-aks-update
10099
[az-aks-create]: /cli/azure/aks#az-aks-create
101100
[view-kubelet-logs]: kubelet-logs.md
102101
[view-master-logs]: monitor-aks-reference.md#resource-logs
103102
[node-image-upgrade]: node-image-upgrade.md
103+
[az-aks-nodepool-upgrade]: /cli/azure/aks/nodepool#az-aks-nodepool-upgrade
104+
[network-security-group-rules-overview]: concepts-security.md#azure-network-security-groups

articles/api-management/breaking-changes/api-version-retirement-sep-2023.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ We also recommend setting the **Minimum API version** in your API Management ins
5656

5757
### Update Minimum API version setting on your API Management instance
5858

59-
We recommend setting the **Minimum API version** for your API Management instance using the Azure portal. This setting limits control plane API calls to your instance with an API version equal to or newer than this value. Currently you can set this to **2019-12-01**.
59+
We recommend setting the **Minimum API version** for your API Management instance using the Azure portal. This setting limits control plane API calls to your instance with an API version equal to or newer than this value. Currently you can set this to **2021-08-01**.
6060

6161
To set the **Minimum API version** in the portal:
6262

articles/api-management/self-hosted-gateway-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ To operate properly, each self-hosted gateway needs outbound connectivity on por
100100

101101
| Description | Required for v1 | Required for v2 | Notes |
102102
|:------------|:---------------------|:---------------------|:------|
103-
| Hostname of the configuration endpoint | `<apim-service-name>.management.azure-api.net` | `<apim-service-name>.configuration.azure-api.net` | Custom hostnames are also supported and can be used instead of the default hostname. |
103+
| Hostname of the configuration endpoint | `<apim-service-name>.management.azure-api.net` | `<apim-service-name>.configuration.azure-api.net`<sup>1</sup> | Custom hostnames are also supported and can be used instead of the default hostname. |
104104
| Public IP address of the API Management instance | ✔️ | ✔️ | IP address of primary location is sufficient. |
105105
| Public IP addresses of Azure Storage [service tag](../virtual-network/service-tags-overview.md) | ✔️ | Optional<sup>2</sup> | IP addresses must correspond to primary location of API Management instance. |
106106
| Hostname of Azure Blob Storage account | ✔️ | Optional<sup>2</sup> | Account associated with instance (`<blob-storage-account-name>.blob.core.windows.net`) |

articles/azure-arc/data/release-notes.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: mikeray
77
services: azure-arc
88
ms.service: azure-arc
99
ms.subservice: azure-arc-data
10-
ms.date: 11/14/2023
10+
ms.date: 12/12/2023
1111
ms.topic: conceptual
1212
ms.custom:
1313
- references_regions
@@ -21,6 +21,12 @@ ms.custom:
2121

2222
This article highlights capabilities, features, and enhancements recently released or improved for Azure Arc-enabled data services.
2323

24+
## December 12, 2023
25+
26+
**Image tag**: `v1.26.0_2023-12-12`
27+
28+
For complete release version information, review [Version log](version-log.md#december-12-2023).
29+
2430
## November 14, 2023
2531

2632
**Image tag**: `v1.25.0_2023-11-14`

articles/azure-arc/kubernetes/agent-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Azure Arc-enabled Kubernetes follows the standard [semantic versioning scheme](h
5858

5959
While the schedule may vary, a new minor version of Azure Arc-enabled Kubernetes agents is [released approximately once per month](release-notes.md).
6060

61-
The following command manually upgrades the agent to version 1.8.14:
61+
The following command manually upgrades the agents to version 1.8.14:
6262

6363
```azurecli
6464
az connectedk8s upgrade -g AzureArcTest1 -n AzureArcTest --agent-version 1.8.14
Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,39 @@
11
---
22
title: "What's new with Azure Arc-enabled Kubernetes"
3-
ms.date: 10/19/2023
3+
ms.date: 12/15/2023
44
ms.topic: overview
55
description: "Learn about the latest releases of Arc-enabled Kubernetes."
66
---
77

88
# What's new with Azure Arc-enabled Kubernetes
99

10-
Azure Arc-enabled Kubernetes is updated on an ongoing basis. To stay up to date with the most recent developments, this article provides you with information about the latest releases of the Azure CLI `connectedk8s` extension, the [Azure Arc-enabled Kubernetes agents](conceptual-agent-overview.md), and other changes.
10+
Azure Arc-enabled Kubernetes is updated on an ongoing basis. To stay up to date with the most recent developments, this article provides you with information about the latest releases of the [Azure Arc-enabled Kubernetes agents](conceptual-agent-overview.md).
1111

12-
> [!NOTE]
13-
> When any of the Arc-enabled Kubernetes agents are updated, all of the agents in the `azure-arc` namespace are incremented with a new version number, so that the version numbers are consistent across agents. If you have enabled automatic updates, all of the agents will be upgraded together to the newest version (whether or not there are functionality changes in a given agent).
14-
>
15-
> We generally recommend using the most recent versions of the agents. The [version support policy](agent-upgrade.md#version-support-policy) covers the most recent version and the two previous versions (N-2).
12+
When any of the Arc-enabled Kubernetes agents are updated, all of the agents in the `azure-arc` namespace are incremented with a new version number, so that the version numbers are consistent across agents. When a new version is released, all of the agents are upgraded together to the newest version (whether or not there are functionality changes in a given agent), unless you have [disabled automatic upgrades](agent-upgrade.md) for the cluster.
1613

17-
## October 2023
14+
We generally recommend using the most recent versions of the agents. The [version support policy](agent-upgrade.md#version-support-policy) covers the most recent version and the two previous versions (N-2).
1815

19-
### Arc agents - Version 1.13.4
16+
## Version 1.13.4 (October 2023)
2017

2118
- Various enhancements and bug fixes
2219

23-
## September 2023
24-
25-
### Arc agents - Version 1.13.1
20+
## Version 1.13.1 (September 2023)
2621

2722
- Various enhancements and bug fixes
2823

29-
## July 2023
30-
31-
### Arc agents - Version 1.12.5
24+
## Version 1.12.5 (July 2023)
3225

3326
- Alpine base image powering our Arc agent containers has been updated from 3.7.12 to 3.18.0
3427

35-
## May 2023
36-
37-
### Arc agents - Version 1.11.7
28+
## Version 1.11.7 (May 2023)
3829

3930
- Updates to enable users that belong to more than 200 groups in cluster connect scenarios
4031

41-
### Azure CLI `connectedk8s` extension - Version 1.3.17
42-
43-
- Onboarding enhancements to track ARM resource provisioning
44-
- Enhancements for better troubleshooting and logging to improve onboarding experience
45-
46-
## April 2023
47-
48-
### Arc agents - Version 1.11.3
32+
## Version 1.11.3 (April 2023)
4933

5034
- Updates to base image of Arc-enabled Kubernetes agents to address security CVE
5135

52-
### Azure CLI `connectedk8s` extension - Version 1.3.16
53-
54-
- Force delete added to connect command to clear stale resources, if any, during onboarding
55-
- Diagnoser enhancements to capture and store agent metadata
56-
- Heuristics detection in connect command
36+
## Next steps
5737

38+
- Learn how to [enable or disable automatic agent upgrades](agent-upgrade.md).
39+
- Learn how to [connect a Kubernetes cluster to Azure Arc](quickstart-connect-cluster.md).

articles/azure-cache-for-redis/cache-best-practices-server-load.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ The **CPU** metric indicates the CPU usage for the node that hosts the cache. Th
4444

4545
The **Server Load** metric represents the load on the Redis Server alone. We recommend monitoring the **Server Load** metric instead of **CPU**.
4646

47+
When monitoring server load, we also recommend that you examine the max spikes of Server Load rather than average because even brief spikes can trigger failovers and command timeouts.
48+
4749
## Plan for server maintenance
4850

4951
Ensure you have enough server capacity to handle your peak load while your cache servers are undergoing maintenance. Test your system by rebooting nodes while under peak load. For more information on how to simulate deployment of a patch, see [reboot](cache-administration.md#reboot).

0 commit comments

Comments
 (0)