Skip to content

Commit e1f4558

Browse files
authored
Merge pull request #204456 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 1a7ecfa + a4f22d1 commit e1f4558

File tree

7 files changed

+21
-13
lines changed

7 files changed

+21
-13
lines changed

articles/azure-app-configuration/concept-github-action.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ Input parameters specify data used by the action during runtime. The following
307307
|----|----|----|
308308
| configurationFile | Yes | Relative path to the configuration file in the repository. Glob patterns are supported and can include multiple files. |
309309
| format | Yes | File format of the configuration file. Valid formats are: JSON, YAML, properties. |
310-
| connectionString | Yes | Connection string for the App Configuration instance. The connection string should be stored as a secret in the GitHub repository, and only the secret name should be used in the workflow. |
310+
| connectionString | Yes | Read-write connection string for the App Configuration instance. The connection string should be stored as a secret in the GitHub repository, and only the secret name should be used in the workflow. |
311311
| separator | Yes | Separator used when flattening the configuration file to key-value pairs. Valid values are: . , ; : - _ __ / |
312312
| prefix | No | Prefix to be added to the start of keys. |
313313
| label | No | Label used when setting key-value pairs. If unspecified, a null label is used. |

articles/azure-monitor/app/opentelemetry-enable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ provider.register();
228228

229229
// Create an exporter instance.
230230
const exporter = new AzureMonitorTraceExporter({
231-
instrumentationKey: "<Your Connection String>"
231+
connectionString: "<Your Connection String>"
232232
});
233233

234234
// Add the exporter to the provider.

articles/confidential-computing/virtual-machine-solutions-amd.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,21 @@ You can use the [Azure CLI](/cli/azure/install-azure-cli) with your confidential
3939
To see a list of confidential VM sizes, run the following command. Replace `<vm-series>` with the series you want to use. For example, `DCASv5`, `ECASv5`, `DCADSv5`, or `ECADSv5`. The output shows information about available regions and availability zones.
4040

4141
```azurecli-interactive
42-
az vm list-skus `
43-
--size dc `
44-
--query "[?family=='standard<vm-series>Family'].{name:name,locations:locationInfo[0].location,AZ_a:locationInfo[0].zones[0],AZ_b:locationInfo[0].zones[1],AZ_c:locationInfo[0].zones[2]}" `
45-
--all `
42+
vm_series='DCASv5'
43+
az vm list-skus \
44+
--size dc \
45+
--query "[?family=='standard${vm_series}Family'].{name:name,locations:locationInfo[0].location,AZ_a:locationInfo[0].zones[0],AZ_b:locationInfo[0].zones[1],AZ_c:locationInfo[0].zones[2]}" \
46+
--all \
4647
--output table
4748
```
4849

4950
For a more detailed list, run the following command instead:
5051

5152
```azurecli-interactive
52-
az vm list-skus `
53-
--size dc `
54-
--query "[?family=='standard<vm-series>Family']"
53+
vm_series='DCASv5'
54+
az vm list-skus \
55+
--size dc \
56+
--query "[?family=='standard${vm_series}Family']"
5557
```
5658

5759
## Deployment considerations

articles/cost-management-billing/costs/group-filter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The following table lists some of the most common grouping and filtering options
3838
| **Pricing model** | Break down costs by on-demand, reservation, or spot usage. | Purchases show as **OnDemand**. If you see **Not applicable**, group by **Reservation** to determine whether the usage is reservation or on-demand usage and **Charge type** to identify purchases.
3939
| **Provider** | Break down costs by the provider type: Azure, Microsoft 365, Dynamics 365, AWS, and so on. | Identifier for product and line of business. |
4040
| **Publisher type** | Break down Microsoft, Azure, AWS, and Marketplace costs. | Values are **Microsoft** for MCA accounts and **Azure** for EA and pay-as-you-go accounts. |
41-
| **Reservation** | Break down costs by reservation. | Any usage or purchases that aren't associated with a reservation will show as **No reservation**. Group by **Publisher type** to identify other Azure, AWS, or Marketplace purchases. |
41+
| **Reservation** | Break down costs by reservation. | Any usage or purchases that aren't associated with a reservation will show as **No reservation** or **No values**. Group by **Publisher type** to identify other Azure, AWS, or Marketplace purchases. |
4242
| **Resource** | Break down costs by resource. | Marketplace purchases show as **Other Marketplace purchases** and Azure purchases, like Reservations and Support charges, show as **Other Azure purchases**. Group by or filter on **Publisher type** to identify other Azure, AWS, or Marketplace purchases. |
4343
| **Resource group** | Break down costs by resource group. | Purchases, tenant resources not associated with subscriptions, subscription resources not deployed to a resource group, and classic resources don't have a resource group and will show as **Other Marketplace purchases**, **Other Azure purchases**, **Other tenant resources**, **Other subscription resources**, **$system**, or **Other charges**. |
4444
| **Resource type** | Break down costs by resource type. | Purchases and classic services don't have an Azure Resource Manager resource type and will show as **others**, **classic services**, or **No resource type**. |

