Skip to content

Commit a2dd150

Browse files
authored
Merge pull request #259552 from MicrosoftDocs/main
11/27/2023 AM Publish
2 parents edc98f7 + 08a560e commit a2dd150

File tree

91 files changed

+603
-302
lines changed

Some content is hidden

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

91 files changed

+603
-302
lines changed

articles/ai-services/LUIS/luis-container-howto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ If you run the container with an output [mount](luis-container-configuration.md#
391391

392392
## Billing
393393

394-
The LUIS container sends billing information to Azure, using a _Azure AI services_ resource on your Azure account.
394+
The LUIS container sends billing information to Azure, using an _Azure AI services_ resource on your Azure account.
395395

396396
[!INCLUDE [Container's Billing Settings](../../../includes/cognitive-services-containers-how-to-billing-info.md)]
397397

articles/ai-services/computer-vision/computer-vision-resource-container-config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ This setting can be found in the following place:
5454

5555
## Billing configuration setting
5656

57-
The `Billing` setting specifies the endpoint URI of the _Azure AI services_ resource on Azure used to meter billing information for the container. You must specify a value for this configuration setting, and the value must be a valid endpoint URI for a _Azure AI services_ resource on Azure. The container reports usage about every 10 to 15 minutes.
57+
The `Billing` setting specifies the endpoint URI of the _Azure AI services_ resource on Azure used to meter billing information for the container. You must specify a value for this configuration setting, and the value must be a valid endpoint URI for an _Azure AI services_ resource on Azure. The container reports usage about every 10 to 15 minutes.
5858

5959
This setting can be found in the following place:
6060

articles/ai-services/openai/includes/powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ echo export AZURE_OPENAI_ENDPOINT="REPLACE_WITH_YOUR_ENDPOINT_HERE" >> /etc/envi
117117
118118
1. Run the script using PowerShell:
119119

120-
```powershell
120+
```powershell-interactive
121121
./quickstart.ps1
122122
```
123123

124124
## Output
125125

126126
The output will include response text following the `Once upon a time` prompt. Azure OpenAI returned `There was a world beyond the mist...where a` in this example.
127127

128-
```powershell
128+
```output
129129
Once upon a time...
130130
There was a world beyond the mist...where a
131131
```

articles/ai-services/openai/includes/python.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ To successfully make a call against the Azure OpenAI service, you'll need the fo
5252

5353
|Variable name | Value |
5454
|--------------------------|-------------|
55-
| `ENDPOINT` | This value can be found in the **Keys & Endpoint** section when examining your resource from the Azure portal. Alternatively, you can find the value in **Azure OpenAI Studio** > **Playground** > **Code View**. An example endpoint is: `https://docs-test-001.openai.azure.com/`.|
56-
| `API-KEY` | This value can be found in the **Keys & Endpoint** section when examining your resource from the Azure portal. You can use either `KEY1` or `KEY2`.|
57-
| `DEPLOYMENT-NAME` | This value will correspond to the custom name you chose for your deployment when you deployed a model. This value can be found under **Resource Management** > **Deployments** in the Azure portal or alternatively under **Management** > **Deployments** in Azure OpenAI Studio.|
55+
| `ENDPOINT` | This value can be found in the **Keys and Endpoint** section when examining your resource from the Azure portal. Alternatively, you can find the value in **Azure OpenAI Studio** > **Playground** > **View code**. An example endpoint is: `https://docs-test-001.openai.azure.com/`.|
56+
| `API-KEY` | This value can be found in the **Keys and Endpoint** section when examining your resource from the Azure portal. You can use either `KEY1` or `KEY2`.|
57+
| `DEPLOYMENT-NAME` | This value will correspond to the custom name you chose for your deployment when you deployed a model. This value can be found under **Resource Management** > **Model Deployments** in the Azure portal or alternatively under **Management** > **Deployments** in Azure OpenAI Studio.|
5858

59-
Go to your resource in the Azure portal. The **Endpoint and Keys** can be found in the **Resource Management** section. Copy your endpoint and access key as you'll need both for authenticating your API calls. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption.
59+
Go to your resource in the Azure portal. The **Keys and Endpoint** can be found in the **Resource Management** section. Copy your endpoint and access key as you'll need both for authenticating your API calls. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption.
6060

6161
:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot of the overview blade for an OpenAI Resource in the Azure portal with the endpoint & access keys location circled in red." lightbox="../media/quickstarts/endpoint.png":::
6262

articles/aks/cluster-autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ To further help improve cluster resource utilization and free up CPU and memory
340340
[aks-faq-node-resource-group]: faq.md#can-i-modify-tags-and-other-properties-of-the-aks-resources-in-the-node-resource-group
341341
[aks-multiple-node-pools]: create-node-pools.md
342342
[aks-scale-apps]: tutorial-kubernetes-scale.md
343-
[aks-view-master-logs]: monitor-aks.md#resource-logs
343+
[aks-view-master-logs]: monitor-aks.md#aks-control-planeresource-logs
344344
[azure-cli-install]: /cli/azure/install-azure-cli
345345
[az-aks-create]: /cli/azure/aks#az-aks-create
346346
[az-aks-update]: /cli/azure/aks#az-aks-update

articles/aks/deploy-marketplace.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Included among these solutions are Kubernetes application-based container offers
2323

2424
This feature is currently supported only in the following regions:
2525

26-
- East US, EastUS2EUAP, West US, Central US, West Central US, South Central US, East US2, West US2, West Europe, North Europe, Canada Central, South East Asia, Australia East, Central India, Japan East, Korea Central, UK South, UK West, Germany West Central, France Central, East Asia, West US3, Norway East, South African North, North Central US, Australia South East, Switzerland North, Japan West, South India
26+
- Australia East, Australia Southeast, Brazil South, Canada Central, Canada East, Central India, Central US, East Asia, East US, East US 2, East US 2 EAUP, France Central, France South, Germany North, Germany West Central, Japan East, Japan West, Jio India West, Korea Central, Korea South, North Central Us, North Europe, Norway East, Norway West, South Africa North, South Central US, South India, Southeast Asia, Sweden Central, Switzerland North, UAE North, UK South, UK West, West Central US, West Europe, West US, West US 2, West US 3
2727

2828
Kubernetes application-based container offers can't be deployed on AKS for Azure Stack HCI or AKS Edge Essentials.
2929

@@ -101,6 +101,7 @@ az k8s-extension list --cluster-name <clusterName> --resource-group <resourceGro
101101

102102

103103

104+
104105
---
105106

106107
## Manage the offer lifecycle
@@ -138,6 +139,7 @@ az k8s-extension show --name <extension-name> --cluster-name <clusterName> --res
138139

139140

140141

142+
141143
---
142144

143145
## Monitor billing and usage information
@@ -169,6 +171,7 @@ az k8s-extension delete --name <extension-name> --cluster-name <clusterName> --r
169171

170172

171173

174+
172175
---
173176

174177
## Troubleshooting
104 KB
Loading
237 KB
Loading
344 KB
Loading
266 KB
Loading

0 commit comments

Comments
 (0)