Skip to content

Commit abf7c74

Browse files
Merge pull request #278 from microsoft/hotfix
feat: Merging the changes from hotfix to main
2 parents fdaf312 + 3fe694f commit abf7c74

File tree

14 files changed

+182
-281
lines changed

14 files changed

+182
-281
lines changed

docs/CustomizingAzdParameters.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
## [Optional]: Customizing resource names
2+
3+
By default this template will use the environment name as the prefix to prevent naming collisions within Azure. The parameters below show the default values. You only need to run the statements below if you need to change the values.
4+
5+
> To override any of the parameters, run `azd env set <PARAMETER_NAME> <VALUE>` before running `azd up`. On the first azd command, it will prompt you for the environment name. Be sure to choose 3-20 characters alphanumeric unique name.
6+
7+
## Parameters
8+
9+
| Name | Type | Default Value | Purpose |
10+
| ------------------------------- | ------ | ----------------- | --------------------------------------------------------------------------------------------------- |
11+
| `AZURE_ENV_NAME` | string | `macae` | Used as a prefix for all resource names to ensure uniqueness across environments. |
12+
| `AZURE_LOCATION` | string | `swedencentral` | Location of the Azure resources. Controls where the infrastructure will be deployed. |
13+
| `AZURE_ENV_OPENAI_LOCATION` | string | `swedencentral` | Specifies the region for OpenAI resource deployment. |
14+
| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Defines the deployment type for the AI model (e.g., Standard, GlobalStandard). |
15+
| `AZURE_ENV_MODEL_NAME` | string | `gpt-4o` | Specifies the name of the GPT model to be deployed. |
16+
| `AZURE_ENV_MODEL_VERSION` | string | `2024-08-06` | Version of the GPT model to be used for deployment. |
17+
| `AZURE_ENV_IMAGETAG` | string | `latest` | Docker image tag used for container deployments. |
18+
| `AZURE_ENV_ENABLE_TELEMETRY` | bool | `true` | Enables telemetry for monitoring and diagnostics. |
19+
20+
---
21+
22+
## How to Set a Parameter
23+
24+
To customize any of the above values, run the following command **before** `azd up`:
25+
26+
```bash
27+
azd env set <PARAMETER_NAME> <VALUE>
28+
```
29+
30+
**Example:**
31+
32+
```bash
33+
azd env set AZURE_LOCATION westus2
34+
```

docs/DeploymentGuide.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,19 @@ Consider the following settings during your deployment to modify specific settin
134134
<details>
135135
<summary><b>Configurable Deployment Settings</b></summary>
136136

137-
When you start the deployment, most parameters will have **default values**, but you can update the following settings:
138-
139-
| **Setting** | **Description** | **Default value** |
140-
| --------------------------------- | ------------------------------------------------------------------------------------------- | ----------------- |
141-
| **Azure Region** | The region where resources will be created. | East US |
142-
| **Secondary Location** | A **less busy** region for **Azure Cosmos DB**, useful in case of availability constraints. | eastus2 |
143-
| **Deployment Type** | Select from a drop-down list. | GlobalStandard |
144-
| **GPT Model** | Choose from **gpt-4, gpt-4o, gpt-4o-mini**. | gpt-4o |
145-
| **GPT Model Deployment Capacity** | Configure capacity for **GPT models**. | 140k |
137+
When you start the deployment, most parameters will have **default values**, but you can update the following settings [here](../docs/CustomizingAzdParameters.md):
138+
139+
| **Setting** | **Description** | **Default value** |
140+
| ------------------------------ | ------------------------------------------------------------------------------------ | ----------------- |
141+
| **Environment Name** | Used as a prefix for all resource names to ensure uniqueness across environments. | macae |
142+
| **Azure Region** | Location of the Azure resources. Controls where the infrastructure will be deployed. | swedencentral |
143+
| **OpenAI Deployment Location** | Specifies the region for OpenAI resource deployment. | swedencentral |
144+
| **Model Deployment Type** | Defines the deployment type for the AI model (e.g., Standard, GlobalStandard). | GlobalStandard |
145+
| **GPT Model Name** | Specifies the name of the GPT model to be deployed. | gpt-4o |
146+
| **GPT Model Version** | Version of the GPT model to be used for deployment. | 2024-08-06 |
147+
| **Image Tag** | Docker image tag used for container deployments. | latest |
148+
| **Enable Telemetry** | Enables telemetry for monitoring and diagnostics. | true |
149+
146150

147151
</details>
148152

0 commit comments

Comments
 (0)