articles/digital-twins/concepts-3d-scenes-studio.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ To work with 3D Scenes Studio, you'll need the following required resources:
5858
* To **view** 3D scenes, you'll need at least *Storage Blob Data Reader* access to these storage resources. To **build** 3D scenes, you'll need *Storage Blob Data Contributor* or *Storage Blob Data Owner* access.
5959

6060
You can grant required roles at either the storage account level or the container level. For more information about Azure storage permissions, see [Assign an Azure role](../storage/blobs/assign-azure-role-data-access.md?tabs=portal#assign-an-azure-role).
61-
* You should also configure [CORS](/rest/api/storageservices/cross-origin-resource-sharing--cors--support-for-the-azure-storage-services) for your storage account, so that 3D Scenes Studio will be able to access your storage container. For complete CORS setting information, see [Use 3D Scenes Studio (preview)](how-to-use-3d-scenes-studio.md#prerequisites).
61+
* You should also configure [Cross-Origin Resource Sharing (CORS)](/rest/api/storageservices/cross-origin-resource-sharing--cors--support-for-the-azure-storage-services) for your storage account, so that 3D Scenes Studio will be able to access your storage container. For complete CORS setting information, see [Use 3D Scenes Studio (preview)](how-to-use-3d-scenes-studio.md#prerequisites).
6262

6363
Then, you can access 3D Scenes Studio at this link: [3D Scenes Studio](https://dev.explorer.azuredigitaltwins-test.net/3dscenes).
6464

@@ -133,4 +133,4 @@ These limits are recommended because 3D Scenes Studio leverages the standard [Az
133133

134134
Try out 3D Scenes Studio with a sample scenario in [Get started with 3D Scenes Studio](quickstart-3d-scenes-studio.md).
135135

136-
Or, learn how to use the studio's full feature set in [Use 3D Scenes Studio](how-to-use-3d-scenes-studio.md).
136+
Or, learn how to use the studio's full feature set in [Use 3D Scenes Studio](how-to-use-3d-scenes-studio.md).

articles/frontdoor/front-door-caching.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,12 @@ The following request headers won't be forwarded to a backend when using caching
171171
- Transfer-Encoding
172172
- Accept-Language
173173

174+
## Response headers
175+
176+
The following response headers will be stripped if the origin response is cacheable. For example, Cache control header has max-age value.
177+
178+
- Set-Cookie
179+
174180
## Cache behavior and duration
175181

176182
::: zone pivot="front-door-standard-premium"

articles/virtual-network/service-tags-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ By default, service tags reflect the ranges for the entire cloud. Some service t
5757
| **AzureBotService** | Azure Bot Service. | Outbound | No | No |
5858
| **AzureCloud** | All [datacenter public IP addresses](https://www.microsoft.com/download/details.aspx?id=56519). | Outbound | Yes | Yes |
5959
| **AzureCognitiveSearch** | Azure Cognitive Search. <br/><br/>This tag or the IP addresses covered by this tag can be used to grant indexers secure access to data sources. For more information about indexers, see [indexer connection documentation](../search/search-indexer-troubleshooting.md#connection-errors). <br/><br/> **Note**: The IP of the search service isn't included in the list of IP ranges for this service tag and **also needs to be added** to the IP firewall of data sources. | Inbound | No | No |
60-
| **AzureConnectors** | This tag represents the IP addresses used for managed connectors that make inbound webhook callbacks to the Azure Logic Apps service and outbound calls to their respective services, for example, Azure Storage or Azure Event Hubs. | Inbound / Outbound | Yes | Yes |
60+
| **AzureConnectors** | This tag represents the IP addresses used for managed connectors that make inbound webhook callbacks to the Azure Logic Apps service and outbound calls to their respective services, for example, Azure Storage or Azure Event Hubs. | Both | Yes | Yes |
6161
| **AzureContainerRegistry** | Azure Container Registry. | Outbound | Yes | Yes |
6262
| **AzureCosmosDB** | Azure Cosmos DB. | Outbound | Yes | Yes |
6363
| **AzureDatabricks** | Azure Databricks. | Both | No | No |

0 commit comments

Comments
 (0)