Skip to content

Commit 75a3c76

Browse files
authored
Merge pull request #293940 from MicrosoftDocs/main
01/31/2025 PM Publishing
2 parents 12d39b6 + 2656b8b commit 75a3c76

File tree

48 files changed

+842
-602
lines changed

Some content is hidden

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

48 files changed

+842
-602
lines changed

articles/app-service/environment/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ App Service Environment v3 is available in the following regions:
152152
| Korea Central |||
153153
| Korea South || |
154154
| Mexico Central ||** |
155+
| New Zealand North |||
155156
| North Central US || |
156157
| North Europe |||
157158
| Norway East |||
@@ -243,6 +244,7 @@ The following sections list the regional pricing tiers (SKUs) availability for A
243244
| Korea Central ||| |
244245
| Korea South ||||
245246
| Mexico Central ||| |
247+
| New Zealand North ||| |
246248
| North Central US ||||
247249
| North Europe ||||
248250
| Norway East ||||

articles/azure-resource-manager/managed-applications/publish-managed-identity.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,70 @@ The response contains an array of tokens under the `value` property:
359359
| `resourceId` | The Azure resource ID for the issued token. This value is either the managed application ID or the user-assigned managed identity ID. |
360360
| `token_type` | The type of the token. |
361361

362+
## Create a managed identity and role assignment for managed applications
363+
364+
This section describes how to create a managed identity and assign a role as part of a managed application using publisher access mode.
365+
366+
1. Create a managed identity using an Azure Resource Manager template.
367+
368+
```json
369+
{
370+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
371+
"contentVersion": "1.0.0.0",
372+
"resources": [
373+
{
374+
"type": "Microsoft.ManagedIdentity/userAssignedIdentities",
375+
"apiVersion": "2018-11-30",
376+
"name": "myManagedIdentity",
377+
"location": "[resourceGroup().location]"
378+
}
379+
]
380+
}
381+
```
382+
383+
1. To allow for managed identity propagation, create a sleep time of 30 seconds.
384+
385+
Since the managed identity is not in the home tenant of the target scope, you must apply a delay between creating the managed identity and assigning the role to allow the managed identity to propagate between tenants. Without this delay, Azure Resource Manager might not recognize this identity when used in the template and fail within a future deployment script.
386+
387+
```json
388+
{
389+
"type": "Microsoft.Resources/deploymentScripts",
390+
"apiVersion": "2020-10-01",
391+
"name": "sleepScript",
392+
"location": "[resourceGroup().location]",
393+
"properties": {
394+
"azPowerShellVersion": "2.0",
395+
"scriptContent": "Start-Sleep -Seconds 30",
396+
"timeout": "PT1H",
397+
"cleanupPreference": "OnSuccess",
398+
"retentionInterval": "P1D"
399+
},
400+
"dependsOn": [
401+
"myManagedIdentity"
402+
]
403+
}
404+
```
405+
406+
1. Assign the Contributor role to the managed identity at the scope of the managed resource group.
407+
408+
```json
409+
{
410+
"type": "Microsoft.Authorization/roleAssignments",
411+
"apiVersion": "2020-04-01-preview",
412+
"name": "[guid(resourceGroup().id, 'Contributor')]",
413+
"properties": {
414+
"roleDefinitionId": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')]",
415+
"principalId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', 'myManagedIdentity'), '2018-11-30').principalId]",
416+
"scope": "[resourceGroup().id]",
417+
"delegatedManagedIdentityResourceId": "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities','myManagedIdentity')]"
418+
},
419+
"dependsOn": [
420+
"myManagedIdentity",
421+
"sleepScript"
422+
]
423+
}
424+
```
425+
362426
## Next steps
363427

364428
> [!div class="nextstepaction"]

articles/container-apps/sessions-custom-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ This command creates a session pool with the following settings:
8989
| `--memory` | `0.5Gi` | The required memory. |
9090
| `--target-port` | `80` | The session port used for ingress traffic. |
9191
| `--cooldown-period` | `300` | The number of seconds that a session can be idle before the session is terminated. The idle period is reset each time the session's API is called. Value must be between `300` and `3600`. |
92-
| `--network-status` | Designates whether outbound network traffic is allowed from the session. Valid values are `EgressDisabled` (default) and `EgressEnabled`. |
92+
| `--network-status` | `EgressDisabled` |Designates whether outbound network traffic is allowed from the session. Valid values are `EgressDisabled` (default) and `EgressEnabled`. |
9393
| `--max-sessions` | `10` | The maximum number of sessions that can be allocated at the same time. |
9494
| `--ready-sessions` | `5` | The target number of sessions that are ready in the session pool all the time. Increase this number if sessions are allocated faster than the pool is being replenished. |
9595
| `--env-vars` | `"key1=value1" "key2=value2"` | The environment variables to set in the container. |

articles/container-apps/vnet-custom.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ $vnet = New-AzVirtualNetwork @VnetArgs
146146

147147
---
148148

