Skip to content

Commit cd4869b

Browse files
committed
2 parents 3acb424 + 2407e12 commit cd4869b

File tree

10 files changed

+63
-52
lines changed

10 files changed

+63
-52
lines changed

articles/api-management/api-management-howto-use-azure-monitor.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77
ms.service: api-management
88
ms.custom: engagement-fy23, devdivchpfy22
99
ms.topic: tutorial
10-
ms.date: 06/27/2023
10+
ms.date: 05/15/2024
1111
ms.author: danlep
1212
---
1313
# Tutorial: Monitor published APIs
@@ -179,7 +179,7 @@ For more information about using resource logs for API Management, see:
179179
180180
## Modify API logging settings
181181
182-
By default, when you create a diagnostic setting to enable collection of resource logs, logging is enabled for all APIs, with default settings. You can adjust the logging settings for all APIs, or override them for individual APIs. For example, adjust the sampling rate or the verbosity of the data, or disable logging for some APIs.
182+
By default, when you create a diagnostic setting to enable collection of resource logs, logging is enabled for all APIs, with default settings. You can adjust the logging settings for all APIs, or override them for individual APIs. For example, adjust the sampling rate or the verbosity of the data, enable logging of headers or request or response payloads, or disable logging for some APIs.
183183
184184
For details about the logging settings, see [Diagnostic logging settings reference](diagnostic-logs-reference.md).
185185
@@ -188,14 +188,16 @@ To configure logging settings for all APIs:
188188
1. In the left menu of your API Management instance, select **APIs** > **All APIs**.
189189
1. Select the **Settings** tab from the top bar.
190190
1. Scroll down to the **Diagnostic Logs** section, and select the **Azure Monitor** tab.
191-
1. Review the settings and make changes if needed. Select **Save**.
191+
1. Review the settings and make changes if needed. Select **Save**.
192192
193193
To configure logging settings for a specific API:
194194
195195
1. In the left menu of your API Management instance, select **APIs** and then the name of the API.
196196
1. Select the **Settings** tab from the top bar.
197197
1. Scroll down to the **Diagnostic Logs** section, and select the **Azure Monitor** tab.
198-
1. Review the settings and make changes if needed. Select **Save**.
198+
1. Review the settings and make changes if needed. Select **Save**.
199+
200+
[!INCLUDE [api-management-log-entry-size-limit](../../includes/api-management-log-entry-size-limit.md)]
199201
200202
## Next steps
201203

articles/api-management/diagnostic-logs-reference.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: api-management
88
ms.topic: reference
9-
ms.date: 11/18/2022
9+
ms.date: 05/15/2024
1010
ms.author: danlep
1111
ms.custom: engagement-fy23
1212
---
@@ -35,11 +35,13 @@ This reference describes settings for API diagnostics logging from an API Manage
3535
| Verbosity | | Specifies the verbosity of the logs and whether custom traces that are configured in [trace](trace-policy.md) policies are logged. <br/><br/>* Error - failed requests, and custom traces of severity `error`<br/>* Information - failed and successful requests, and custom traces of severity `error` and `information`<br/> * Verbose - failed and successful requests, and custom traces of severity `error`, `information`, and `verbose`<br/><br/>Default: Information |
3636
| Correlation protocol | | Specifies the protocol used to correlate telemetry sent by multiple components to Application Insights. Default: Legacy <br/><br/>For information, see [Telemetry correlation in Application Insights](../azure-monitor/app/distributed-tracing-telemetry-correlation.md). |
3737
| Headers to log | list | Specifies the headers that are logged for requests and responses. Default: no headers are logged. |
38-
| Number of payload bytes to log | integer | Specifies the number of initial bytes of the body that are logged for requests and responses. Maximum: 8,192. Default: 0 |
38+
| Number of payload (body) bytes to log| integer | Specifies the number of initial bytes of the frontend or backend request or response body that are logged. Maximum: 8,192. Default: 0 |
3939
| Frontend Request | | Specifies whether and how *frontend requests* (requests incoming to the API Management gateway) are logged.<br/><br/> If this setting is enabled, specify **Headers to log**, **Number of payload bytes to log**, or both. |
4040
| Frontend Response | | Specifies whether and how *frontend responses* (responses outgoing from the API Management gateway) are logged.<br/><br/> If this setting is enabled, specify **Headers to log**, **Number of payload bytes to log**, or both. |
4141
| Backend Request | | Specifies whether and how *backend requests* (requests outgoing from the API Management gateway) are logged.<br/><br/> If this setting is enabled, specify **Headers to log**, **Number of payload bytes to log**, or both. |
42-
| Backend Response | | Specifies whether and how *backend responses* (responses incoming to the API Management gateway) are logged. <br/><br/> If this setting is enabled, specify **Headers to log**, **Number of payload bytes to log**, or both.
42+
| Backend Response | | Specifies whether and how *backend responses* (responses incoming to the API Management gateway) are logged. <br/><br/> If this setting is enabled, specify **Headers to log**, **Number of payload bytes to log**, or both.
43+
44+
[!INCLUDE [api-management-log-entry-size-limit](../../includes/api-management-log-entry-size-limit.md)]
4345