149-
When using the Workload profiles environment, you need to update the VNet to delegate the subnet to `Microsoft.App/environments`. This delegation is not needed for the Consumption-only environment.
149+
When using the Workload profiles environment, you need to update the VNet to delegate the subnet to `Microsoft.App/environments`. Do not delegate the subnet when using the Consumption-only environment.
150150

151151
# [Bash](#tab/bash)
152152

@@ -348,7 +348,7 @@ New-AzPrivateDnsRecordSet @DnsRecordArgs
348348

349349
#### Networking parameters
350350

351-
There are three optional networking parameters you can choose to define when calling `containerapp env create`. Use these options when you have a peered VNet with separate address ranges. Explicitly configuring these ranges ensures the addresses used by the Container Apps environment don't conflict with other ranges in the network infrastructure.
351+
When using the Consumption-only environment, there are three optional networking parameters you can choose to define when calling `containerapp env create`. Use these options when you have a peered VNet with separate address ranges. Explicitly configuring these ranges ensures the addresses used by the Container Apps environment don't conflict with other ranges in the network infrastructure.
352352

353353
You must either provide values for all three of these properties, or none of them. If they aren’t provided, the values are generated for you.
354354

articles/cost-management-billing/automate/understand-usage-details-fields.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Microsoft Cost Management
44
description: This article describes the fields in the usage data files.
55
author: bandersmsft
66
ms.author: banders
7-
ms.date: 01/07/2025
7+
ms.date: 01/31/2025
88
ms.topic: conceptual
99
ms.service: cost-management-billing
1010
ms.subservice: cost-management
@@ -57,6 +57,7 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
5757
| CostAllocationRuleName | EA, MCA | Name of the Cost Allocation rule that's applicable to the record. |
5858
| CostInBillingCurrency | EA, MCA | Cost of the charge in the billing currency before credits or taxes. |
5959
| CostInPricingCurrency | MCA | Cost of the charge in the pricing currency before credits or taxes. |
60+
| costInUsd | MCA | Cost of the charge in USD currency before credits or taxes. |
6061
| Currency | EA, pay-as-you-go | See `BillingCurrency`. |
6162
| CustomerName | MPA | Name of the Microsoft Entra tenant for the customer's subscription. |
6263
| CustomerTenantId | MPA | Identifier of the Microsoft Entra tenant of the customer's subscription. |
@@ -65,6 +66,7 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
6566
| ExchangeRateDate | MCA | Date the exchange rate was established. |
6667
| ExchangeRatePricingToBilling | MCA | Exchange rate used to convert the cost in the pricing currency to the billing currency. |
6768
| Frequency | All | Indicates whether a charge is expected to repeat. Charges can either happen once (**OneTime**), repeat on a monthly or yearly basis (**Recurring**), or be based on usage (**UsageBased**). |
69+
| InstanceId | EA, pay-as-you-go | Unique identifier of the [Azure Resource Manager](/rest/api/resources/resources) resource. |
6870
| InvoiceId | pay-as-you-go, MCA | The unique document ID listed on the invoice PDF. |
6971
| InvoiceSection | MCA | See `InvoiceSectionName`. |
7072
| InvoiceSectionId¹ | EA, MCA | Unique identifier for the EA department or MCA invoice section. |
@@ -83,11 +85,14 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
8385
| PartnerName | MPA | Name of the partner Microsoft Entra tenant. |
8486
| PartnerTenantId | MPA | Identifier for the partner's Microsoft Entra tenant. |
8587
| PartNumber¹ | EA, pay-as-you-go | Identifier used to get specific meter pricing. |
88+
| paygCostInBillingCurrency | MCA | The amount of Pay-As-You-Go (PayG) cost before tax in billing currency. You can compute `paygCostInBillingCurrency` by multiplying `PayGPrice`, `quantity` and `exchangeRatePricingToBilling`. |
89+
| paygCostInUsd | MCA | The amount of Pay-As-You-Go (PayG) cost before tax in USD currency. |
8690
| PlanName | EA, pay-as-you-go | Marketplace plan name. |
91+
| PreTaxCost| EA, pay-as-you-go | Cost of the charge before credits or taxes. You can compute `PreTaxCost` by multiplying `ResourceRate` with `UsageQuantity`. |
8792
| PreviousInvoiceId | MCA | Reference to an original invoice if the line item is a refund. |
8893
| PricingCurrency | MCA | Currency used when rating based on negotiated prices. |
8994
| PricingModel | All | Identifier that indicates how the meter is priced. (Values: `OnDemand`, `Reservation`, `Spot`, and `SavingsPlan`) |
90-
| Product | All | Name of the product. |
95+
| ProductName | All | Name of the product. |
9196
| ProductId¹ | MCA | Unique identifier for the product. |
9297
| ProductOrderId | All | Unique identifier for the product order. |
9398
| ProductOrderName | All | Unique name for the product order. |
@@ -103,21 +108,25 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
103108
| ResourceGroup | All | Name of the [resource group](../../azure-resource-manager/management/overview.md) the resource is in. Not all charges come from resources deployed to resource groups. Charges that don't have a resource group are shown as null or empty, **Others**, or **Not applicable**. |
104109
| ResourceId¹ | All | Unique identifier of the [Azure Resource Manager](/rest/api/resources/resources) resource. |
105110
| ResourceLocation¹ | All | The Azure region where the resource is deployed, also referred to as the datacenter location where the resource is running. For an example using Virtual Machines, see [What's the difference between MeterRegion and ResourceLocation](/azure/virtual-machines/vm-usage#what-is-the-difference-between-meter-region-and-resource-location). |
106-
| ResourceLocationNormalized | All | Standardized format of the Azure region where the resource is deployed, also referred to as the datacenter location where the resource is running. The normalized location is used to resolve inconsistencies in region names sent by different Azure Resource Providers (RPs). |
111+
| ResourceLocationNormalized | EA | Standardized format of the Azure region where the resource is deployed, also referred to as the datacenter location where the resource is running. The normalized location is used to resolve inconsistencies in region names sent by different Azure Resource Providers (RPs). |
107112
| ResourceName | EA, pay-as-you-go | Name of the resource. Not all charges come from deployed resources. Charges that don't have a resource type are shown as null/empty, **Others** , or **Not applicable**. |
113+
| ResourceRate | pay-as-you-go | The price for a given product or service that represents the actual rate that you end up paying per unit. |
108114
| ResourceType | MCA | Type of resource instance. Not all charges come from deployed resources. Charges that don't have a resource type are shown as null/empty, **Others** , or **Not applicable**. |
109-
| RoundingAdjustment | EA, MCA | Rounding adjustment represents the quantization that occurs during cost calculation. When the calculated costs are converted to the invoiced total, small rounding errors can occur. The rounding errors are represented as `rounding adjustment` to ensure that the costs shown in Cost Management align to the invoice. For more information, see [Rounding adjustment details](#rounding-adjustment-details). |
110115
| ServiceFamily | MCA | Service family that the service belongs to. |
111116
| ServiceInfo1 | All | Service-specific metadata. |
112117
| ServiceInfo2 | All | Legacy field with optional service-specific metadata. |
118+
| ServiceName | pay-as-you-go | The service family that the service belongs to. |
113119
| ServicePeriodEndDate | MCA | The end date of the rating period that defined and locked pricing for the consumed or purchased service. |
114120
| ServicePeriodStartDate | MCA | The start date of the rating period that defined and locked pricing for the consumed or purchased service. |
121+
| ServiceTier | pay-as-you-go | Name of the service subclassification category. |
115122
| SubscriptionId¹ | All | Unique identifier for the Azure subscription. |
116123
| SubscriptionName | All | Name of the Azure subscription. |
117124
| Tags¹ | All | Tags assigned to the resource. Doesn't include resource group tags. Can be used to group or distribute costs for internal chargeback. For more information, see [Organize your Azure resources with tags](https://azure.microsoft.com/updates/organize-your-azure-resources-with-tags/). |
118125
| Term | All | Displays the term for the validity of the offer. For example: For reserved instances, it displays 12 months as the Term. For one-time purchases or recurring purchases, Term is one month (SaaS, Marketplace Support). Not applicable for Azure consumption. |
119126
| UnitOfMeasure | All | The unit of measure for billing for the service. For example, compute services are billed per hour. |
120127
| UnitPrice² ³| All | The price for a given product or service inclusive of any negotiated discount that you might have on top of the market price (`PayG` price column) for your contract. For more information, see [Pricing behavior in cost details](automation-ingest-usage-details-overview.md#pricing-behavior-in-cost-and-usage-details). |
128+
| UsageDateTime | EA, pay-as-you-go | The usage date of the charge in yyyy-mm-dd format. |
129+
| UsageQuantity | pay-as-you-go | The number of units used by the given product or service for a given day. |
121130

122131
¹ Fields used to build a unique ID for a single cost record. Every record in your cost details file should be considered unique.
123132

@@ -191,6 +200,8 @@ Meter characteristics - Meters associated with IQ exhibit specific traits in the
191200

192201
## Rounding adjustment details
193202

203+
A rounding adjustment represents the quantization that occurs during cost calculation. When the calculated costs are converted to the invoiced total, small rounding errors can occur. The rounding errors are represented as `rounding adjustment` to ensure that the costs shown in Cost Management align to the invoice.
204+
194205
### Why do we have rounding adjustment?
195206

196207
Every financial system involves rounding logic, which can cause some variance. Invoices aggregate monthly costs at the meter level, with costs rounded depending on the currency. In contrast, the cost file contains costs at the resource instance level with higher precision. This difference results in a variance in the total cost between the invoice and the cost file. The rounding adjustment is provided in the cost file at an aggregated level whenever the invoice is ready, ensuring that the total costs in both files match.

0 commit comments

Comments
 (0)