4446
## Next steps
4547

articles/azure-resource-manager/bicep/deployment-stacks.md

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create & deploy deployment stacks in Bicep
33
description: Describes how to create deployment stacks in Bicep.
44
ms.topic: conceptual
55
ms.custom: devx-track-azurecli, devx-track-azurepowershell, devx-track-bicep
6-
ms.date: 05/14/2024
6+
ms.date: 04/11/2024
77
---
88

99
# Deployment stacks
@@ -42,13 +42,6 @@ Deployment stacks provide the following benefits:
4242
- [What-if](./deploy-what-if.md) isn't available in the preview.
4343
- A management group-scoped stack is restricted from deploying to another management group. It can only deploy to the management group of the stack itself or to a child subscription.
4444

45-
## Built-in roles
46-
47-
There are two built-in roles for deployment stack:
48-
49-
- **Azure Deployment Stack Contributor**: Allows users to manage deployment stacks, but cannot create or delete deny assignments within the deployment stacks.
50-
- **Azure Deployment Stack Owner**: Allows users to manage deployment stacks, including those with deny assignments.
51-
5245
## Create deployment stacks
5346

5447
A deployment stack resource can be created at resource group, subscription, or management group scope. The template passed into a deployment stack defines the resources to be created or updated at the target scope specified for the template deployment.
@@ -599,16 +592,6 @@ To delete a managed resource, remove the resource definition from the underlying
599592

600593
## Protect managed resources against deletion
601594

602-
When creating a deployment stack, it's possible to assign a specific type of permissions to the managed resources, which prevents their deletion by unauthorized security principals. These settings are referred to as deny settings. You want to store the stack at a parent scope.
603-
604-
> [!NOTE]
605-
> The latest release requires specific permissions at the stack scope in order to:
606-
>
607-
> - Create or update a deployment stack and set the deny setting to a value other than "None".
608-
> - Update or delete a deployment stack with an existing deny setting of something other than "None"
609-
>
610-
> Use the [built-in roles](#built-in-roles) to grant the permissions.
611-
612595
# [PowerShell](#tab/azure-powershell)
613596

614597
The Azure PowerShell includes these parameters to customize the deny assignment:

articles/copilot/index.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,7 @@ conceptualContent:
8888
text: Generate Azure CLI scripts
8989
- url: ./generate-powershell-scripts.md
9090
itemType: get-started
91-
text: Generate Azure PowerShell scripts
92-
- url: ./optimize-code-application-insights.md
93-
itemType: get-started
94-
text: Discover performance recommendations with Code Optimizations
91+
text: Generate PowerShell scripts
9592
- url: ./generate-kubernetes-yaml.md
9693
itemType: get-started
9794
text: Generate Kubernetes YAML files
@@ -101,3 +98,6 @@ conceptualContent:
10198
- url: ./troubleshoot-app-service.md
10299
itemType: get-started
103100
text: Troubleshoot deployed web apps
101+
- url: ./optimize-code-application-insights.md
102+
itemType: get-started
103+
text: Discover recommendations with Code Optimizations

articles/copilot/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Microsoft Copilot for Azure (preview) is made available to customers under the t
2727

2828
## Manage access
2929

30-
By default, Copilot for Azure is available to all users in a tenant. However, [Global Administrators](/entra/identity/role-based-access-control/permissions-reference#global-administrator) can choose to limit access to Copilot for Azure for their organization.
30+
By default, Copilot for Azure is available to all users in a tenant. However, [Global Administrators](/entra/identity/role-based-access-control/permissions-reference#global-administrator) can choose to control access to Copilot for Azure for their organization.
3131

3232
For more information, see [Manage access to Microsoft Copilot for Azure](manage-access.md).
3333

articles/cosmos-db/nosql/how-to-change-capacity-mode.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ author: richagaur
66
ms.author: richagaur
77
ms.service: cosmos-db
88
ms.subservice: nosql
9-
ms.custom:
10-
- build-2024
119
ms.topic: how-to
1210
ms.date: 05/08/2024
1311
#Customer Intent: As an administrator, I want to change the capacity mode, so that I can migrate from serverless to provisioned capacity.
@@ -17,7 +15,8 @@ ms.date: 05/08/2024
1715

1816
[!INCLUDE[NoSQL](../includes/appliesto-nosql.md)]
1917

20-
Azure Cosmos DB for NoSQL accounts in serverless capacity mode can be changed to provisioned capacity mode. Changing from serverless to provisioned capacity mode converts all containers within the account to manual provisioned throughput containers in-place. The containers' throughput is determined according to the following formula: `Throughput(RU/s) = max(5000, StorageInGB * 10)`.
18+
Azure Cosmos DB for NoSQL accounts in serverless capacity mode can be changed to provisioned capacity mode. Changing from serverless to provisioned capacity mode converts all containers within the account to manual provisioned throughput containers in-place. The containers' throughput is determined according to the following formula:
19+
`Throughput(RU/s) = max(5000, number of partitions * 1000)`.
2120

2221
You can also change the throughput or provisioning mode from manual to autoscale once the migration is complete.
2322

@@ -33,26 +32,33 @@ You can also change the throughput or provisioning mode from manual to autoscale
3332

3433
## Register for preview
3534

36-
To enable this feature, register for the preview feature **Change capacity mode (preview)** in your subscription. For more information, see [register for an Azure Cosmos DB preview feature](../access-previews.md).
35+
36+
To enable this feature, register for the preview feature **Change capacity mode from serverless to provisioned throughput** in your subscription. For more information, see [register for an Azure Cosmos DB preview feature](../access-previews.md).
3737

3838
## Change capacity mode
3939

4040
Follow these steps to change the capacity mode using Azure portal.
4141

4242
1. In the Azure portal, navigate to your API for NoSQL account.
4343

44-
1. Select the **Change** option associated with the **capacity mode** field in the **Overview** section of the account page.
44+
1. Select the **Change capacity mode to provisioned throughput** option in the **Overview** section of the account page.
4545

4646
1. Review the changes and select **Confirm** to start the migration.
4747

4848
1. Monitor the status using the **state** field in the **Overview** section. The status indicates that the account is **updating** while the migration is in progress.
4949

50-
1. Once the migration is complete, the **capacity mode** field is now set to **provisioned capacity**.
50+
1. Once the migration is complete, the **capacity mode** field is now set to **provisioned throughput**.
51+
52+
## Limitations
5153

52-
> [!IMPORTANT]
53-
> There are no service level agreements (SLAs) associated with the duration of the capacity mode change. You cannot execute any management operation while the migration is in progress. However, the containers can be accessed as usual by any client application.
54+
- This is one time migration that is; the account can't be reversed to serverless capacity mode again.
55+
- There's no SLA associated with the duration of migration.
56+
- Any management operation can't be executed while the migration is in progress.
57+
- In cases where you need to restore a deleted Cosmos DB account, the account is restored to provisioned throughput if the capacity mode was changed from serverless to provisioned, irrespective of the backup timestamp.
58+
- In cases where you need to restore a deleted serverless container within an existing account, which was migrated from serverless to provisioned throughput, contact Microsoft support.
5459

5560
## Related content
5661

5762
- [Chose between autoscale and manual throughput](../how-to-choose-offer.md).
5863
- [Choose between serverless and provisioned throughput](../throughput-serverless.md).
64+

0 commit comments

Comments
 (0)